From a39c023d583e8256c98da6a4e81d7f5846a93347 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 11 Jun 2012 14:57:13 -0500 Subject: [PATCH] --- yaml --- r: 320287 b: refs/heads/master c: fd154f3c75465abd83b7a395033e3755908a1e6e h: refs/heads/master i: 320285: b6f55568d4b4c120dbf20afccc421bbc15703bac 320283: bdb5df2f465b611c7b1da9b7553a2df73ce8e9d7 320279: 87ccb1aa923bf2bb30582c4e7c78e9c8e57d0e7d 320271: 8a19e7624f58a221ccdbc4165c289eab2d883516 320255: 37c6886b62b84ec01fdaaaa85f48b443e4b81047 v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cef5b14d08a7..a45fc6c3bd78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84ca8fc87fcf4ab97bb8acdb59bf97bb4820cb14 +refs/heads/master: fd154f3c75465abd83b7a395033e3755908a1e6e diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 1b92e3b16c0d..5354d59ba8b9 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/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);