diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 19:03:11 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-08-01 02:10:32 -0400 |
commit | 86bc704db0ab7e69230f79bc7d124e063259abc6 (patch) | |
tree | 9eeaf664b0c47cf440be1e410f7685cc06c0049c | |
parent | 3a5fba19b080b365d67866db38e32e6a4a2089e8 (diff) |
switch posix_acl_chmod() to umode_t
again, that's what all callers pass to it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/posix_acl.c | 4 | ||||
-rw-r--r-- | include/linux/posix_acl.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 4e16e8001982..10027b42b7e2 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c | |||
@@ -336,7 +336,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p) | |||
336 | /* | 336 | /* |
337 | * Modify the ACL for the chmod syscall. | 337 | * Modify the ACL for the chmod syscall. |
338 | */ | 338 | */ |
339 | static int posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode) | 339 | static int posix_acl_chmod_masq(struct posix_acl *acl, umode_t mode) |
340 | { | 340 | { |
341 | struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; | 341 | struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; |
342 | struct posix_acl_entry *pa, *pe; | 342 | struct posix_acl_entry *pa, *pe; |
@@ -400,7 +400,7 @@ posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p) | |||
400 | EXPORT_SYMBOL(posix_acl_create); | 400 | EXPORT_SYMBOL(posix_acl_create); |
401 | 401 | ||
402 | int | 402 | int |
403 | posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, mode_t mode) | 403 | posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode) |
404 | { | 404 | { |
405 | struct posix_acl *clone = posix_acl_clone(*acl, gfp); | 405 | struct posix_acl *clone = posix_acl_clone(*acl, gfp); |
406 | int err = -ENOMEM; | 406 | int err = -ENOMEM; |
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h index 16ecfb485d28..951bba82d50d 100644 --- a/include/linux/posix_acl.h +++ b/include/linux/posix_acl.h | |||
@@ -78,7 +78,7 @@ extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); | |||
78 | extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t); | 78 | extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t); |
79 | extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *); | 79 | extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *); |
80 | extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *); | 80 | extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *); |
81 | extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t); | 81 | extern int posix_acl_chmod(struct posix_acl **, gfp_t, umode_t); |
82 | 82 | ||
83 | extern struct posix_acl *get_posix_acl(struct inode *, int); | 83 | extern struct posix_acl *get_posix_acl(struct inode *, int); |
84 | extern int set_posix_acl(struct inode *, int, struct posix_acl *); | 84 | extern int set_posix_acl(struct inode *, int, struct posix_acl *); |