From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
No change in behavior.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
---
fs/nfsd/nfs4state.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b7e2f25..d6ca2be 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2084,6 +2084,9 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
goto out;
}
stidp = &dp->dl_stateid;
+ status = check_stateid_generation(stateid, stidp);
+ if (status)
+ goto out;
} else { /* open or lock stateid */
stp = find_stateid(stateid, flags);
if (!stp) {
@@ -2095,10 +2098,10 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
if (!stp->st_stateowner->so_confirmed)
goto out;
stidp = &stp->st_stateid;
+ status = check_stateid_generation(stateid, stidp);
+ if (status)
+ goto out;
}
- status = check_stateid_generation(stateid, stidp);
- if (status)
- goto out;
if (stp) {
status = nfs4_check_openmode(stp, flags);
if (status)
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
