From patchwork Wed Feb 10 11:24:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8270371 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 2E7399F1C1 for ; Wed, 10 Feb 2016 11:24:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A5DE202D1 for ; Wed, 10 Feb 2016 11:24:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B60F20374 for ; Wed, 10 Feb 2016 11:24:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613AbcBJLYm (ORCPT ); Wed, 10 Feb 2016 06:24:42 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33225 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753936AbcBJLYk (ORCPT ); Wed, 10 Feb 2016 06:24:40 -0500 Received: by mail-wm0-f68.google.com with SMTP id c200so3541909wme.0 for ; Wed, 10 Feb 2016 03:24:40 -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=7PXf60WFjbMxOs2qZ9hlrj8ryqKnwHQzBETuHT5ZdGo=; b=yTQpuKPMy0pPZPwG1tvCuYUaXJ5aoKoucxtx3ltdcX50aR3AeLWWxa7ihoIZEV/F18 WleOdDfC8rHQMRdRjNv/dZfaSfceTMV+icJLzuitcyhSdpza7w+fWiGxozArU6+xEpto GsRmndebI/D7X00BUsounadbn4uuLIQA9WEql2Q7MfEyIwXpgo4tK9uftp9GerAqa9FW 5fi+Sj4tu6JmSjtQQL1lAQ0N082AQ0dSAg/aBe2Ai2b6G00KbjUwp/1bVUaxb95wU9B/ tKoSXVkfNtVZK5I8b+a1J5waRE+9ajzTsBPaSdLx45KaN1DMLvfeh5miKtHymuxblYb7 VEhQ== 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=7PXf60WFjbMxOs2qZ9hlrj8ryqKnwHQzBETuHT5ZdGo=; b=T2Qp3GvwAx+YC908fk4vdn2JLEfX3/gBnQsFhuqWdhTQ/nBuy6dzUVmlDZJ/3hgsvu oKEgD1EVvtuokzno8mHyiQBkSaSStXex6AUdwlMa8rYPc6h6oWaWGvag7h/fDXS7Myel TbvrfBM2XktfuLm6EZmVH6OS2lpDbte8pR2EVQdpfeGWsxgxTXzIS+vtYC3Rzh1ZELxB lpkNjnAGU8usPM1jGUWljO1VEdxjRd5sD/VcnSnhDFuzNFCPEqdYdFPq77GJlpHJAYyb w92qrxI3kNaLkIXogQm1gw1149xbz4Ji41lJOFTLpQrTJonZA2fohF9aQLCIBokeaBdf TbRw== X-Gm-Message-State: AG10YOQSmOPgRizNNNA8moRj8fPZVIRQgQ1Qup0VUMc5liIFTzYFtjIsf2ED8mHNsni8uw== X-Received: by 10.28.55.74 with SMTP id e71mr3418899wma.26.1455103479717; Wed, 10 Feb 2016 03:24:39 -0800 (PST) Received: from localhost.localdomain.com (ip-78-102-114-179.net.upcbroadband.cz. [78.102.114.179]) by smtp.gmail.com with ESMTPSA id l2sm2524819wjf.15.2016.02.10.03.24.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2016 03:24:39 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Zheng Yan Subject: [PATCH 1/4] libceph: rename ceph_osd_req_op::payload_len to indata_len Date: Wed, 10 Feb 2016 12:24:04 +0100 Message-Id: <1455103447-23559-2-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1455103447-23559-1-git-send-email-idryomov@gmail.com> References: <1455103447-23559-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=-7.0 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 Follow userspace nomenclature on this - the next commit adds outdata_len. Signed-off-by: Ilya Dryomov --- include/linux/ceph/osd_client.h | 2 +- net/ceph/osd_client.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 7506b485bb6d..35c8b006916f 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -77,7 +77,7 @@ struct ceph_osd_data { struct ceph_osd_req_op { u16 op; /* CEPH_OSD_OP_* */ u32 flags; /* CEPH_OSD_OP_FLAG_* */ - u32 payload_len; + u32 indata_len; /* request */ union { struct ceph_osd_data raw_data_in; struct { diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index a1babb77b813..38bdfafe9dd6 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -498,7 +498,7 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req, if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL) payload_len += length; - op->payload_len = payload_len; + op->indata_len = payload_len; } EXPORT_SYMBOL(osd_req_op_extent_init); @@ -517,7 +517,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, BUG_ON(length > previous); op->extent.length = length; - op->payload_len -= previous - length; + op->indata_len -= previous - length; } EXPORT_SYMBOL(osd_req_op_extent_update); @@ -554,7 +554,7 @@ void osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which, op->cls.argc = 0; /* currently unused */ - op->payload_len = payload_len; + op->indata_len = payload_len; } EXPORT_SYMBOL(osd_req_op_cls_init); @@ -587,7 +587,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which, op->xattr.cmp_mode = cmp_mode; ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist); - op->payload_len = payload_len; + op->indata_len = payload_len; return 0; } EXPORT_SYMBOL(osd_req_op_xattr_init); @@ -707,7 +707,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE); dst->cls.indata_len = cpu_to_le32(data_length); ceph_osdc_msg_data_add(req->r_request, osd_data); - src->payload_len += data_length; + src->indata_len += data_length; request_data_len += data_length; } osd_data = &src->cls.response_data; @@ -750,7 +750,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, dst->op = cpu_to_le16(src->op); dst->flags = cpu_to_le32(src->flags); - dst->payload_len = cpu_to_le32(src->payload_len); + dst->payload_len = cpu_to_le32(src->indata_len); return request_data_len; }