Commit 71ececda authored by Sage Weil's avatar Sage Weil
Browse files

ceph: remove unnecessary ceph_con_shutdown 



We require that ceph_con_close be called before we drop the connection,
so this is unneeded.  Just BUG if con->sock != NULL.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 42ce56e5

fs/ceph/messenger.c

+1 −12
Original line number Diff line number Diff line
@@ -339,17 +339,6 @@ void ceph_con_close(struct ceph_connection *con) 
	queue_con(con);

}



/*

 * clean up connection state

 */

void ceph_con_shutdown(struct ceph_connection *con)

{

	dout("con_shutdown %p\n", con);

	reset_connection(con);

	set_bit(DEAD, &con->state);

	con_close_socket(con); /* silently ignore errors */

}



/*

 * Reopen a closed connection, with a new peer address.

 */
@@ -380,7 +369,7 @@ void ceph_con_put(struct ceph_connection *con) 
	     atomic_read(&con->nref), atomic_read(&con->nref) - 1);

	BUG_ON(atomic_read(&con->nref) == 0);

	if (atomic_dec_and_test(&con->nref)) {

		ceph_con_shutdown(con);

		BUG_ON(con->sock);

		kfree(con);

	}

}