From patchwork Fri Jan 4 14:52:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1933351 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 0DE57DFABD for ; Fri, 4 Jan 2013 14:52:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754864Ab3ADOwh (ORCPT ); Fri, 4 Jan 2013 09:52:37 -0500 Received: from mail-ia0-f182.google.com ([209.85.210.182]:46421 "EHLO mail-ia0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754854Ab3ADOwg (ORCPT ); Fri, 4 Jan 2013 09:52:36 -0500 Received: by mail-ia0-f182.google.com with SMTP id x2so13899301iad.13 for ; Fri, 04 Jan 2013 06:52:36 -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=vOZmUTU66NNQ3G7qzwD7Wliob+wnW2pbhg3EEYgx/Ro=; b=BuJkj52seoUaCqGrgfAZRXEpBq5/nlavqn2OMxMkS4cuzHoJLmGR7hetMxYgZ+Ph+J UythwPj8D7OXbnQYsYQ3rtM5wL4ad0KvyTWs5SsC0ge1cqQbu7NLYCdif3kIfoADsoE8 9HfO/IhYJyX3HJTFDx8FTUXcNGO3ExbYGcpNq4/twHmDFiV+OqWie/vI/ycoEkavPgJR 2UfIuZMZUJ98Cf3u9ZopfK3q2Gd8xwQyAWO7hQpJ7oWUhbVptmD/1LZOLNZzFfg0OW7L STQaY1PIzhNZeV6+BEsU4T3SZQ88hcfRLAP5TrkyTLQf/06aMmB/lx/fo/XZbRj2gHP7 NLFA== X-Received: by 10.50.57.234 with SMTP id l10mr44851837igq.18.1357311156269; Fri, 04 Jan 2013 06:52:36 -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 yf6sm44002065igb.0.2013.01.04.06.52.33 (version=SSLv3 cipher=OTHER); Fri, 04 Jan 2013 06:52:34 -0800 (PST) Message-ID: <50E6ECB2.1080804@inktank.com> Date: Fri, 04 Jan 2013 08:52:34 -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/3] rbd: pull in ceph_calc_raw_layout() References: <50E6EC84.2060304@inktank.com> In-Reply-To: <50E6EC84.2060304@inktank.com> X-Gm-Message-State: ALoCoQlT5mKVRjT86bfmWc7PBY0cARgUo0FXm8CB7/RfvelQeTCGkDRb88ZTQEYUQMAExZWsnEpm Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org This is the first in a series of patches aimed at eliminating the use of ceph_calc_raw_layout() by rbd. It simply pulls in a copy of that function and renames it rbd_calc_raw_layout(). Signed-off-by: Alex Elder --- drivers/block/rbd.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) */ @@ -1167,7 +1201,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(&osd_req->r_file_layout, + ret = rbd_calc_raw_layout(&osd_req->r_file_layout, ofs, &len, &bno, osd_req, op); rbd_assert(ret == 0); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a57d6e9..46b52a4 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1101,6 +1101,40 @@ 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