Commit f3362737 authored by J. Bruce Fields's avatar J. Bruce Fields

nfsd4: remove unnecessary CHECK_FH check in preprocess_seqid_op

Every caller sets this flag, so it's meaningless.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 065f30ec
...@@ -2127,7 +2127,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei ...@@ -2127,7 +2127,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei
} }
} }
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) { if (nfs4_check_fh(current_fh, stp)) {
dprintk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n"); dprintk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
...@@ -2194,7 +2194,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ...@@ -2194,7 +2194,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
oc->oc_seqid, &oc->oc_req_stateid, oc->oc_seqid, &oc->oc_req_stateid,
CHECK_FH | CONFIRM | OPEN_STATE, CONFIRM | OPEN_STATE,
&oc->oc_stateowner, &stp, NULL))) &oc->oc_stateowner, &stp, NULL)))
goto out; goto out;
...@@ -2265,7 +2265,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, ...@@ -2265,7 +2265,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
od->od_seqid, od->od_seqid,
&od->od_stateid, &od->od_stateid,
CHECK_FH | OPEN_STATE, OPEN_STATE,
&od->od_stateowner, &stp, NULL))) &od->od_stateowner, &stp, NULL)))
goto out; goto out;
...@@ -2318,7 +2318,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ...@@ -2318,7 +2318,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
close->cl_seqid, close->cl_seqid,
&close->cl_stateid, &close->cl_stateid,
CHECK_FH | OPEN_STATE | CLOSE_STATE, OPEN_STATE | CLOSE_STATE,
&close->cl_stateowner, &stp, NULL))) &close->cl_stateowner, &stp, NULL)))
goto out; goto out;
status = nfs_ok; status = nfs_ok;
...@@ -2623,7 +2623,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ...@@ -2623,7 +2623,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_seqid_op(&cstate->current_fh, status = nfs4_preprocess_seqid_op(&cstate->current_fh,
lock->lk_new_open_seqid, lock->lk_new_open_seqid,
&lock->lk_new_open_stateid, &lock->lk_new_open_stateid,
CHECK_FH | OPEN_STATE, OPEN_STATE,
&lock->lk_replay_owner, &open_stp, &lock->lk_replay_owner, &open_stp,
lock); lock);
if (status) if (status)
...@@ -2650,7 +2650,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ...@@ -2650,7 +2650,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_seqid_op(&cstate->current_fh, status = nfs4_preprocess_seqid_op(&cstate->current_fh,
lock->lk_old_lock_seqid, lock->lk_old_lock_seqid,
&lock->lk_old_lock_stateid, &lock->lk_old_lock_stateid,
CHECK_FH | LOCK_STATE, LOCK_STATE,
&lock->lk_replay_owner, &lock_stp, lock); &lock->lk_replay_owner, &lock_stp, lock);
if (status) if (status)
goto out; goto out;
...@@ -2847,7 +2847,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ...@@ -2847,7 +2847,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh,
locku->lu_seqid, locku->lu_seqid,
&locku->lu_stateid, &locku->lu_stateid,
CHECK_FH | LOCK_STATE, LOCK_STATE,
&locku->lu_stateowner, &stp, NULL))) &locku->lu_stateowner, &stp, NULL)))
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment