Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86bc704d authored by Al Viro's avatar Al Viro
Browse files

switch posix_acl_chmod() to umode_t 



again, that's what all callers pass to it

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3a5fba19

fs/posix_acl.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p) 
/*

 * Modify the ACL for the chmod syscall.

 */

static int posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode)

static int posix_acl_chmod_masq(struct posix_acl *acl, umode_t mode)

{

	struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL;

	struct posix_acl_entry *pa, *pe;
@@ -400,7 +400,7 @@ posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p) 
EXPORT_SYMBOL(posix_acl_create);



int

posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, mode_t mode)

posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode)

{

	struct posix_acl *clone = posix_acl_clone(*acl, gfp);

	int err = -ENOMEM;

include/linux/posix_acl.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); 
extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t);

extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);

extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *);

extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);

extern int posix_acl_chmod(struct posix_acl **, gfp_t, umode_t);



extern struct posix_acl *get_posix_acl(struct inode *, int);

extern int set_posix_acl(struct inode *, int, struct posix_acl *);