From: Ilya Dryomov <idryomov@gmail.com>
To: ceph-devel@vger.kernel.org
Cc: Varada Kari <Varada.Kari@sandisk.com>
Subject: [PATCH 4/4] libceph: use sizeof_footer() in ceph_msg_revoke()
Date: Sat, 20 Feb 2016 17:45:29 +0100 [thread overview]
Message-ID: <1455986729-12544-5-git-send-email-idryomov@gmail.com> (raw)
In-Reply-To: <1455986729-12544-1-git-send-email-idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
net/ceph/messenger.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index dd7c1b7f932b..43edf897c9eb 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -3085,10 +3085,7 @@ void ceph_msg_revoke(struct ceph_msg *msg)
con->out_skip += con_out_kvec_skip(con);
} else {
BUG_ON(!msg->data_length);
- if (con->peer_features & CEPH_FEATURE_MSG_AUTH)
- con->out_skip += sizeof(msg->footer);
- else
- con->out_skip += sizeof(msg->old_footer);
+ con->out_skip += sizeof_footer(con);
}
/* data, middle, front */
if (msg->data_length)
--
2.4.3
next prev parent reply other threads:[~2016-02-20 16:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-20 16:45 [PATCH 0/4] libceph: message skipping fixes Ilya Dryomov
2016-02-20 16:45 ` [PATCH 1/4] libceph: don't bail early from try_read() when skipping a message Ilya Dryomov
2016-02-20 18:28 ` Alex Elder
2016-02-20 20:21 ` Ilya Dryomov
2016-02-20 20:38 ` Alex Elder
2016-02-20 16:45 ` [PATCH 2/4] libceph: use the right footer size " Ilya Dryomov
2016-02-20 18:44 ` Alex Elder
2016-02-20 20:05 ` Ilya Dryomov
2016-02-20 20:15 ` Alex Elder
2016-02-21 14:31 ` Ilya Dryomov
2016-02-21 14:35 ` [PATCH 4/4] libceph: use sizeof_footer() more Ilya Dryomov
2016-02-21 15:08 ` Alex Elder
2016-02-20 16:45 ` [PATCH 3/4] libceph: don't spam dmesg with stray reply warnings Ilya Dryomov
2016-02-20 18:46 ` Alex Elder
2016-02-20 16:45 ` Ilya Dryomov [this message]
2016-02-20 18:47 ` [PATCH 4/4] libceph: use sizeof_footer() in ceph_msg_revoke() Alex Elder
2016-02-20 19:51 ` Ilya Dryomov
2016-02-20 19:56 ` Alex Elder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455986729-12544-5-git-send-email-idryomov@gmail.com \
--to=idryomov@gmail.com \
--cc=Varada.Kari@sandisk.com \
--cc=ceph-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox