From: NeilBrown <neilb@cse.unsw.edu.au>
We were expecting {read,write}_named_attributes to be set in sync with the
read and write bits. But we don't actually support named attributes, and when
we eventually do, it's unlikely that we'll want to use these ACL mode bits to
control access to them. So let's just stop supporting these two bits.
This also updates our mapping to the latest ietf draft.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/nfsd/nfs4acl.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff -puN fs/nfsd/nfs4acl.c~nfsd4-acl-dont-set-named-attrs fs/nfsd/nfs4acl.c
--- 25/fs/nfsd/nfs4acl.c~nfsd4-acl-dont-set-named-attrs 2005-03-21 22:50:03.000000000 -0800
+++ 25-akpm/fs/nfsd/nfs4acl.c 2005-03-21 22:50:03.000000000 -0800
@@ -49,14 +49,15 @@
/* mode bit translations: */
-#define NFS4_READ_MODE (NFS4_ACE_READ_DATA | NFS4_ACE_READ_NAMED_ATTRS)
-#define NFS4_WRITE_MODE (NFS4_ACE_WRITE_DATA | NFS4_ACE_WRITE_NAMED_ATTRS | NFS4_ACE_APPEND_DATA)
+#define NFS4_READ_MODE (NFS4_ACE_READ_DATA)
+#define NFS4_WRITE_MODE (NFS4_ACE_WRITE_DATA | NFS4_ACE_APPEND_DATA)
#define NFS4_EXECUTE_MODE NFS4_ACE_EXECUTE
#define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL | NFS4_ACE_SYNCHRONIZE)
#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
/* We don't support these bits; insist they be neither allowed nor denied */
-#define NFS4_MASK_UNSUPP (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER)
+#define NFS4_MASK_UNSUPP (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \
+ | NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)
/* flags used to simulate posix default ACLs */
#define NFS4_INHERITANCE_FLAGS (NFS4_ACE_FILE_INHERIT_ACE \
_