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

Commit e825a66d authored by Alex Elder's avatar Alex Elder Committed by Alex Elder
Browse files

ceph: drop msgr argument from prepare_write_connect() 



In all cases, the value passed as the msgr argument to
prepare_write_connect() is just con->msgr.  Just get the msgr
value from the ceph connection and drop the unneeded argument.

The only msgr passed to prepare_write_banner() is also therefore
just the one from con->msgr, so change that function to drop the
msgr argument as well.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 41b90c00

net/ceph/messenger.c

+11 −14
Original line number Diff line number Diff line
@@ -683,19 +683,17 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 
/*

 * We connected to a peer and are saying hello.

 */

static void prepare_write_banner(struct ceph_messenger *msgr,

				 struct ceph_connection *con)

static void prepare_write_banner(struct ceph_connection *con)

{

	ceph_con_out_kvec_add(con, strlen(CEPH_BANNER), CEPH_BANNER);

	ceph_con_out_kvec_add(con, sizeof (msgr->my_enc_addr),

					&msgr->my_enc_addr);

	ceph_con_out_kvec_add(con, sizeof (con->msgr->my_enc_addr),

					&con->msgr->my_enc_addr);



	con->out_more = 0;

	set_bit(WRITE_PENDING, &con->state);

}



static int prepare_write_connect(struct ceph_messenger *msgr,

				 struct ceph_connection *con)

static int prepare_write_connect(struct ceph_connection *con)

{

	unsigned global_seq = get_global_seq(con->msgr, 0);

	int proto;
@@ -717,7 +715,7 @@ static int prepare_write_connect(struct ceph_messenger *msgr, 
	dout("prepare_write_connect %p cseq=%d gseq=%d proto=%d\n", con,

	     con->connect_seq, global_seq, proto);



	con->out_connect.features = cpu_to_le64(msgr->supported_features);

	con->out_connect.features = cpu_to_le64(con->msgr->supported_features);

	con->out_connect.host_type = cpu_to_le32(CEPH_ENTITY_TYPE_CLIENT);

	con->out_connect.connect_seq = cpu_to_le32(con->connect_seq);

	con->out_connect.global_seq = cpu_to_le32(global_seq);
@@ -1386,7 +1384,7 @@ static int process_connect(struct ceph_connection *con) 
		}

		con->auth_retry = 1;

		ceph_con_out_kvec_reset(con);

		ret = prepare_write_connect(con->msgr, con);

		ret = prepare_write_connect(con);

		if (ret < 0)

			return ret;

		prepare_read_connect(con);
@@ -1407,7 +1405,7 @@ static int process_connect(struct ceph_connection *con) 
		       ceph_pr_addr(&con->peer_addr.in_addr));

		reset_connection(con);

		ceph_con_out_kvec_reset(con);

		prepare_write_connect(con->msgr, con);

		prepare_write_connect(con);

		prepare_read_connect(con);



		/* Tell ceph about it. */
@@ -1431,7 +1429,7 @@ static int process_connect(struct ceph_connection *con) 
		     le32_to_cpu(con->in_connect.connect_seq));

		con->connect_seq = le32_to_cpu(con->in_connect.connect_seq);

		ceph_con_out_kvec_reset(con);

		prepare_write_connect(con->msgr, con);

		prepare_write_connect(con);

		prepare_read_connect(con);

		break;
@@ -1446,7 +1444,7 @@ static int process_connect(struct ceph_connection *con) 
		get_global_seq(con->msgr,

			       le32_to_cpu(con->in_connect.global_seq));

		ceph_con_out_kvec_reset(con);

		prepare_write_connect(con->msgr, con);

		prepare_write_connect(con);

		prepare_read_connect(con);

		break;
@@ -1840,7 +1838,6 @@ static void process_message(struct ceph_connection *con) 
 */

static int try_write(struct ceph_connection *con)

{

	struct ceph_messenger *msgr = con->msgr;

	int ret = 1;



	dout("try_write start %p state %lu nref %d\n", con, con->state,
@@ -1852,8 +1849,8 @@ more: 
	/* open the socket first? */

	if (con->sock == NULL) {

		ceph_con_out_kvec_reset(con);

		prepare_write_banner(msgr, con);

		prepare_write_connect(msgr, con);

		prepare_write_banner(con);

		prepare_write_connect(con);

		prepare_read_banner(con);

		set_bit(CONNECTING, &con->state);

		clear_bit(NEGOTIATING, &con->state);