From patchwork Sun Feb 21 14:35:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8368491 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7A37F9F2F0 for ; Sun, 21 Feb 2016 17:20:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95B1A2041C for ; Sun, 21 Feb 2016 17:20:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D9802040F for ; Sun, 21 Feb 2016 17:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbcBURUT (ORCPT ); Sun, 21 Feb 2016 12:20:19 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:34768 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119AbcBURUR (ORCPT ); Sun, 21 Feb 2016 12:20:17 -0500 Received: by mail-wm0-f50.google.com with SMTP id b205so127677634wmb.1 for ; Sun, 21 Feb 2016 09:20:16 -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=2SlfmCuBjEYr/zsN1g6Se92kgDeYl4AJeGyyH+Tjs8w=; b=NV6wnRhMRYxYw54HoR9HDXSJLqr7LOk0kmYAwlkx2HRsduNQ64PTtj/21UUMV1Zya7 H6FMYphX0ssD5hqcpYDLNHzqLYPVZy9xcj9xt3pls1V6qQtlWa0XpmkXMudDoF6ChHmJ JEaK6Cz5TMNpYIvJkK7xUb16JZxAoPyEIpbYvw+lrqkiK1PJoSCIrSkt0Mc42jppCM4E ZsJ2sjkeSJs52Ib+uLDdvpVEqSK6ZqzsmXAP7dxuq5cS+3YgefUi5Wcm9b2beHwWzX4/ EgtmTis1ceU6BLvYv4zrWIbE1+oxHlCyL0AEAE0FE4Cd9PuobkCRn4TXCfVCZwUYpAmh 1Ukw== 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=2SlfmCuBjEYr/zsN1g6Se92kgDeYl4AJeGyyH+Tjs8w=; b=K48OE5C11+alnPPYbfuntQcinP7BEfg0E1D6ao2oZz4eOkguv/j3e4U6+rGzJLDzyK F0DzQRmFuutdMIQ6Al5000GwX/NRxZ/trUqroZSSkG4fc9jStLvDjzkn4DI/yH1IJTR8 cQFJA4R8PB2ekHiJP6qEEdJkq39LK7aiYCjuBKqwBPgdyqPx/RU1V6IpVTRIG9yOVYJH RVFDhjWaWLsX1x/Eu5YWGse2RX6U82dDDgc3WfwLoV1nk5LKCGLEOD9JH8YJl5kODp56 Xt1Quoreukv5mqIOobC+wcdgSItVw7HpBYjVVyIYObyWCHaDQ+bRJP2FKGu//3Y7ZSOm oKhQ== X-Gm-Message-State: AG10YORYEbr/ujbgzF5ewXHHCfZ1XVCi93zo0puJBeFcfZbtdZv4PzTiV6MxPqRydbrIpw== X-Received: by 10.28.34.139 with SMTP id i133mr7829988wmi.3.1456065363165; Sun, 21 Feb 2016 06:36:03 -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 198sm16802359wml.22.2016.02.21.06.36.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2016 06:36:01 -0800 (PST) From: Ilya Dryomov To: Alex Elder Cc: ceph-devel@vger.kernel.org, Varada Kari Subject: [PATCH 4/4] libceph: use sizeof_footer() more Date: Sun, 21 Feb 2016 15:35:37 +0100 Message-Id: <1456065337-25628-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: References: 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 Don't open-code sizeof_footer() in read_partial_message() and ceph_msg_revoke(). Also, after switching to sizeof_footer(), it's now possible to use con_out_kvec_add() in prepare_write_message_footer(). Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/messenger.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 9382619a405b..d9681bc839c7 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1221,25 +1221,19 @@ static void prepare_message_data(struct ceph_msg *msg, u32 data_len) 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[v].iov_base = &m->footer; + con_out_kvec_add(con, sizeof_footer(con), &m->footer); if (con->peer_features & CEPH_FEATURE_MSG_AUTH) { if (con->ops->sign_message) con->ops->sign_message(m); else m->footer.sig = 0; - con->out_kvec[v].iov_len = sizeof(m->footer); - con->out_kvec_bytes += sizeof(m->footer); } else { m->old_footer.flags = m->footer.flags; - con->out_kvec[v].iov_len = sizeof(m->old_footer); - con->out_kvec_bytes += sizeof(m->old_footer); } - con->out_kvec_left++; con->out_more = m->more_to_follow; con->out_msg_done = true; } @@ -2409,11 +2403,7 @@ static int read_partial_message(struct ceph_connection *con) } /* footer */ - if (need_sign) - size = sizeof(m->footer); - else - size = sizeof(m->old_footer); - + size = sizeof_footer(con); end += size; ret = read_partial(con, end, size, &m->footer); if (ret <= 0) @@ -3089,10 +3079,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)