summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2015-07-13 17:32:34 +0800
committerJ. Bruce Fields <bfields@redhat.com>2015-08-10 16:05:49 -0400
commitf5e22bb6d91aba04fd252c1067b79c0227599a6a (patch)
tree2038cb0881f36d9c252e57fc2e26263d45afb2bd /fs/nfsd
parent6cd22668e8c8e2618c1883c835de10e11395123b (diff)
downloadop-kernel-dev-f5e22bb6d91aba04fd252c1067b79c0227599a6a.zip
op-kernel-dev-f5e22bb6d91aba04fd252c1067b79c0227599a6a.tar.gz
nfsd: Drop duplicate checking of seqid in nfsd4_create_session()
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 14c49e5..30dbc9c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2555,11 +2555,9 @@ nfsd4_create_session(struct svc_rqst *rqstp,
goto out_free_conn;
cs_slot = &conf->cl_cs_slot;
status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0);
- if (status == nfserr_replay_cache) {
- status = nfsd4_replay_create_session(cr_ses, cs_slot);
- goto out_free_conn;
- } else if (cr_ses->seqid != cs_slot->sl_seqid + 1) {
- status = nfserr_seq_misordered;
+ if (status) {
+ if (status == nfserr_replay_cache)
+ status = nfsd4_replay_create_session(cr_ses, cs_slot);
goto out_free_conn;
}
} else if (unconf) {
OpenPOWER on IntegriCloud