diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-08-10 16:16:03 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-08-10 16:16:03 -0400 |
| commit | 9056fff3d5190617a93a4ae658a2ea7b96772834 (patch) | |
| tree | e8de015b5303c44582262f79983bfa31d2de760c /fs/nfsd | |
| parent | c8623999ffddb8f906154b195aa80d2d279d814f (diff) | |
| parent | 8fcd461db7c09337b6d2e22d25eb411123f379e3 (diff) | |
| download | linux-9056fff3d5190617a93a4ae658a2ea7b96772834.tar.gz linux-9056fff3d5190617a93a4ae658a2ea7b96772834.tar.bz2 linux-9056fff3d5190617a93a4ae658a2ea7b96772834.zip | |
Merge branch 'for-4.2' into for-4.3
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5775943e8b42..43903abd6189 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4396,9 +4396,9 @@ laundromat_main(struct work_struct *laundry) queue_delayed_work(laundry_wq, &nn->laundromat_work, t*HZ); } -static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_ol_stateid *stp) +static inline __be32 nfs4_check_fh(struct svc_fh *fhp, struct nfs4_stid *stp) { - if (!fh_match(&fhp->fh_handle, &stp->st_stid.sc_file->fi_fhandle)) + if (!fh_match(&fhp->fh_handle, &stp->sc_file->fi_fhandle)) return nfserr_bad_stateid; return nfs_ok; } @@ -4601,9 +4601,6 @@ nfs4_check_olstateid(struct svc_fh *fhp, struct nfs4_ol_stateid *ols, int flags) { __be32 status; - status = nfs4_check_fh(fhp, ols); - if (status) - return status; status = nfsd4_check_openowner_confirmed(ols); if (status) return status; @@ -4690,6 +4687,9 @@ nfs4_preprocess_stateid_op(struct svc_rqst *rqstp, status = nfserr_bad_stateid; break; } + if (status) + goto out; + status = nfs4_check_fh(fhp, s); done: if (!status && filpp) @@ -4798,7 +4798,7 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_ status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nfsd4_has_session(cstate)); if (status) return status; - return nfs4_check_fh(current_fh, stp); + return nfs4_check_fh(current_fh, &stp->st_stid); } /* |