diff options
| author | Alex Elder | 2012-06-11 21:57:13 +0200 |
|---|---|---|
| committer | Sage Weil | 2012-07-06 06:14:13 +0200 |
| commit | fd154f3c75465abd83b7a395033e3755908a1e6e (patch) | |
| tree | e3b386cd2bf33c687cdac4ef45bf8a063a7049d0 /net | |
| parent | libceph: encapsulate advancing msg page (diff) | |
| download | kernel-qcow2-linux-fd154f3c75465abd83b7a395033e3755908a1e6e.tar.gz kernel-qcow2-linux-fd154f3c75465abd83b7a395033e3755908a1e6e.tar.xz kernel-qcow2-linux-fd154f3c75465abd83b7a395033e3755908a1e6e.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 1b92e3b16c0d..5354d59ba8b9 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -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); |