diff options
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 81a75f3081f4..b73e96db1f50 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2127,7 +2127,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei | |||
2127 | } | 2127 | } |
2128 | } | 2128 | } |
2129 | 2129 | ||
2130 | if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) { | 2130 | if (nfs4_check_fh(current_fh, stp)) { |
2131 | dprintk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n"); | 2131 | dprintk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n"); |
2132 | return nfserr_bad_stateid; | 2132 | return nfserr_bad_stateid; |
2133 | } | 2133 | } |
@@ -2194,7 +2194,7 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2194 | 2194 | ||
2195 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2195 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2196 | oc->oc_seqid, &oc->oc_req_stateid, | 2196 | oc->oc_seqid, &oc->oc_req_stateid, |
2197 | CHECK_FH | CONFIRM | OPEN_STATE, | 2197 | CONFIRM | OPEN_STATE, |
2198 | &oc->oc_stateowner, &stp, NULL))) | 2198 | &oc->oc_stateowner, &stp, NULL))) |
2199 | goto out; | 2199 | goto out; |
2200 | 2200 | ||
@@ -2265,7 +2265,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, | |||
2265 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2265 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2266 | od->od_seqid, | 2266 | od->od_seqid, |
2267 | &od->od_stateid, | 2267 | &od->od_stateid, |
2268 | CHECK_FH | OPEN_STATE, | 2268 | OPEN_STATE, |
2269 | &od->od_stateowner, &stp, NULL))) | 2269 | &od->od_stateowner, &stp, NULL))) |
2270 | goto out; | 2270 | goto out; |
2271 | 2271 | ||
@@ -2318,7 +2318,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2318 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2318 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2319 | close->cl_seqid, | 2319 | close->cl_seqid, |
2320 | &close->cl_stateid, | 2320 | &close->cl_stateid, |
2321 | CHECK_FH | OPEN_STATE | CLOSE_STATE, | 2321 | OPEN_STATE | CLOSE_STATE, |
2322 | &close->cl_stateowner, &stp, NULL))) | 2322 | &close->cl_stateowner, &stp, NULL))) |
2323 | goto out; | 2323 | goto out; |
2324 | status = nfs_ok; | 2324 | status = nfs_ok; |
@@ -2623,7 +2623,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2623 | status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2623 | status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2624 | lock->lk_new_open_seqid, | 2624 | lock->lk_new_open_seqid, |
2625 | &lock->lk_new_open_stateid, | 2625 | &lock->lk_new_open_stateid, |
2626 | CHECK_FH | OPEN_STATE, | 2626 | OPEN_STATE, |
2627 | &lock->lk_replay_owner, &open_stp, | 2627 | &lock->lk_replay_owner, &open_stp, |
2628 | lock); | 2628 | lock); |
2629 | if (status) | 2629 | if (status) |
@@ -2650,7 +2650,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2650 | status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2650 | status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2651 | lock->lk_old_lock_seqid, | 2651 | lock->lk_old_lock_seqid, |
2652 | &lock->lk_old_lock_stateid, | 2652 | &lock->lk_old_lock_stateid, |
2653 | CHECK_FH | LOCK_STATE, | 2653 | LOCK_STATE, |
2654 | &lock->lk_replay_owner, &lock_stp, lock); | 2654 | &lock->lk_replay_owner, &lock_stp, lock); |
2655 | if (status) | 2655 | if (status) |
2656 | goto out; | 2656 | goto out; |
@@ -2847,7 +2847,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
2847 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, | 2847 | if ((status = nfs4_preprocess_seqid_op(&cstate->current_fh, |
2848 | locku->lu_seqid, | 2848 | locku->lu_seqid, |
2849 | &locku->lu_stateid, | 2849 | &locku->lu_stateid, |
2850 | CHECK_FH | LOCK_STATE, | 2850 | LOCK_STATE, |
2851 | &locku->lu_stateowner, &stp, NULL))) | 2851 | &locku->lu_stateowner, &stp, NULL))) |
2852 | goto out; | 2852 | goto out; |
2853 | 2853 | ||