nfsd41: share_access_to_flags should consider only nfs4.x share_access flags
authorBenny Halevy <benny@tonian.com>
Thu, 16 Feb 2012 18:57:00 +0000 (20:57 +0200)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 17 Feb 2012 16:50:36 +0000 (11:50 -0500)
Currently, it will not correctly ignore any nfsv4.1 signal flags
if the client sends them.

Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c

index cf62079..f89ccc2 100644 (file)
@@ -2637,7 +2637,7 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)
 
 static int share_access_to_flags(u32 share_access)
 {
-       share_access &= ~NFS4_SHARE_WANT_MASK;
+       share_access &= NFS4_SHARE_ACCESS_MASK;
 
        return share_access == NFS4_SHARE_ACCESS_READ ? RD_STATE : WR_STATE;
 }