mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
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>
This commit is contained in:
parent
c383747ef6
commit
3d74e6a5b6
2 changed files with 5 additions and 5 deletions
|
@ -413,7 +413,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
WARN_ON(status && open->op_created);
|
WARN_ON(status && open->op_created);
|
||||||
out:
|
out:
|
||||||
nfsd4_cleanup_open_state(open, status);
|
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;
|
cstate->replay_owner = &open->op_openowner->oo_owner;
|
||||||
nfsd4_bump_seqid(cstate, status);
|
nfsd4_bump_seqid(cstate, status);
|
||||||
if (!cstate->replay_owner)
|
if (!cstate->replay_owner)
|
||||||
|
|
|
@ -3666,7 +3666,8 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,
|
||||||
if (status)
|
if (status)
|
||||||
return status;
|
return status;
|
||||||
*stpp = openlockstateid(s);
|
*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);
|
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;
|
oo->oo_last_closed_stid = stp;
|
||||||
|
|
||||||
if (list_empty(&oo->oo_owner.so_stateids)) {
|
if (list_empty(&oo->oo_owner.so_stateids)) {
|
||||||
if (cstate->minorversion) {
|
if (cstate->minorversion)
|
||||||
release_openowner(oo);
|
release_openowner(oo);
|
||||||
cstate->replay_owner = NULL;
|
else {
|
||||||
} else {
|
|
||||||
/*
|
/*
|
||||||
* In the 4.0 case we need to keep the owners around a
|
* In the 4.0 case we need to keep the owners around a
|
||||||
* little while to handle CLOSE replay.
|
* little while to handle CLOSE replay.
|
||||||
|
|
Loading…
Reference in a new issue