From: Sage Weil <sage@newdream.net>
Date: Wed, 18 Nov 2009 19:27:06 +0000 (-0800)
Subject: ceph: remove unnecessary ceph_con_shutdown
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=71ececdacae24be333c534869cb1b06357f0e215;p=openwrt%2Fstaging%2Fblogic.git

ceph: remove unnecessary ceph_con_shutdown

We require that ceph_con_close be called before we drop the connection,
so this is unneeded.  Just BUG if con->sock != NULL.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index e389656b2a6b..d8a6a56a1571 100644
--- a/fs/ceph/messenger.c
+++ b/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);
 	}
 }