From: Sage Weil <sage@inktank.com>
Date: Fri, 20 Jul 2012 23:45:49 +0000 (-0700)
Subject: libceph: close socket directly from ceph_con_close()
X-Git-Tag: v3.6-rc1~36^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee76e0736db8455e3b11827d6899bd2a4e1d0584;p=platform%2Fkernel%2Flinux-exynos.git

libceph: close socket directly from ceph_con_close()

It is simpler to do this immediately, since we already hold the con mutex.
It also avoids the need to deal with a not-quite-CLOSED socket in con_work.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 32ab7cd..46ce113 100644
--- a/net/ceph/messenger.c
+++ b/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);