diff options
author | Sage Weil <sage@inktank.com> | 2012-07-20 16:45:49 -0700 |
---|---|---|
committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-27 09:36:00 +0100 |
commit | 31062b378e16db2af469c07862984cc16e280938 (patch) | |
tree | c920ab56356d01d0c7c1af970ba802e1e52de198 /net | |
parent | b473c7d9d20c9a35474eb9c60bbaaab0eef790da (diff) |
libceph: close socket directly from ceph_con_close()
(cherry picked from commit ee76e0736db8455e3b11827d6899bd2a4e1d0584)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/messenger.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 7bd757cb01af..49f78ff62478 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); |