From 34f687c348e2fdbce23fe20e954ff42dfe095a49 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 29 May 2012 14:26:30 -0400 Subject: [PATCH] --- yaml --- r: 309865 b: refs/heads/master c: 32f16b3823b854a1f73bfad43782fbbcfe086090 h: refs/heads/master i: 309863: f5b9ee58c7cb28a59a2d9f0b6e2ac6d1b9f450b0 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3361b0c16536..51b05732392a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 778df3f0feaeb03ebf9f370cba8437491ffa889f +refs/heads/master: 32f16b3823b854a1f73bfad43782fbbcfe086090 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index e0ed84d17aa8..8d10760800ad 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -1750,16 +1750,10 @@ nfsd4_create_session(struct svc_rqst *rqstp, cs_slot = &conf->cl_cs_slot; status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0); if (status == nfserr_replay_cache) { - dprintk("Got a create_session replay! seqid= %d\n", - cs_slot->sl_seqid); - /* Return the cached reply status */ status = nfsd4_replay_create_session(cr_ses, cs_slot); goto out; } else if (cr_ses->seqid != cs_slot->sl_seqid + 1) { status = nfserr_seq_misordered; - dprintk("Sequence misordered!\n"); - dprintk("Expected seqid= %d but got seqid= %d\n", - cs_slot->sl_seqid, cr_ses->seqid); goto out; } } else if (unconf) { @@ -1768,7 +1762,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, status = nfserr_clid_inuse; goto out; } - cs_slot = &unconf->cl_cs_slot; status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0); if (status) { @@ -1776,7 +1769,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, status = nfserr_seq_misordered; goto out; } - confirm_me = true; conf = unconf; } else {