diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-20 16:45:49 -0700 |
|---|---|---|
| committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2012-11-20 14:27:27 -0200 |
| commit | dce3e9571d0008f7c12ca5dc81b522ee787654f6 (patch) | |
| tree | 073611ab13e8d48adcfdbf5003a82acd0e26a716 /net/ceph | |
| parent | 1b9ca7e3925694824db7ad6dfb036976ac6ba9d1 (diff) | |
libceph: close socket directly from ceph_con_close()
commit ee76e0736db8455e3b11827d6899bd2a4e1d0584 upstream.
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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Diffstat (limited to 'net/ceph')
| -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 32ab7cd089a3..46ce113732e6 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); |