From patchwork Fri Sep 7 19:24:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1424941 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 B2353DF283 for ; Fri, 7 Sep 2012 19:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756671Ab2IGTY7 (ORCPT ); Fri, 7 Sep 2012 15:24:59 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:55902 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756662Ab2IGTY6 (ORCPT ); Fri, 7 Sep 2012 15:24:58 -0400 Received: by ieje11 with SMTP id e11so5637710iej.19 for ; Fri, 07 Sep 2012 12:24:57 -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=p6/FWuhaFt85PmhsiGGU/ozVZb40ZEdtsHZb8PQW+Sw=; b=Yztq0ZBUDt7m+d59JWrXdyZr0QNL71Z/QaP+3QNt8rDC8gFJFFEsZKwKzQ1u5RjlC4 2p9Zrn+AGYz2/Md1SIUgIcBkA8KwDE1g+3sGMZd8L16AmmjYsTfe49fTR3xs0egd+xbH 9OmrDOnf1ELwm9psrwcZohR2jHhi+BwVyeKvO7M5VFEqI0vr5ad2SZAwwqyVAqvgkJNq yV8GZTANUWPkemtRQp7dA5ZsTSuGAGzXS0P7vUg+vGDIztIf58B/Pp2nfjUp5CFMXx0+ ubMJbikIvWelmITFUbLAUbUC4SVJc0MAqvLi8IRNJL7JDVImEghArhPxmcm6JeqZY2bj q7jA== Received: by 10.50.76.137 with SMTP id k9mr179402igw.58.1347045897482; Fri, 07 Sep 2012 12:24:57 -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 xm2sm361720igb.3.2012.09.07.12.24.55 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 12:24:56 -0700 (PDT) Message-ID: <504A4A06.8050101@inktank.com> Date: Fri, 07 Sep 2012 14:24:54 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/3] rbd: don't use index in __rbd_add_snap_dev() References: <504A498D.30708@inktank.com> In-Reply-To: <504A498D.30708@inktank.com> X-Gm-Message-State: ALoCoQnpG6zbh1kDU7ONZj8SM0KG4Qn68Ek1q/uFrWG8ofZraivWyV4TrevWS6FNw0eQ+2ZQaS4T Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Pass the snapshot id and snapshot size rather than an index to __rbd_add_snap_dev() to specify values for a new snapshot. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) int ret; @@ -2041,12 +2042,12 @@ static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, return ERR_PTR(-ENOMEM); ret = -ENOMEM; - snap->name = kstrdup(name, GFP_KERNEL); + snap->name = kstrdup(snap_name, GFP_KERNEL); if (!snap->name) goto err; - snap->size = rbd_dev->header.snap_sizes[i]; - snap->id = rbd_dev->header.snapc->snaps[i]; + snap->id = snap_id; + snap->size = snap_size; return snap; @@ -2111,12 +2112,13 @@ static int rbd_dev_snaps_update(struct rbd_device *rbd_dev) dout("entry %u: snap_id = %llu\n", (unsigned int) snap_count, (unsigned long long) snap_id); if (!snap || (snap_id != CEPH_NOSNAP && snap->id < snap_id)) { + struct rbd_image_header *header = &rbd_dev->header; struct rbd_snap *new_snap; /* We haven't seen this snapshot before */ - new_snap = __rbd_add_snap_dev(rbd_dev, index, - snap_name); + new_snap = __rbd_add_snap_dev(rbd_dev, snap_name, + snap_id, header->snap_sizes[index]); if (IS_ERR(new_snap)) { int err = PTR_ERR(new_snap); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index d73edb1..2b048e3 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2031,7 +2031,8 @@ static int rbd_register_snap_dev(struct rbd_snap *snap, } static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, - int i, const char *name) + const char *snap_name, + u64 snap_id, u64 snap_size) { struct rbd_snap *snap;