diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2021-01-21 17:57:38 -0500 |
|---|---|---|
| committer |   Chuck Lever <chuck.lever@oracle.com> | 2021-01-25 09:36:29 -0500 |
| commit | a9d53a75cf574d6aa41f3cb4968fffe4f64e0fad (patch) | |
| tree | 7045482258909bd9a7668b84c80f5f79e1329daf /fs/nfsd | |
| parent | nfsd4: simplify process_lookup1 (diff) | |
| download | linux-dev-a9d53a75cf574d6aa41f3cb4968fffe4f64e0fad.tar.xz linux-dev-a9d53a75cf574d6aa41f3cb4968fffe4f64e0fad.zip | |
nfsd: simplify process_lock
Similarly, this STALE_CLIENTID check is already handled by:
nfs4_preprocess_confirmed_seqid_op()->
nfs4_preprocess_seqid_op()->
nfsd4_lookup_stateid()->
set_client()->
STALE_CLIENTID()
(This may cause it to return a different error in some cases where
there are multiple things wrong; pynfs test SEQ10 regressed on this
commit because of that, but I think that's the test's fault, and I've
fixed it separately.)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f9f89229dba6..7ea63d7cec4d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6697,10 +6697,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, &cstate->session->se_client->cl_clientid, sizeof(clientid_t)); - status = nfserr_stale_clientid; - if (STALE_CLIENTID(&lock->lk_new_clientid, nn)) - goto out; - /* validate and update open stateid and open seqid */ status = nfs4_preprocess_confirmed_seqid_op(cstate, lock->lk_new_open_seqid, |