From patchwork Fri Sep 7 21:15:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1425191 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 1EBC23FC71 for ; Fri, 7 Sep 2012 21:15:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757405Ab2IGVPh (ORCPT ); Fri, 7 Sep 2012 17:15:37 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:45931 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756794Ab2IGVPg (ORCPT ); Fri, 7 Sep 2012 17:15:36 -0400 Received: by mail-ie0-f174.google.com with SMTP id e11so43209iej.19 for ; Fri, 07 Sep 2012 14:15:36 -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=aEFQMZLTGmNAUxtieOCmWpvy9Nlp119QUFl6I+6hZM4=; b=Lt7W2A+7ato8HhTl2SHZpnIoJB12BdyweBq3wljCEczoAqjkQy16J7EJR+wHUR76EZ /WoXsQS8MX+HaFdlVZuXINpztM3b3uIE0Ds0MPsK+1HVMFfOJDZSbwphr3lUcHZvb8Nv TtvRRk5j2sIPcbMhMeOWtuGmSz0g7ntcR7rkMaTCXsblRGiaKLyOd4pl0wmbASlK1/ka KTbTYz/NmEu9guu1a68njslHktoopPRQAL2ziM1fw0tuIOgx3DeB6bzUx8mBjteSQJbD VAFi5/ruf78Ze3q4fA25fL/5F0ne3Dcg5C6XSb0Q0rriZxZXuUw2+KEENs4EukFWln0o YhIg== Received: by 10.50.186.132 with SMTP id fk4mr570645igc.41.1347052536229; Fri, 07 Sep 2012 14:15:36 -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 ua5sm485427igb.10.2012.09.07.14.15.33 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 14:15:34 -0700 (PDT) Message-ID: <504A63F5.4070307@inktank.com> Date: Fri, 07 Sep 2012 16:15:33 -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 8/9] rbd: define rbd_dev_v2_snapc_refresh() References: <504A6273.7030807@inktank.com> In-Reply-To: <504A6273.7030807@inktank.com> X-Gm-Message-State: ALoCoQkqi18lv7JmkCw64aaVg93IItQTO+LJCXjAQ4AFoN+zZV5+OatS4deQkcYucTiJvmI2bvo6 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Define a new function rbd_dev_v2_snapc_refresh() to update/refresh the snapshot context for a format version 2 rbd image. Update rbd_refresh_header() so it selects which function to use based on the image format. Rename __rbd_refresh_header() to be rbd_dev_v1_snapc_refresh() to be consistent with the naming of its version 2 counterpart. Similarly rename rbd_refresh_header to be rbd_dev_snapc_refresh(). Unrelated--we use rbd_image_format_valid() here. Delete the other use of it, which was primarily put in place to ensure that function was referenced at the time it was defined. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) " update snaps: %d\n", rbd_dev->major, rc); @@ -1718,7 +1719,7 @@ static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev) /* * only read the first part of the ondisk header, without the snaps info */ -static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) +static int rbd_dev_v1_snapc_refresh(struct rbd_device *rbd_dev, u64 *hver) { int ret; struct rbd_image_header h; @@ -1767,12 +1768,16 @@ static int __rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) return ret; } -static int rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver) +static int rbd_dev_snapc_refresh(struct rbd_device *rbd_dev, u64 *hver) { int ret; + rbd_assert(rbd_image_format_valid(rbd_dev->image_format)); mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); - ret = __rbd_refresh_header(rbd_dev, hver); + if (rbd_dev->image_format == 1) + ret = rbd_dev_v1_snapc_refresh(rbd_dev, hver); + else + ret = rbd_dev_v2_snapc_refresh(rbd_dev, hver); mutex_unlock(&ctl_mutex); return ret; @@ -1932,7 +1937,7 @@ static ssize_t rbd_image_refresh(struct device *dev, struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); int ret; - ret = rbd_refresh_header(rbd_dev, NULL); + ret = rbd_dev_snapc_refresh(rbd_dev, NULL); return ret < 0 ? ret : size; } @@ -2389,6 +2394,27 @@ static char *rbd_dev_snap_info(struct rbd_device *rbd_dev, u32 which, return ERR_PTR(-EINVAL); } +static int rbd_dev_v2_snapc_refresh(struct rbd_device *rbd_dev, u64 *hver) +{ + int ret; + + down_write(&rbd_dev->header_rwsem); + ret = rbd_dev_v2_snap_context(rbd_dev, hver); + dout("rbd_dev_v2_snap_context returned %d\n", ret); + if (ret) + goto out; + ret = rbd_dev_snaps_update(rbd_dev); + dout("rbd_dev_snaps_update returned %d\n", ret); + if (ret) + goto out; + ret = rbd_dev_snaps_register(rbd_dev); + dout("rbd_dev_snaps_register returned %d\n", ret); +out: + up_write(&rbd_dev->header_rwsem); + + return 0; +} + /* * Scan the rbd device's current snapshot list and compare it to the * newly-received snapshot context. Remove any existing snapshots @@ -2551,7 +2577,7 @@ static int rbd_init_watch_dev(struct rbd_device *rbd_dev) do { ret = rbd_req_sync_watch(rbd_dev); if (ret == -ERANGE) { - rc = rbd_refresh_header(rbd_dev, NULL); + rc = rbd_dev_snapc_refresh(rbd_dev, NULL); if (rc < 0) return rc; } @@ -3034,7 +3060,6 @@ static ssize_t rbd_add(struct bus_type *bus, rc = rbd_dev_probe(rbd_dev); if (rc < 0) goto err_out_client; - rbd_assert(rbd_image_format_valid(rbd_dev->image_format)); rc = rbd_dev_snaps_update(rbd_dev); if (rc) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ad27be2..b466393 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -268,7 +268,8 @@ static void rbd_put_dev(struct rbd_device *rbd_dev) put_device(&rbd_dev->dev); } -static int rbd_refresh_header(struct rbd_device *rbd_dev, u64 *hver); +static int rbd_dev_snapc_refresh(struct rbd_device *rbd_dev, u64 *hver); +static int rbd_dev_v2_snapc_refresh(struct rbd_device *rbd_dev, u64 *hver); static int rbd_open(struct block_device *bdev, fmode_t mode) { @@ -1303,7 +1304,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) dout("rbd_watch_cb %s notify_id=%llu opcode=%u\n", rbd_dev->header_name, (unsigned long long) notify_id, (unsigned int) opcode); - rc = rbd_refresh_header(rbd_dev, &hver); + rc = rbd_dev_snapc_refresh(rbd_dev, &hver); if (rc) pr_warning(RBD_DRV_NAME "%d got notification but failed to "