From patchwork Sat Feb 20 16:45:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8367061 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6CC8C0553 for ; Sat, 20 Feb 2016 16:46:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28E052010F for ; Sat, 20 Feb 2016 16:46:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 441A52047D for ; Sat, 20 Feb 2016 16:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757889AbcBTQql (ORCPT ); Sat, 20 Feb 2016 11:46:41 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:32979 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757850AbcBTQp6 (ORCPT ); Sat, 20 Feb 2016 11:45:58 -0500 Received: by mail-wm0-f41.google.com with SMTP id g62so106057933wme.0 for ; Sat, 20 Feb 2016 08:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9PKot4Sx3+E0omAlBy52f5Y/FEdNSiz/SAVpQh6N7qs=; b=YfaM/+z7Zt/gk8pMdUReSCDuZjkgapahjqsj6JT9f5POX4MnhuTuLCAalZeqO96gH8 epUDdXzItgQ1s0SAPBJgKdjpIUZ+ThNwG4yPNGWcT5+ogcNnb0JWWuijul1TkllOWs5C rTqvTCwnd8wwYIocPdt83mBHsKUkbiJ5Qsnx16vDLfbFkcw7LLOfLiZXsrksyiFRpeYb nK+uCFndvJHose0iA495DTvKpuL1g8U3BvOAYIsWvHqNZywQgBmFyZwGBwgHVLw9Jpt+ CwXOXWcB8k4bXO4AzQiwfgo84gRIclxldBQ0jZbMCqoR8OwQ/s0nclVagV8iljFyEA1h Zt4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9PKot4Sx3+E0omAlBy52f5Y/FEdNSiz/SAVpQh6N7qs=; b=C039ZNQMgemhwtMyz43z8wdcBnUntHqnyD/z0eEyq61a5i2DRIHsLbvTo+7eeaB+ZJ khCWKxUMiTDa34Cec0WAi0FWOG3JfkrHK61gOiLEN9qB63p1GI7Qd3NrW+wURqe1gilO vZFCODbUW6MRI81PT51SRsOcRFEVGxt+SzIz4ssVCrLeAQVOpH5sFbJ/JO3VlbqKKMRs QFoLCeISbqMhY34CFfwP18sfDwy/8xHii+zt6n5nY6z81hAktPHcZ584UHL5km2vBt4v NaYsspY6+kiUR22oH8dAmlugIXT1UrQ7TaMGYegOuujsnLHJOEKaALXMTZViuqyVGHwc XhMQ== X-Gm-Message-State: AG10YOQ/+Zeob/Of49QVxbpJkhWN5SGZKkwwrKjg8jEnBlGK8+Pe4CYTHb4rmkYKtoXumA== X-Received: by 10.194.121.99 with SMTP id lj3mr21900266wjb.55.1455986757698; Sat, 20 Feb 2016 08:45:57 -0800 (PST) Received: from dhcp-26-205.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id e19sm12784798wmd.1.2016.02.20.08.45.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Feb 2016 08:45:56 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Varada Kari Subject: [PATCH 4/4] libceph: use sizeof_footer() in ceph_msg_revoke() Date: Sat, 20 Feb 2016 17:45:29 +0100 Message-Id: <1455986729-12544-5-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1455986729-12544-1-git-send-email-idryomov@gmail.com> References: <1455986729-12544-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- 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)