From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: Re: [PATCH 4/4] libceph: use sizeof_footer() in ceph_msg_revoke() Date: Sat, 20 Feb 2016 12:47:28 -0600 Message-ID: <56C8B4C0.3020009@ieee.org> References: <1455986729-12544-1-git-send-email-idryomov@gmail.com> <1455986729-12544-5-git-send-email-idryomov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ig0-f177.google.com ([209.85.213.177]:34597 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666AbcBTSra (ORCPT ); Sat, 20 Feb 2016 13:47:30 -0500 Received: by mail-ig0-f177.google.com with SMTP id g6so61132417igt.1 for ; Sat, 20 Feb 2016 10:47:29 -0800 (PST) In-Reply-To: <1455986729-12544-5-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Ilya Dryomov , ceph-devel@vger.kernel.org Cc: Varada Kari On 02/20/2016 10:45 AM, Ilya Dryomov wrote: > Signed-off-by: Ilya Dryomov Please just reorder your patches and squash this in with your [2/4] patch. -Alex > --- > 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) >