From patchwork Fri Jan 4 14:53:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1933361 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C7E12DFABD for ; Fri, 4 Jan 2013 14:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754818Ab3ADOxS (ORCPT ); Fri, 4 Jan 2013 09:53:18 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:56291 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754763Ab3ADOxR (ORCPT ); Fri, 4 Jan 2013 09:53:17 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so19863798iej.18 for ; Fri, 04 Jan 2013 06:53:17 -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=3wgc2B04KRZEL+vju3d4j1B/GZeu8nWa7XpsMhn07R8=; b=UE/89Z65fzrCm9aHE7Xk/kC2j2XdZREWnUw7td3WGg9eujs4XGrbBbu5E/ogwXD3DS zZRK+FqshgsYCrMCnjUiPE8sFUQ/PfljtaDZmBnsRD2yZwdIUPsPphN+olBFQZl95+Dx RZfTHjwR8CngOWp4K4cwOHZ3t+IYcIp1PwfMxrhuTnyvx2vBZnwBgE3x6rdX5Gkis53Y EK2KFRtj3+TLYW7M/+8YDf7cimcWSlTydjyrN2g0uFRrlYNTDmPtO/btEqiQQx1ZesgF M/+7WTuhqPblHiCR/CKmiiUHfxy32K6JYaEDzsT0E0sBPv7gNmoudn+OczNsPJ1CUqeZ 0dSA== X-Received: by 10.50.13.162 with SMTP id i2mr45841007igc.38.1357311197430; Fri, 04 Jan 2013 06:53:17 -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 k5sm9591732igq.9.2013.01.04.06.53.14 (version=SSLv3 cipher=OTHER); Fri, 04 Jan 2013 06:53:15 -0800 (PST) Message-ID: <50E6ECDA.4090808@inktank.com> Date: Fri, 04 Jan 2013 08:53:14 -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 2/3] rbd: open code rbd_calc_raw_layout() References: <50E6EC84.2060304@inktank.com> In-Reply-To: <50E6EC84.2060304@inktank.com> X-Gm-Message-State: ALoCoQndyhc3ZzyC/5npZr0b06jXeq98zHbp/hwiFuOtNPd7SolVvshL8H9pAayK4uZYHjCQsV4o Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org This patch gets rid of rbd_calc_raw_layout() by simply open coding it in its one caller. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 55 +++++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 37 deletions(-) op->payload_len = payload_len; @@ -1101,40 +1101,6 @@ static void rbd_layout_init(struct ceph_file_layout *layout, u64 pool_id) layout->fl_pg_pool = cpu_to_le32((u32) pool_id); } -int rbd_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) -{ - u64 orig_len = *plen; - u64 objoff, objlen; /* extent in object */ - int r; - - /* object extent? */ - r = ceph_calc_file_object_mapping(layout, off, orig_len, bno, - &objoff, &objlen); - if (r < 0) - return r; - if (objlen < orig_len) { - *plen = objlen; - dout(" skipping last %llu, final file extent %llu~%llu\n", - orig_len - *plen, off, *plen); - } - - if (op->op == CEPH_OSD_OP_READ || op->op == CEPH_OSD_OP_WRITE) { - op->extent.offset = objoff; - op->extent.length = objlen; - } - req->r_num_pages = calc_pages_for(off, *plen); - req->r_page_alignment = off & ~PAGE_MASK; - if (op->op == CEPH_OSD_OP_WRITE) - op->payload_len = *plen; - - dout("calc_layout bno=%llx %llu~%llu (%d pages)\n", - *bno, objoff, objlen, req->r_num_pages); - return 0; -} - /* * Send ceph osd request */ @@ -1158,6 +1124,8 @@ static int rbd_do_request(struct request *rq, struct ceph_osd_request *osd_req; int ret; u64 bno; + u64 obj_off = 0; + u64 obj_len = 0; struct timespec mtime = CURRENT_TIME; struct rbd_request *rbd_req; struct ceph_osd_client *osdc; @@ -1201,9 +1169,22 @@ 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 = rbd_calc_raw_layout(&osd_req->r_file_layout, - ofs, &len, &bno, osd_req, op); + ret = ceph_calc_file_object_mapping(&osd_req->r_file_layout, ofs, len, + &bno, &obj_off, &obj_len); rbd_assert(ret == 0); + if (obj_len < len) { + dout(" skipping last %llu, final file extent %llu~%llu\n", + len - obj_len, ofs, obj_len); + len = obj_len; + } + if (op->op == CEPH_OSD_OP_READ || op->op == CEPH_OSD_OP_WRITE) { + op->extent.offset = obj_off; + op->extent.length = obj_len; + if (op->op == CEPH_OSD_OP_WRITE) + op->payload_len = obj_len; + } + osd_req->r_num_pages = calc_pages_for(ofs, len); + osd_req->r_page_alignment = ofs & ~PAGE_MASK; ceph_osdc_build_request(osd_req, ofs, len, 1, op, snapc, snapid, &mtime); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 46b52a4..e6db737 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1032,7 +1032,7 @@ static struct ceph_osd_req_op *rbd_create_rw_op(int opcode, u32 payload_len) return NULL; /* * op extent offset and length will be set later on - * in calc_raw_layout() + * after ceph_calc_file_object_mapping(). */ op->op = opcode;