diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 03:27:37 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:27:32 -0400 |
| commit | edde854e8bb34a7f32fa993d721f1da0faf64165 (patch) | |
| tree | 90fae3003a748bd0faec4041ca36528073366487 | |
| parent | 826cae2f2b4d726b925f43bc208a571639da4761 (diff) | |
| download | linux-stable-edde854e8bb34a7f32fa993d721f1da0faf64165.tar.gz linux-stable-edde854e8bb34a7f32fa993d721f1da0faf64165.tar.bz2 linux-stable-edde854e8bb34a7f32fa993d721f1da0faf64165.zip | |
bury posix_acl_..._masq() variants
made static; no callers left outside of posix_acl.c. posix_acl_clone() also
has lost all external callers and became static...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/posix_acl.c | 11 | ||||
| -rw-r--r-- | include/linux/posix_acl.h | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 365a0712da6a..0dd0266f9796 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -24,12 +24,9 @@ EXPORT_SYMBOL(posix_acl_init); EXPORT_SYMBOL(posix_acl_alloc); -EXPORT_SYMBOL(posix_acl_clone); EXPORT_SYMBOL(posix_acl_valid); EXPORT_SYMBOL(posix_acl_equiv_mode); EXPORT_SYMBOL(posix_acl_from_mode); -EXPORT_SYMBOL(posix_acl_create_masq); -EXPORT_SYMBOL(posix_acl_chmod_masq); EXPORT_SYMBOL(posix_acl_permission); /* @@ -59,7 +56,7 @@ posix_acl_alloc(int count, gfp_t flags) /* * Clone an ACL. */ -struct posix_acl * +static struct posix_acl * posix_acl_clone(const struct posix_acl *acl, gfp_t flags) { struct posix_acl *clone = NULL; @@ -283,8 +280,7 @@ check_perm: * system calls. All permissions that are not granted by the acl are removed. * The permissions in the acl are changed to reflect the mode_p parameter. */ -int -posix_acl_create_masq(struct posix_acl *acl, mode_t *mode_p) +static int posix_acl_create_masq(struct posix_acl *acl, mode_t *mode_p) { struct posix_acl_entry *pa, *pe; struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; @@ -341,8 +337,7 @@ posix_acl_create_masq(struct posix_acl *acl, mode_t *mode_p) /* * Modify the ACL for the chmod syscall. */ -int -posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode) +static int posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode) { struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; struct posix_acl_entry *pa, *pe; diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h index 0ae0e4a3e20c..9a53b99818e2 100644 --- a/include/linux/posix_acl.h +++ b/include/linux/posix_acl.h @@ -73,13 +73,10 @@ posix_acl_release(struct posix_acl *acl) extern void posix_acl_init(struct posix_acl *, int); extern struct posix_acl *posix_acl_alloc(int, gfp_t); -extern struct posix_acl *posix_acl_clone(const struct posix_acl *, gfp_t); extern int posix_acl_valid(const struct posix_acl *); extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t); extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *); -extern int posix_acl_create_masq(struct posix_acl *, mode_t *); -extern int posix_acl_chmod_masq(struct posix_acl *, mode_t); extern int posix_acl_create(struct posix_acl **, gfp_t, mode_t *); extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t); |