Commit ee76e073 authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@inktank.com>
parent 2e8cb100
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment