diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 19:54:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 19:54:36 -0400 |
| commit | 06ef93e1b8405acac6ec900564e3ad1a8e3a72b2 (patch) | |
| 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
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
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) | |||
| 655 | default: | 655 | default: |
| 656 | return nfserr_bad_xdr; | 656 | return nfserr_bad_xdr; |
| 657 | } | 657 | } |
| 658 | w &= !NFS4_SHARE_ACCESS_MASK; | 658 | w &= ~NFS4_SHARE_ACCESS_MASK; |
| 659 | if (!w) | 659 | if (!w) |
| 660 | return nfs_ok; | 660 | return nfs_ok; |
| 661 | if (!argp->minorversion) | 661 | if (!argp->minorversion) |