Commit edde854e authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 826cae2f

fs/posix_acl.c

+3 −8
Original line number Diff line number Diff line
@@ -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 @@ posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want) 
 * 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;

include/linux/posix_acl.h

+0 −3
Original line number Diff line number Diff line
@@ -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);