diff options
| author | Benny Halevy <benny@tonian.com> | 2012-02-16 19:57:09 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-02-18 00:38:42 +0100 |
| commit | 2c8bd7e0d1b66b2f8f267fd6ab62a30569c792c0 (patch) | |
| tree | 54f90f3eb8c7cebfefea8b11957b2514078fe13d /fs/nfsd/nfs4state.c | |
| parent | nfsd41: share_access_to_flags should consider only nfs4.x share_access flags (diff) | |
| download | linux-2c8bd7e0d1b66b2f8f267fd6ab62a30569c792c0.tar.xz linux-2c8bd7e0d1b66b2f8f267fd6ab62a30569c792c0.zip | |
nfsd41: split out share_access want and signal flags while decoding
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f89ccc263905..45966a436b0a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2637,8 +2637,6 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) static int share_access_to_flags(u32 share_access) { - share_access &= NFS4_SHARE_ACCESS_MASK; - return share_access == NFS4_SHARE_ACCESS_READ ? RD_STATE : WR_STATE; } @@ -3600,7 +3598,9 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, cstate->current_fh.fh_dentry->d_name.name); /* We don't yet support WANT bits: */ - od->od_share_access &= NFS4_SHARE_ACCESS_MASK; + if (od->od_deleg_want) + dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__, + od->od_deleg_want); nfs4_lock_state(); status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid, |