remove nfs4_acl_add_ace()
nfs4_acl_add_ace() can now be removed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Neil Brown <neilb@cse.unsw.edu.au> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6e84d644b5
commit
8842c9655b
|
@ -137,7 +137,6 @@ struct ace_container {
|
||||||
static short ace2type(struct nfs4_ace *);
|
static short ace2type(struct nfs4_ace *);
|
||||||
static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *,
|
static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *,
|
||||||
unsigned int);
|
unsigned int);
|
||||||
void nfs4_acl_add_ace(struct nfs4_acl *, u32, u32, u32, int, uid_t);
|
|
||||||
|
|
||||||
struct nfs4_acl *
|
struct nfs4_acl *
|
||||||
nfs4_acl_posix_to_nfsv4(struct posix_acl *pacl, struct posix_acl *dpacl,
|
nfs4_acl_posix_to_nfsv4(struct posix_acl *pacl, struct posix_acl *dpacl,
|
||||||
|
@ -785,21 +784,6 @@ nfs4_acl_new(int n)
|
||||||
return acl;
|
return acl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
nfs4_acl_add_ace(struct nfs4_acl *acl, u32 type, u32 flag, u32 access_mask,
|
|
||||||
int whotype, uid_t who)
|
|
||||||
{
|
|
||||||
struct nfs4_ace *ace = acl->aces + acl->naces;
|
|
||||||
|
|
||||||
ace->type = type;
|
|
||||||
ace->flag = flag;
|
|
||||||
ace->access_mask = access_mask;
|
|
||||||
ace->whotype = whotype;
|
|
||||||
ace->who = who;
|
|
||||||
|
|
||||||
acl->naces++;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
char *string;
|
char *string;
|
||||||
int stringlen;
|
int stringlen;
|
||||||
|
@ -851,6 +835,5 @@ nfs4_acl_write_who(int who, char *p)
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(nfs4_acl_new);
|
EXPORT_SYMBOL(nfs4_acl_new);
|
||||||
EXPORT_SYMBOL(nfs4_acl_add_ace);
|
|
||||||
EXPORT_SYMBOL(nfs4_acl_get_whotype);
|
EXPORT_SYMBOL(nfs4_acl_get_whotype);
|
||||||
EXPORT_SYMBOL(nfs4_acl_write_who);
|
EXPORT_SYMBOL(nfs4_acl_write_who);
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#define NFS4_ACL_MAX 170
|
#define NFS4_ACL_MAX 170
|
||||||
|
|
||||||
struct nfs4_acl *nfs4_acl_new(int);
|
struct nfs4_acl *nfs4_acl_new(int);
|
||||||
void nfs4_acl_add_ace(struct nfs4_acl *, u32, u32, u32, int, uid_t);
|
|
||||||
int nfs4_acl_get_whotype(char *, u32);
|
int nfs4_acl_get_whotype(char *, u32);
|
||||||
int nfs4_acl_write_who(int who, char *p);
|
int nfs4_acl_write_who(int who, char *p);
|
||||||
int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
|
int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
|
||||||
|
|
Loading…
Reference in a new issue