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
This commit is contained in:
Linus Torvalds 2011-11-02 16:54:36 -07:00
commit 06ef93e1b8
1 changed files with 1 additions and 1 deletions

View File

@ -655,7 +655,7 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *x)
default: default:
return nfserr_bad_xdr; return nfserr_bad_xdr;
} }
w &= !NFS4_SHARE_ACCESS_MASK; w &= ~NFS4_SHARE_ACCESS_MASK;
if (!w) if (!w)
return nfs_ok; return nfs_ok;
if (!argp->minorversion) if (!argp->minorversion)