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>

2 files changed, 5 insertions, 5 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 609e1e211330..c97bb424f55f 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -413,7 +413,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         WARN_ON(status && open->op_created);
 out:
         nfsd4_cleanup_open_state(open, status);
-        if (open->op_openowner)
+        if (open->op_openowner && !nfsd4_has_session(cstate))
                 cstate->replay_owner = &open->op_openowner->oo_owner;
         nfsd4_bump_seqid(cstate, status);
         if (!cstate->replay_owner)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 1226ff6030bd..16db25dc364f 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.