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

Commit fd154f3c authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: don't mark footer complete before it is 



This is a nit, but prepare_write_message() sets the FOOTER_COMPLETE
flag before the CRC for the data portion (recorded in the footer)
has been completely computed.  Hold off setting the complete flag
until we've decided it's ready to send.

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

net/ceph/messenger.c

+3 −1
Original line number Diff line number Diff line
@@ -592,6 +592,8 @@ static void prepare_write_message_footer(struct ceph_connection *con) 
	struct ceph_msg *m = con->out_msg;

	int v = con->out_kvec_left;



	m->footer.flags |= CEPH_MSG_FOOTER_COMPLETE;



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

	con->out_kvec_is_msg = true;

	con->out_kvec[v].iov_base = &m->footer;
@@ -665,7 +667,7 @@ static void prepare_write_message(struct ceph_connection *con) 
	/* fill in crc (except data pages), footer */

	crc = crc32c(0, &m->hdr, offsetof(struct ceph_msg_header, crc));

	con->out_msg->hdr.crc = cpu_to_le32(crc);

	con->out_msg->footer.flags = CEPH_MSG_FOOTER_COMPLETE;

	con->out_msg->footer.flags = 0;



	crc = crc32c(0, m->front.iov_base, m->front.iov_len);

	con->out_msg->footer.front_crc = cpu_to_le32(crc);