aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-23 03:27:37 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-25 14:27:32 -0400
commitedde854e8bb34a7f32fa993d721f1da0faf64165 (patch)
tree90fae3003a748bd0faec4041ca36528073366487
parent826cae2f2b4d726b925f43bc208a571639da4761 (diff)
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.c11
-rw-r--r--include/linux/posix_acl.h3
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 @@
24 24
25EXPORT_SYMBOL(posix_acl_init); 25EXPORT_SYMBOL(posix_acl_init);
26EXPORT_SYMBOL(posix_acl_alloc); 26EXPORT_SYMBOL(posix_acl_alloc);
27EXPORT_SYMBOL(posix_acl_clone);
28EXPORT_SYMBOL(posix_acl_valid); 27EXPORT_SYMBOL(posix_acl_valid);
29EXPORT_SYMBOL(posix_acl_equiv_mode); 28EXPORT_SYMBOL(posix_acl_equiv_mode);
30EXPORT_SYMBOL(posix_acl_from_mode); 29EXPORT_SYMBOL(posix_acl_from_mode);
31EXPORT_SYMBOL(posix_acl_create_masq);
32EXPORT_SYMBOL(posix_acl_chmod_masq);
33EXPORT_SYMBOL(posix_acl_permission); 30EXPORT_SYMBOL(posix_acl_permission);
34 31
35/* 32/*
@@ -59,7 +56,7 @@ posix_acl_alloc(int count, gfp_t flags)
59/* 56/*
60 * Clone an ACL. 57 * Clone an ACL.
61 */ 58 */
62struct posix_acl * 59static struct posix_acl *
63posix_acl_clone(const struct posix_acl *acl, gfp_t flags) 60posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
64{ 61{
65 struct posix_acl *clone = NULL; 62 struct posix_acl *clone = NULL;
@@ -283,8 +280,7 @@ check_perm:
283 * system calls. All permissions that are not granted by the acl are removed. 280 * system calls. All permissions that are not granted by the acl are removed.
284 * The permissions in the acl are changed to reflect the mode_p parameter. 281 * The permissions in the acl are changed to reflect the mode_p parameter.
285 */ 282 */
286int 283static int posix_acl_create_masq(struct posix_acl *acl, mode_t *mode_p)
287posix_acl_create_masq(struct posix_acl *acl, mode_t *mode_p)
288{ 284{
289 struct posix_acl_entry *pa, *pe; 285 struct posix_acl_entry *pa, *pe;
290 struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; 286 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)
341/* 337/*
342 * Modify the ACL for the chmod syscall. 338 * Modify the ACL for the chmod syscall.
343 */ 339 */
344int 340static int posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode)
345posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode)
346{ 341{
347 struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL; 342 struct posix_acl_entry *group_obj = NULL, *mask_obj = NULL;
348 struct posix_acl_entry *pa, *pe; 343 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)
73 73
74extern void posix_acl_init(struct posix_acl *, int); 74extern void posix_acl_init(struct posix_acl *, int);
75extern struct posix_acl *posix_acl_alloc(int, gfp_t); 75extern struct posix_acl *posix_acl_alloc(int, gfp_t);
76extern struct posix_acl *posix_acl_clone(const struct posix_acl *, gfp_t);
77extern int posix_acl_valid(const struct posix_acl *); 76extern int posix_acl_valid(const struct posix_acl *);
78extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); 77extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
79extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t); 78extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t);
80extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *); 79extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *);
81extern int posix_acl_create_masq(struct posix_acl *, mode_t *);
82extern int posix_acl_chmod_masq(struct posix_acl *, mode_t);
83extern int posix_acl_create(struct posix_acl **, gfp_t, mode_t *); 80extern int posix_acl_create(struct posix_acl **, gfp_t, mode_t *);
84extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t); 81extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);
85 82