summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-03 03:54:36 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-03 03:54:36 +0400
commit06ef93e1b8405acac6ec900564e3ad1a8e3a72b2 (patch)
treeb4077ce7af0e66d2629c86f0f2653bdf087ef1f7 /fs
parentf7e801172c53c4dc48b1f888a72eae069be6333a (diff)
parentfc0d14fe2d6403eb21202fd0c1cf67cd2c85ca67 (diff)
downloadlinux-06ef93e1b8405acac6ec900564e3ad1a8e3a72b2.tar.xz
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
* 'for-3.2' of git://linux-nfs.org/~bfields/linux: nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 66d095d7955e..b6fa792d6b85 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -655,7 +655,7 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *x)
default:
return nfserr_bad_xdr;
}
- w &= !NFS4_SHARE_ACCESS_MASK;
+ w &= ~NFS4_SHARE_ACCESS_MASK;
if (!w)
return nfs_ok;
if (!argp->minorversion)