Commit 4f63e3c5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents e6f901bb 8f34a430
...@@ -440,7 +440,7 @@ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) { ...@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment