From patchwork Thu Jul 19 12:34:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1216401 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 B82D8E006E for ; Thu, 19 Jul 2012 12:34:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751170Ab2GSMen (ORCPT ); Thu, 19 Jul 2012 08:34:43 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:39184 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750894Ab2GSMen (ORCPT ); Thu, 19 Jul 2012 08:34:43 -0400 Received: by mail-gh0-f174.google.com with SMTP id r11so2682359ghr.19 for ; Thu, 19 Jul 2012 05:34:43 -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=U4l2TZYgh9itBzcX5b/cLBQKYWpCihIswwGHkCFlUGM=; b=fLwTCUgTWJqN+tOysx/0/HLMPB3IPf1s20HT5mk9AEzUW+oGWcM6c/ZcWAOuerUqkO 2GZynmo0xaEWxTT6OwLbKuK4oCfuAy0V7xhK3fv0TU9BJobGbE08egO4oVLx9ALiF+T0 MbfMH+tX/bcVfX20861/7RR0b4Qo4P4B1GEJ+tBLpbs1atvzKxwUdHsG55wROuAXE/ro cODp64grdHxjmMUjU4HCRbAflJa11maJhpcxAK9EmeIJs+Sj228CgtyCLv7Vh4IBxonD o8KtpvPBtkRB5KxuNzTfBQaGACkixC8UN+K/zKh6GBPBUFdeo5fh/lUsxJLdj+3joq7O iEmA== Received: by 10.43.134.134 with SMTP id ic6mr982223icc.26.1342701282447; Thu, 19 Jul 2012 05:34: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 ESMTPS id ay5sm16796526igb.15.2012.07.19.05.34.41 (version=SSLv3 cipher=OTHER); Thu, 19 Jul 2012 05:34:41 -0700 (PDT) Message-ID: <5007FEE1.40100@inktank.com> Date: Thu, 19 Jul 2012 07:34:41 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 2/6] rbd: only reset capacity when pointing to head References: <5007FDEA.9010605@inktank.com> In-Reply-To: <5007FDEA.9010605@inktank.com> X-Gm-Message-State: ALoCoQn/8BSigs8lHzFaKMvna1YnntvnpzFeEyfthu041WOzY/ICYtz6elTt8vxTR8w0hNapgFzt Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Snapshots cannot be resized, and the new capacity of head should not be reflected by the snapshot. Signed-off-by: Josh Durgin Reviewed-by: Alex Elder --- drivers/block/rbd.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 730d0ce..f171ceb 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1725,7 +1725,12 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev) return ret; /* resized? */ - set_capacity(rbd_dev->disk, h.image_size / SECTOR_SIZE); + if (rbd_dev->snap_id == CEPH_NOSNAP) { + sector_t size = (sector_t) h.image_size / SECTOR_SIZE; + + dout("setting size to %llu sectors", (unsigned long long) size); + set_capacity(rbd_dev->disk, size); + } down_write(&rbd_dev->header_rwsem);