diff options
author | J. Bruce Fields <bfields@redhat.com> | 2013-03-22 21:44:19 (GMT) |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-09 13:08:55 (GMT) |
commit | 3d74e6a5b6b0d1e4786d1596081bed6ab63a4cac (patch) | |
tree | 80751e19acc1febbb28252934385266ea8c234a2 /fs/nfsd/nfs4state.c | |
parent | c383747ef674467d02dd9c9320a47de2067b0ce3 (diff) | |
download | linux-fsl-qoriq-3d74e6a5b6b0d1e4786d1596081bed6ab63a4cac.tar.xz |
nfsd4: no need for replay_owner in sessions case
The replay_owner will never be used in the sessions case.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1226ff6..16db25d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3666,7 +3666,8 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid, if (status) return status; *stpp = openlockstateid(s); - cstate->replay_owner = (*stpp)->st_stateowner; + if (!nfsd4_has_session(cstate)) + cstate->replay_owner = (*stpp)->st_stateowner; return nfs4_seqid_op_checks(cstate, stateid, seqid, *stpp); } @@ -3858,10 +3859,9 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, oo->oo_last_closed_stid = stp; if (list_empty(&oo->oo_owner.so_stateids)) { - if (cstate->minorversion) { + if (cstate->minorversion) release_openowner(oo); - cstate->replay_owner = NULL; - } else { + else { /* * In the 4.0 case we need to keep the owners around a * little while to handle CLOSE replay. |