diff options
author | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> | 2015-04-24 07:04:29 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2015-05-29 11:04:04 -0400 |
commit | 2f6b3879c24de3404e21be8b76097353caf3bcbd (patch) | |
tree | a515a5a699d5ece64319cb5cf467210ca7da43bf /fs/nfsd/nfs4acl.c | |
parent | 6ac75368e1a658903cf57b2bbf66e60d34f55558 (diff) |
nfsd: Remove dead declarations
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
-rw-r--r-- | fs/nfsd/nfs4acl.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index 67242bf7c6cc..7e10e2a6c977 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c | |||
@@ -52,10 +52,6 @@ | |||
52 | #define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL | NFS4_ACE_SYNCHRONIZE) | 52 | #define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL | NFS4_ACE_SYNCHRONIZE) |
53 | #define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL) | 53 | #define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL) |
54 | 54 | ||
55 | /* We don't support these bits; insist they be neither allowed nor denied */ | ||
56 | #define NFS4_MASK_UNSUPP (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \ | ||
57 | | NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS) | ||
58 | |||
59 | /* flags used to simulate posix default ACLs */ | 55 | /* flags used to simulate posix default ACLs */ |
60 | #define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \ | 56 | #define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \ |
61 | | NFS4_ACE_DIRECTORY_INHERIT_ACE) | 57 | | NFS4_ACE_DIRECTORY_INHERIT_ACE) |
@@ -64,9 +60,6 @@ | |||
64 | | NFS4_ACE_INHERIT_ONLY_ACE \ | 60 | | NFS4_ACE_INHERIT_ONLY_ACE \ |
65 | | NFS4_ACE_IDENTIFIER_GROUP) | 61 | | NFS4_ACE_IDENTIFIER_GROUP) |
66 | 62 | ||
67 | #define MASK_EQUAL(mask1, mask2) \ | ||
68 | ( ((mask1) & NFS4_ACE_MASK_ALL) == ((mask2) & NFS4_ACE_MASK_ALL) ) | ||
69 | |||
70 | static u32 | 63 | static u32 |
71 | mask_from_posix(unsigned short perm, unsigned int flags) | 64 | mask_from_posix(unsigned short perm, unsigned int flags) |
72 | { | 65 | { |
@@ -126,11 +119,6 @@ low_mode_from_nfs4(u32 perm, unsigned short *mode, unsigned int flags) | |||
126 | *mode |= ACL_EXECUTE; | 119 | *mode |= ACL_EXECUTE; |
127 | } | 120 | } |
128 | 121 | ||
129 | struct ace_container { | ||
130 | struct nfs4_ace *ace; | ||
131 | struct list_head ace_l; | ||
132 | }; | ||
133 | |||
134 | static short ace2type(struct nfs4_ace *); | 122 | static short ace2type(struct nfs4_ace *); |
135 | static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *, | 123 | static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *, |
136 | unsigned int); | 124 | unsigned int); |