> On Jan 19, 2021, at 5:35 PM, J. Bruce Fields <bfields@xxxxxxxxxx> wrote: > > From: "J. Bruce Fields" <bfields@xxxxxxxxxx> > > Similarly, this STALE_CLIENTID check is already handled inside > preprocess_confirmed_seqid_op(). I can't confirm this claim. Where is clid->cl_boot checked? Did you mean nfs4_preprocess_confirmed_seqid_op() here? > (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@xxxxxxxxxx> > --- > fs/nfsd/nfs4state.c | 4 ---- > 1 file changed, 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, > -- > 2.29.2 > -- Chuck Lever
