aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-05-29 14:26:30 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-05-31 20:30:31 -0400
commit32f16b3823b854a1f73bfad43782fbbcfe086090 (patch)
tree1ea8f6980351f646ac1c21408717ac804f68bb2b
parent778df3f0feaeb03ebf9f370cba8437491ffa889f (diff)
nfsd4: remove some dprintk's and a comment
The comment is redundant, and if we really want dprintk's here they'd probably be better in the common (check-slot_seqid) code. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e0ed84d17aa8..8d10760800ad 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1750,16 +1750,10 @@ nfsd4_create_session(struct svc_rqst *rqstp,
1750 cs_slot = &conf->cl_cs_slot; 1750 cs_slot = &conf->cl_cs_slot;
1751 status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0); 1751 status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0);
1752 if (status == nfserr_replay_cache) { 1752 if (status == nfserr_replay_cache) {
1753 dprintk("Got a create_session replay! seqid= %d\n",
1754 cs_slot->sl_seqid);
1755 /* Return the cached reply status */
1756 status = nfsd4_replay_create_session(cr_ses, cs_slot); 1753 status = nfsd4_replay_create_session(cr_ses, cs_slot);
1757 goto out; 1754 goto out;
1758 } else if (cr_ses->seqid != cs_slot->sl_seqid + 1) { 1755 } else if (cr_ses->seqid != cs_slot->sl_seqid + 1) {
1759 status = nfserr_seq_misordered; 1756 status = nfserr_seq_misordered;
1760 dprintk("Sequence misordered!\n");
1761 dprintk("Expected seqid= %d but got seqid= %d\n",
1762 cs_slot->sl_seqid, cr_ses->seqid);
1763 goto out; 1757 goto out;
1764 } 1758 }
1765 } else if (unconf) { 1759 } else if (unconf) {
@@ -1768,7 +1762,6 @@ nfsd4_create_session(struct svc_rqst *rqstp,
1768 status = nfserr_clid_inuse; 1762 status = nfserr_clid_inuse;
1769 goto out; 1763 goto out;
1770 } 1764 }
1771
1772 cs_slot = &unconf->cl_cs_slot; 1765 cs_slot = &unconf->cl_cs_slot;
1773 status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0); 1766 status = check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0);
1774 if (status) { 1767 if (status) {
@@ -1776,7 +1769,6 @@ nfsd4_create_session(struct svc_rqst *rqstp,
1776 status = nfserr_seq_misordered; 1769 status = nfserr_seq_misordered;
1777 goto out; 1770 goto out;
1778 } 1771 }
1779
1780 confirm_me = true; 1772 confirm_me = true;
1781 conf = unconf; 1773 conf = unconf;
1782 } else { 1774 } else {