Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Linus Torvalds 14 years ago
parent
e6f901bb85 8f34a430ac
commit
4f63e3c5be
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      fs/nfsd/nfs4state.c

+ 1 - 1
fs/nfsd/nfs4state.c
View File 

@@ -440,7 +440,7 @@ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) {
 
 
 
 static int nfs4_access_to_omode(u32 access)
 
 static int nfs4_access_to_omode(u32 access)
 
 {
 
 {
 
-	switch (access) {
 
+	switch (access & NFS4_SHARE_ACCESS_BOTH) {
 
 	case NFS4_SHARE_ACCESS_READ:
 
 	case NFS4_SHARE_ACCESS_READ:
 
 		return O_RDONLY;
 
 		return O_RDONLY;
 
 	case NFS4_SHARE_ACCESS_WRITE:
 
 	case NFS4_SHARE_ACCESS_WRITE: