Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b5ede07 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: fix fault locking; close socket on lossy fault 



If we fault on a lossy connection, we should still close the socket
immediately, and do so under the con mutex.

We should also take the con mutex before printing out the state bits in
the debug output.

Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 070c633f

net/ceph/messenger.c

+7 −7
Original line number Diff line number Diff line
@@ -2330,22 +2330,23 @@ static void con_work(struct work_struct *work) 
 */

static void ceph_fault(struct ceph_connection *con)

{

	mutex_lock(&con->mutex);



	pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),

	       ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);

	dout("fault %p state %lu to peer %s\n",

	     con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));



	if (test_bit(LOSSYTX, &con->flags)) {

		dout("fault on LOSSYTX channel\n");

		goto out;

	}



	mutex_lock(&con->mutex);

	if (test_bit(CLOSED, &con->state))

		goto out_unlock;



	con_close_socket(con);



	if (test_bit(LOSSYTX, &con->flags)) {

		dout("fault on LOSSYTX channel\n");

		goto out_unlock;

	}



	if (con->in_msg) {

		BUG_ON(con->in_msg->con != con);

		con->in_msg->con = NULL;
@@ -2392,7 +2393,6 @@ static void ceph_fault(struct ceph_connection *con) 


out_unlock:

	mutex_unlock(&con->mutex);

out:

	/*

	 * in case we faulted due to authentication, invalidate our

	 * current tickets so that we can get new ones.