diff options
author | Benny Halevy <benny@tonian.com> | 2012-02-16 13:57:00 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-02-17 11:50:36 -0500 |
commit | 00b5f95a26f2f95b86e59cf86346b06ba14943ee (patch) | |
tree | 51eff7ba54df6d042b276e07be413e0475124879 /fs/nfsd | |
parent | 37c593c57324740821766c56e48cf09776a68a9c (diff) |
nfsd41: share_access_to_flags should consider only nfs4.x share_access flags
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cf62079e9b71..f89ccc263905 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2637,7 +2637,7 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) | |||
2637 | 2637 | ||
2638 | static int share_access_to_flags(u32 share_access) | 2638 | static int share_access_to_flags(u32 share_access) |
2639 | { | 2639 | { |
2640 | share_access &= ~NFS4_SHARE_WANT_MASK; | 2640 | share_access &= NFS4_SHARE_ACCESS_MASK; |
2641 | 2641 | ||
2642 | return share_access == NFS4_SHARE_ACCESS_READ ? RD_STATE : WR_STATE; | 2642 | return share_access == NFS4_SHARE_ACCESS_READ ? RD_STATE : WR_STATE; |
2643 | } | 2643 | } |