Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06ef93e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f7e80117 fc0d14fe

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)