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

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

libceph: don't reset kvec in prepare_write_banner() 



Move the kvec reset for a connection out of prepare_write_banner and
into its only caller.

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

net/ceph/messenger.c

+1 −3
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ static int prepare_connect_authorizer(struct ceph_connection *con) 
static void prepare_write_banner(struct ceph_messenger *msgr,

				 struct ceph_connection *con)

{

	ceph_con_out_kvec_reset(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);
@@ -726,10 +725,9 @@ static int prepare_write_connect(struct ceph_messenger *msgr, 
	con->out_connect.protocol_version = cpu_to_le32(proto);

	con->out_connect.flags = 0;



	ceph_con_out_kvec_reset(con);

	if (include_banner)

		prepare_write_banner(msgr, con);

	else

		ceph_con_out_kvec_reset(con);

	ceph_con_out_kvec_add(con, sizeof (con->out_connect), &con->out_connect);



	con->out_more = 0;