From 7c3871b61ff1734a4c5a8f82d0f8e102a62bc1bf Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Fri, 20 Jul 2012 16:45:49 -0700
Subject: [PATCH] --- yaml --- r: 320365 b: refs/heads/master c:
 ee76e0736db8455e3b11827d6899bd2a4e1d0584 h: refs/heads/master i:   320363:
 829750fbdb0988b72efd22eded4e73316d5b64d0 v: v3

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

diff --git a/[refs] b/[refs]
index d56d06ed5ab1..a1d125fab5a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8cb10063820af7ed7638e3fd9013eee21266e7
+refs/heads/master: ee76e0736db8455e3b11827d6899bd2a4e1d0584
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 32ab7cd089a3..46ce113732e6 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -519,14 +519,8 @@ void ceph_con_close(struct ceph_connection *con)
 	reset_connection(con);
 	con->peer_global_seq = 0;
 	cancel_delayed_work(&con->work);
+	con_close_socket(con);
 	mutex_unlock(&con->mutex);
-
-	/*
-	 * We cannot close the socket directly from here because the
-	 * work threads use it without holding the mutex.  Instead, let
-	 * con_work() do it.
-	 */
-	queue_con(con);
 }
 EXPORT_SYMBOL(ceph_con_close);