From patchwork Wed Nov 14 16:15:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1742441 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 3943C3FC64 for ; Wed, 14 Nov 2012 16:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423020Ab2KNQP4 (ORCPT ); Wed, 14 Nov 2012 11:15:56 -0500 Received: from mail-ia0-f174.google.com ([209.85.210.174]:40856 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423038Ab2KNQP4 (ORCPT ); Wed, 14 Nov 2012 11:15:56 -0500 Received: by mail-ia0-f174.google.com with SMTP id y25so379676iay.19 for ; Wed, 14 Nov 2012 08:15:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=aR5tCH85dqhmdPfjacv/yyK4SwqtcitZ0HKcanBTCOI=; b=XwXlj/1U05GGchjGN1pYIOciFT46Ua8EcpipV+sjU8E5zVH0zFS76Vy/WvtxanwYjh tKstj6m1WirOq74bjN1KukvHxgacKmwM0EwjDpA3+DcjwmDToaVJ1nPO7e81CjA/byR8 i0ZARdGkrnSHgBdlAjzvrZrjiByOp2q0ak3k220Pts4243+38T2t53R58lhMQpZKQfo0 oy9xDCNPHRFUc11AzxAxRmf9JLLCfZBaJHonP+IfqaJiQ4v8Xef62GQiu9DgJ9xLmXGu MDKQ6yLAruhZeedmYE0zDCVxGlCI5TQ6R0CK1/3JZNshnVEjaJnQdxNwejWdnG2S/ejl /HKA== Received: by 10.50.196.133 with SMTP id im5mr1559973igc.61.1352909754920; Wed, 14 Nov 2012 08:15:54 -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 gz10sm1582132igc.9.2012.11.14.08.15.51 (version=SSLv3 cipher=OTHER); Wed, 14 Nov 2012 08:15:52 -0800 (PST) Message-ID: <50A3C3B6.6050001@inktank.com> Date: Wed, 14 Nov 2012 10:15:50 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 4/4] libceph: drop osdc from ceph_calc_raw_layout() References: <50A3C346.1010400@inktank.com> In-Reply-To: <50A3C346.1010400@inktank.com> X-Gm-Message-State: ALoCoQnRsu1INwkKv2hYFXLgl2nRIYjyt3YvYFRBuPYnpwZN9d86XbgwSV0/XkPjQw+CJPgi6QI5 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The osdc parameter to ceph_calc_raw_layout() is not used, so get rid of it. Consequently, the corresponding parameter in calc_layout() becomes unused, so get rid of that as well. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 2 +- include/linux/ceph/osd_client.h | 3 +-- net/ceph/osd_client.c | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) req->r_file_layout = *layout; /* keep a copy */ diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4e44085..2d10504 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1170,7 +1170,7 @@ static int rbd_do_request(struct request *rq, osd_req->r_oid_len = strlen(osd_req->r_oid); rbd_layout_init(&osd_req->r_file_layout, rbd_dev->spec->pool_id); - ret = ceph_calc_raw_layout(osdc, &osd_req->r_file_layout, + ret = ceph_calc_raw_layout(&osd_req->r_file_layout, ofs, &len, &bno, osd_req, ops); rbd_assert(ret == 0); diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 0e82a0a..fe3a6e8 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -207,8 +207,7 @@ extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc, extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg); -extern int ceph_calc_raw_layout(struct ceph_osd_client *osdc, - struct ceph_file_layout *layout, +extern int ceph_calc_raw_layout(struct ceph_file_layout *layout, u64 off, u64 *plen, u64 *bno, struct ceph_osd_request *req, struct ceph_osd_req_op *op); diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index f844a35..baaec06 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -38,8 +38,7 @@ static int op_has_extent(int op) op == CEPH_OSD_OP_WRITE); } -int ceph_calc_raw_layout(struct ceph_osd_client *osdc, - struct ceph_file_layout *layout, +int ceph_calc_raw_layout(struct ceph_file_layout *layout, u64 off, u64 *plen, u64 *bno, struct ceph_osd_request *req, struct ceph_osd_req_op *op) @@ -99,8 +98,7 @@ EXPORT_SYMBOL(ceph_calc_raw_layout); * * fill osd op in request message. */ -static int calc_layout(struct ceph_osd_client *osdc, - struct ceph_vino vino, +static int calc_layout(struct ceph_vino vino, struct ceph_file_layout *layout, u64 off, u64 *plen, struct ceph_osd_request *req, @@ -109,7 +107,7 @@ static int calc_layout(struct ceph_osd_client *osdc, u64 bno; int r; - r = ceph_calc_raw_layout(osdc, layout, off, plen, &bno, req, op); + r = ceph_calc_raw_layout(layout, off, plen, &bno, req, op); if (r < 0) return r; @@ -444,7 +442,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, return ERR_PTR(-ENOMEM); /* calculate max write size */ - r = calc_layout(osdc, vino, layout, off, plen, req, ops); + r = calc_layout(vino, layout, off, plen, req, ops); if (r < 0) return ERR_PTR(r);