aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalahal Naineni <malahal@us.ibm.com>2014-01-27 15:31:09 -0600
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-01-31 08:28:16 -0500
commita1800acaf7d1c2bf6d68b9a8f4ab8560cc66555a (patch)
tree2d3a7a6f6f32d638a45cc8fd13b974f6f8e1129c
parent905e7dafbe1c69dd69197a9e8ba2e4bf518c9926 (diff)
downloadlinux-linaro-stable-a1800acaf7d1c2bf6d68b9a8f4ab8560cc66555a.tar.gz
nfs: initialize the ACL support bits to zero.
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>
-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 8c21d69a9dc1..72f3bf1754ef 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3449,7 +3449,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)) {