Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
nfsd4: mask out non-access bits in nfs4_access_to_omode

+1 -1
+1 -1
fs/nfsd/nfs4state.c
··· 440 440 441 441 static int nfs4_access_to_omode(u32 access) 442 442 { 443 - switch (access) { 443 + switch (access & NFS4_SHARE_ACCESS_BOTH) { 444 444 case NFS4_SHARE_ACCESS_READ: 445 445 return O_RDONLY; 446 446 case NFS4_SHARE_ACCESS_WRITE: