diff options
author | Sage Weil <sage@inktank.com> | 2012-07-20 19:45:49 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2012-07-30 21:15:58 -0400 |
commit | ee76e0736db8455e3b11827d6899bd2a4e1d0584 (patch) | |
tree | ef44731396059db4379b369f0315100c21638509 /net/ceph | |
parent | 2e8cb10063820af7ed7638e3fd9013eee21266e7 (diff) |
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/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) | |||
519 | reset_connection(con); | 519 | reset_connection(con); |
520 | con->peer_global_seq = 0; | 520 | con->peer_global_seq = 0; |
521 | cancel_delayed_work(&con->work); | 521 | cancel_delayed_work(&con->work); |
522 | con_close_socket(con); | ||
522 | mutex_unlock(&con->mutex); | 523 | mutex_unlock(&con->mutex); |
523 | |||
524 | /* | ||
525 | * We cannot close the socket directly from here because the | ||
526 | * work threads use it without holding the mutex. Instead, let | ||
527 | * con_work() do it. | ||
528 | */ | ||
529 | queue_con(con); | ||
530 | } | 524 | } |
531 | EXPORT_SYMBOL(ceph_con_close); | 525 | EXPORT_SYMBOL(ceph_con_close); |
532 | 526 | ||