From patchwork Tue May 7 01:37:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2529781 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 E61103FD85 for ; Tue, 7 May 2013 01:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759546Ab3EGBhn (ORCPT ); Mon, 6 May 2013 21:37:43 -0400 Received: from mail-ia0-f180.google.com ([209.85.210.180]:41510 "EHLO mail-ia0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759433Ab3EGBhm (ORCPT ); Mon, 6 May 2013 21:37:42 -0400 Received: by mail-ia0-f180.google.com with SMTP id 21so40905iay.39 for ; Mon, 06 May 2013 18:37:42 -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=PSeVSX5yI8x7LEekzIlE4XUHI5Cj0rxux5mPS5PMKrY=; b=So/TpT26jzpZUiytPskPjWSXiZXQZIKhabpd0NzHQzxkHcbZsVuOcUd+y3z7kk+wgf mGL9oisYr5AVGbCsqY5PMtGIHfc3oaKxNbL0+2LyLj64Zvja13JSna1E1BXyQa/1pZEH siveGRVrf1nKOni2M1BDpprdPpUtGBUA3RWuxop1mXVqLPZZxPIxRhtjhJjtLqINmPNy HHvERUlDpF+kr6K8Yzuj41nZ/EWKSbaWsi5HCRErp519S1/F8OAYjEThipx01VnzOak9 xh/5VBYo9V2QpQ7yf/fBgRaLbBuk+m93aCjpaN2LK+xIt+zM4cng5qS2UOfadFTPmwST SgZQ== X-Received: by 10.50.208.40 with SMTP id mb8mr3362263igc.91.1367890662106; Mon, 06 May 2013 18:37:42 -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 xf4sm5168565igb.8.2013.05.06.18.37.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 May 2013 18:37:41 -0700 (PDT) Message-ID: <51885AE4.1030209@inktank.com> Date: Mon, 06 May 2013 20:37:40 -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/6] rbd: kill rbd_update_mapping_size() References: <51885A97.9070005@inktank.com> In-Reply-To: <51885A97.9070005@inktank.com> X-Gm-Message-State: ALoCoQkfGY8WPrMdT5y6civYYQVMsIHB4SP8R5oNPYIefa7PotOJ8MQE5z+POULftWzVjhTwQxLf Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Since rbd_update_mapping_size() is now a trivial wrapper, just open code it in its two callers. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) */ @@ -3143,7 +3134,9 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev) /* Update image size, and check for resize of mapped image */ rbd_dev->header.image_size = h.image_size; - rbd_update_mapping_size(rbd_dev); + if (rbd_dev->spec->snap_id == CEPH_NOSNAP) + if (rbd_dev->mapping.size != rbd_dev->header.image_size) + rbd_dev->mapping.size = rbd_dev->header.image_size; /* rbd_dev->header.object_prefix shouldn't change */ kfree(rbd_dev->header.snap_sizes); @@ -4074,7 +4067,9 @@ static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev) ret = rbd_dev_v2_image_size(rbd_dev); if (ret) goto out; - rbd_update_mapping_size(rbd_dev); + if (rbd_dev->spec->snap_id == CEPH_NOSNAP) + if (rbd_dev->mapping.size != rbd_dev->header.image_size) + rbd_dev->mapping.size = rbd_dev->header.image_size; ret = rbd_dev_v2_snap_context(rbd_dev); dout("rbd_dev_v2_snap_context returned %d\n", ret); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a0f1fe5..0a24cdf 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3118,15 +3118,6 @@ static int rbd_read_header(struct rbd_device *rbd_dev, return ret; } -static void rbd_update_mapping_size(struct rbd_device *rbd_dev) -{ - if (rbd_dev->spec->snap_id != CEPH_NOSNAP) - return; - - if (rbd_dev->mapping.size != rbd_dev->header.image_size) - rbd_dev->mapping.size = rbd_dev->header.image_size; -} - /* * only read the first part of the ondisk header, without the snaps info