| commit | 06ef93e1b8405acac6ec900564e3ad1a8e3a72b2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 02 16:54:36 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 02 16:54:36 2011 -0700 |
| tree | b4077ce7af0e66d2629c86f0f2653bdf087ef1f7 | |
| parent | f7e801172c53c4dc48b1f888a72eae069be6333a [diff] | |
| parent | fc0d14fe2d6403eb21202fd0c1cf67cd2c85ca67 [diff] |
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
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 66d095d..b6fa792 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c
@@ -655,7 +655,7 @@ default: return nfserr_bad_xdr; } - w &= !NFS4_SHARE_ACCESS_MASK; + w &= ~NFS4_SHARE_ACCESS_MASK; if (!w) return nfs_ok; if (!argp->minorversion)