From patchwork Thu Jan 3 23:18:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1929941 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4360D3FC33 for ; Thu, 3 Jan 2013 23:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754507Ab3ACXSi (ORCPT ); Thu, 3 Jan 2013 18:18:38 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:61488 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753852Ab3ACXSi (ORCPT ); Thu, 3 Jan 2013 18:18:38 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so19072251iej.32 for ; Thu, 03 Jan 2013 15:18:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=gim6ZSW/kRNSSpEkC9KxiBKx4JQDip0gKaWR9Xp28II=; b=Baq/JamdKrEeRixK5BABOQzHm1rA8n7KCHTn3cdmljOXFrM9itGVKLssVUTFfYjfwx PPI1bhSplZBcUFRL6DCoDNcfp3UZk0NZsMqAbFTN17WXOD0U35WREj7wIN38gAwsVFOn ikFwpATCe3aH4dI+6kL6T0jdg2rg2bakN+MMRF40sCV9rUT2dlKPdDe+vdpA7ml6dwHY wJzzLk/ylaJrElb8CPhRbZtwlhCQm7yfvwfPJni+tqtuc3utI87e1PqufJPA9Os7teez C8Kfc66NuP745xaHtfouyoh250oAvELMqbZTbAu6npLOFiWX4Dkw1sJ6ct7CI/460p2s woaA== X-Received: by 10.50.152.137 with SMTP id uy9mr42919592igb.62.1357255117918; Thu, 03 Jan 2013 15:18:37 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id u4sm42394252igw.6.2013.01.03.15.18.35 (version=SSLv3 cipher=OTHER); Thu, 03 Jan 2013 15:18:36 -0800 (PST) Message-ID: <50E611CB.1020500@inktank.com> Date: Thu, 03 Jan 2013 17:18:35 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH REPOST 1/5] rbd: drop oid parameters from ceph_osdc_build_request() References: <50E61175.7010103@inktank.com> In-Reply-To: <50E61175.7010103@inktank.com> X-Gm-Message-State: ALoCoQmtFP0HXXKOX3vTvUiKON0UYUrNeghVPYdAh+Pwbr7kqdIxk0XF3HQeHAvU4ycDswFYLlIy Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The last two parameters to ceph_osd_build_request() describe the object id, but the values passed always come from the osd request structure whose address is also provided. Get rid of those last two parameters. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 6 +----- include/linux/ceph/osd_client.h | 4 +--- net/ceph/osd_client.c | 13 +++++-------- 3 files changed, 7 insertions(+), 16 deletions(-) struct ceph_osd_request_head *head; @@ -397,9 +395,9 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, /* fill in oid */ - head->object_len = cpu_to_le32(oid_len); - memcpy(p, oid, oid_len); - p += oid_len; + head->object_len = cpu_to_le32(req->r_oid_len); + memcpy(p, req->r_oid, req->r_oid_len); + p += req->r_oid_len; src_op = src_ops; while (src_op->op) { @@ -498,8 +496,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, ceph_osdc_build_request(req, off, plen, ops, snapc, - mtime, - req->r_oid, req->r_oid_len); + mtime); return req; } diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 8e030d1..5bca129 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1176,11 +1176,7 @@ static int rbd_do_request(struct request *rq, snapid, ofs, &len, &bno, osd_req, ops); rbd_assert(ret == 0); - ceph_osdc_build_request(osd_req, ofs, &len, - ops, - snapc, - &mtime, - osd_req->r_oid, osd_req->r_oid_len); + ceph_osdc_build_request(osd_req, ofs, &len, ops, snapc, &mtime); if (linger_req) { ceph_osdc_set_request_linger(osdc, osd_req); diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index d9b880e..f2e5d2c 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -227,9 +227,7 @@ extern void ceph_osdc_build_request(struct ceph_osd_request *req, u64 off, u64 *plen, struct ceph_osd_req_op *src_ops, struct ceph_snap_context *snapc, - struct timespec *mtime, - const char *oid, - int oid_len); + struct timespec *mtime); extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *, struct ceph_file_layout *layout, diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 5f9f65a..89e7587 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -368,9 +368,7 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, u64 off, u64 *plen, struct ceph_osd_req_op *src_ops, struct ceph_snap_context *snapc, - struct timespec *mtime, - const char *oid, - int oid_len) + struct timespec *mtime) { struct ceph_msg *msg = req->r_request;