From patchwork Wed Oct 10 01:14:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1571971 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 5B112DFFAD for ; Wed, 10 Oct 2012 01:15:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757233Ab2JJBPa (ORCPT ); Tue, 9 Oct 2012 21:15:30 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:36106 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757295Ab2JJBO7 (ORCPT ); Tue, 9 Oct 2012 21:14:59 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so5828384pad.19 for ; Tue, 09 Oct 2012 18:14:59 -0700 (PDT) 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=iSB43JKk08J8YAsjhBjYi/+vHGEUDVgIVovFspYPE0o=; b=PUDXGTsGMLa4kLmI9tj5MzE1uiuTpM6ckqZwXgoL19B4qYy5pJHKVqn2gnvOJTTaNR ufRC16B6l5Zr/qbyd1m3sme7Wf2v+QDNd1mNC5SjfVTUW8PAxPDZADuAyQJBNYahOhtL Jr0zENKUXiQthA0kqMawH3yX/SgCmjPnn7oeHPjVv08ooB3OLXrLw+YUkyT8S8kGs2rN Vd55+3gYl9SR/QL1SGNZsZ1/z/EoJMC85Wy0/WtXRmN5ikdVTJkDH6OYbwc/+ysjCRKK Ek7VAAVgZg7kYgrsIXXVNLh/IeizHwMA3HGDSOlnVcdmlF0/HGp53E700YhSdqfYka+K FMLA== Received: by 10.68.222.105 with SMTP id ql9mr68354305pbc.97.1349831699378; Tue, 09 Oct 2012 18:14:59 -0700 (PDT) Received: from ?IPv6:2607:f298:a:607:4823:f93f:93c7:61da? ([2607:f298:a:607:4823:f93f:93c7:61da]) by mx.google.com with ESMTPS id w4sm13379746paz.38.2012.10.09.18.14.57 (version=SSLv3 cipher=OTHER); Tue, 09 Oct 2012 18:14:58 -0700 (PDT) Message-ID: <5074CC10.2010103@inktank.com> Date: Tue, 09 Oct 2012 18:14:56 -0700 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120912 Thunderbird/15.0.1 MIME-Version: 1.0 To: Josh Durgin , ceph-devel Subject: [PATCH 1/4, v2] rbd: define rbd_update_mapping_size() References: <50748FA5.4030508@inktank.com> <50749074.5030603@inktank.com> <5074B2F0.50008@inktank.com> In-Reply-To: <5074B2F0.50008@inktank.com> X-Gm-Message-State: ALoCoQn69+aU2ynWQfVd66UeiMjmsszA4XHDDIGMhs1nZEveaneRdf9JC7Fo6qdEZ5sD25rhfYLo Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Encapsulate the code that handles updating the size of a mapping after an rbd image has been refreshed. This is done in anticipation of the next patch, which will make this common code for format 1 and 2 images. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- Changed since v1: - renamed renamed the function to include "mapping" - now call the function unconditionally--whether or not the size has changed, and only update the mapping if the mapping is to the base image. drivers/block/rbd.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) */ @@ -1730,17 +1743,9 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) down_write(&rbd_dev->header_rwsem); - /* resized? */ - if (rbd_dev->mapping.snap_id == CEPH_NOSNAP) { - sector_t size = (sector_t) h.image_size / SECTOR_SIZE; - - if (size != (sector_t) rbd_dev->mapping.size) { - dout("setting size to %llu sectors", - (unsigned long long) size); - rbd_dev->mapping.size = (u64) size; - set_capacity(rbd_dev->disk, size); - } - } + /* Update image size, and check for resize of mapped image */ + rbd_dev->header.image_size = h.image_size; + rbd_update_mapping_size(rbd_dev); /* rbd_dev->header.object_prefix shouldn't change */ kfree(rbd_dev->header.snap_sizes); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bb3d9be..b64125d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1716,6 +1716,19 @@ static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev) __rbd_remove_snap_dev(snap); } +static void rbd_update_mapping_size(struct rbd_device *rbd_dev) +{ + sector_t size; + + if (rbd_dev->mapping.snap_id != CEPH_NOSNAP) + return; + + size = (sector_t) rbd_dev->header.image_size / SECTOR_SIZE; + dout("setting size to %llu sectors", (unsigned long long) size); + rbd_dev->mapping.size = (u64) size; + set_capacity(rbd_dev->disk, size); +} + /* * only read the first part of the ondisk header, without the snaps info