From patchwork Wed May 8 22:08:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2541931 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 EAE883FC5A for ; Wed, 8 May 2013 22:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752317Ab3EHWIF (ORCPT ); Wed, 8 May 2013 18:08:05 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]:61580 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750774Ab3EHWIE (ORCPT ); Wed, 8 May 2013 18:08:04 -0400 Received: by mail-ob0-f181.google.com with SMTP id ta14so2282092obb.12 for ; Wed, 08 May 2013 15:08:03 -0700 (PDT) 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=V8EtNlJCJHFGNGUZaluhK0G+ni5nKkfUNzzsViVWSRU=; b=WOgyAYvDBJOpMPsL+l1AI6iWF3/gVDWWm7Tu0IGu4VliesywfY2XKunw/iYMVNP2Am bSPaKFkdvW8XoksQIsp/hIrHrzeZON1LqQjO6AktuaQAm3ZV8V94lL5NVJguEBygqlq7 wRFyQET4arJz+tMm4pxbBqavOE7BKB+5X7+MN5p4am7TNTYCLqkq6PAIhnem9Z+w/3ue nnRgS4yt83FgjN4UYSEvlg1zcPIxvL+3HezK96Ipz9SKiEDAjPmNulmFk/yvpEgpBtL9 /MMMJ0hdklP1jzRFXb+tHVZ13EordOSH8jnqlx9KhrTfcOai1su1sJtNEVj+1qhYNQqq 9XQQ== X-Received: by 10.60.45.98 with SMTP id l2mr2747338oem.103.1368050882911; Wed, 08 May 2013 15:08:02 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id jw8sm244304obb.14.2013.05.08.15.08.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 15:08:02 -0700 (PDT) Message-ID: <518ACCC2.5020707@inktank.com> Date: Wed, 08 May 2013 17:08:02 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 2/5] rbd: support reading parent page data References: <518ACC55.7090100@inktank.com> In-Reply-To: <518ACC55.7090100@inktank.com> X-Gm-Message-State: ALoCoQn6JSXgC/Vp7hXZGweDQ0okM0utnPWZHANWAqrbUlzq16Bw2IQAP5Vuruk07BqD1LRRG45E Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Currently, rbd_img_parent_read() assumes the incoming object request contains bio data. But if a layered image is part of a multi-layer stack of images will result in read requests of page data to parent images. Fortunately, it's not hard to add support for page data. This resolves: http://tracker.ceph.com/issues/4939 Signed-off-by: Alex Elder --- drivers/block/rbd.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) rbd_assert(rbd_dev->parent != NULL); @@ -2590,8 +2590,12 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) rbd_obj_request_get(obj_request); img_request->obj_request = obj_request; - result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO, - obj_request->bio_list); + if (obj_request->type == OBJ_REQUEST_BIO) + result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO, + obj_request->bio_list); + else + result = rbd_img_request_fill(img_request, OBJ_REQUEST_PAGES, + obj_request->pages); if (result) goto out_err; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 15ac2a5..2a0e9b8 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2574,7 +2574,7 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) rbd_assert(obj_request_img_data_test(obj_request)); rbd_assert(obj_request->img_request != NULL); rbd_assert(obj_request->result == (s32) -ENOENT); - rbd_assert(obj_request->type == OBJ_REQUEST_BIO); + rbd_assert(obj_request_type_valid(obj_request->type)); rbd_dev = obj_request->img_request->rbd_dev;