summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMalahal Naineni <malahal@us.ibm.com>2014-01-27 15:31:09 -0600
committerJiri Slaby <jslaby@suse.cz>2014-04-18 10:46:14 +0200
commit0eec43085e1f17a7634ce07073cb6c254135beb7 (patch)
tree1e332bd191735b8f18f9cdec43019b6e670959d3 /fs
parent1070f32690efdfef2dc64183dded068ec54266c7 (diff)
nfs: initialize the ACL support bits to zero.
commit a1800acaf7d1c2bf6d68b9a8f4ab8560cc66555a upstream. Avoid returning incorrect acl mask attributes when the server doesn't support ACLs. Signed-off-by: Malahal Naineni <malahal@us.ibm.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index b2f842d0901b..1c2beb18a713 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3405,7 +3405,7 @@ static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint
{
__be32 *p;
- *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL;
+ *res = 0;
if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U)))
return -EIO;
if (likely(bitmap[0] & FATTR4_WORD0_ACLSUPPORT)) {