summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 19:21:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 19:21:02 -0700
commit4f63e3c5be2ab55d47d89ea1d32d2c27254daf26 (patch)
tree491c6d58ccb246e0b049fa60af4328f649c54089 /fs
parente6f901bb85bc0707aaafb3c123c3013c0feaba7d (diff)
parent8f34a430ac16d5fbd9d6b383184d35e152f5a963 (diff)
downloadop-kernel-dev-4f63e3c5be2ab55d47d89ea1d32d2c27254daf26.zip
op-kernel-dev-4f63e3c5be2ab55d47d89ea1d32d2c27254daf26.tar.gz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3dfef06..cf0d2ff 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -440,7 +440,7 @@ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) {
static int nfs4_access_to_omode(u32 access)
{
- switch (access) {
+ switch (access & NFS4_SHARE_ACCESS_BOTH) {
case NFS4_SHARE_ACCESS_READ:
return O_RDONLY;
case NFS4_SHARE_ACCESS_WRITE:
OpenPOWER on IntegriCloud