Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8842c965 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

remove nfs4_acl_add_ace() 



nfs4_acl_add_ace() can now be removed.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Acked-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e84d644

fs/nfsd/nfs4acl.c

+0 −17
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct ace_container { 
static short ace2type(struct nfs4_ace *);

static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *,

				unsigned int);

void nfs4_acl_add_ace(struct nfs4_acl *, u32, u32, u32, int, uid_t);



struct nfs4_acl *

nfs4_acl_posix_to_nfsv4(struct posix_acl *pacl, struct posix_acl *dpacl,
@@ -785,21 +784,6 @@ nfs4_acl_new(int n) 
	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 {

	char *string;

	int   stringlen;
@@ -851,6 +835,5 @@ nfs4_acl_write_who(int who, char *p) 
}



EXPORT_SYMBOL(nfs4_acl_new);

EXPORT_SYMBOL(nfs4_acl_add_ace);

EXPORT_SYMBOL(nfs4_acl_get_whotype);

EXPORT_SYMBOL(nfs4_acl_write_who);

include/linux/nfs4_acl.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#define NFS4_ACL_MAX 170



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_write_who(int who, char *p);

int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,