From 1a28b2eb2fda129daac22fef027807c6267b4ebf Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 18 Nov 2009 11:27:06 -0800
Subject: [PATCH] --- yaml --- r: 188621 b: refs/heads/master c:
 71ececdacae24be333c534869cb1b06357f0e215 h: refs/heads/master i:   188619:
 c6fece04eeebc7d0166a2bef640634dd59eb7ed3 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/ceph/messenger.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index fef632ae80ec..f8645b595b45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ce56e50d948fc7c1c8c3a749ee5a21a7e134f6
+refs/heads/master: 71ececdacae24be333c534869cb1b06357f0e215
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index e389656b2a6b..d8a6a56a1571 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -339,17 +339,6 @@ void ceph_con_close(struct ceph_connection *con)
 	queue_con(con);
 }
 
-/*
- * clean up connection state
- */
-void ceph_con_shutdown(struct ceph_connection *con)
-{
-	dout("con_shutdown %p\n", con);
-	reset_connection(con);
-	set_bit(DEAD, &con->state);
-	con_close_socket(con); /* silently ignore errors */
-}
-
 /*
  * Reopen a closed connection, with a new peer address.
  */
@@ -380,7 +369,7 @@ void ceph_con_put(struct ceph_connection *con)
 	     atomic_read(&con->nref), atomic_read(&con->nref) - 1);
 	BUG_ON(atomic_read(&con->nref) == 0);
 	if (atomic_dec_and_test(&con->nref)) {
-		ceph_con_shutdown(con);
+		BUG_ON(con->sock);
 		kfree(con);
 	}
 }