aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-20 16:45:49 -0700
committerSage Weil <sage@inktank.com>2012-07-30 18:15:58 -0700
commitee76e0736db8455e3b11827d6899bd2a4e1d0584 (patch)
treeef44731396059db4379b369f0315100c21638509 /net
parent2e8cb10063820af7ed7638e3fd9013eee21266e7 (diff)
downloadlinux-ee76e0736db8455e3b11827d6899bd2a4e1d0584.tar.gz
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>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 32ab7cd089a..46ce113732e 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);