From patchwork Fri Oct 26 22:45:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1654291 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 9DF8340135 for ; Fri, 26 Oct 2012 22:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966815Ab2JZWpJ (ORCPT ); Fri, 26 Oct 2012 18:45:09 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:54899 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757732Ab2JZWpI (ORCPT ); Fri, 26 Oct 2012 18:45:08 -0400 Received: by mail-ia0-f174.google.com with SMTP id y32so2570229iag.19 for ; Fri, 26 Oct 2012 15:45:07 -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=N5vGNiQUzXFNxBVJS4t6lmXxytourfeYl2GjdLNibC0=; b=IbXeJ95hyu60vvz5Uca76PM8rGV6pMo4NEwAPCazAsZtb8FgTYQgCghRxW5yLTrUWh 4BwHbEGI+kc9nfSPBanmgr5EMA3WIhVmq9Fzj7A5r0XUm4w9xx5i4s8cWUjX1NpwDzku iCDPGcyTfTNMAlMk2w7zUv0otgSON+6LfQoVbtJdQiRjDI59pa6dShH0SA2dGUTWe1Cz HZpbp0QIXuJ0mIn3gMMa+fr4lPAn7D1OsOntBt8/FTVZbV0cvZldfzc+w3nBXxEdHSx9 Tza+7vk4ZCJ3g6amVdS/Pd6qDxw7PRKdLluZbvdLAF1FR0d69bsw5urhxf6cKheQ7VpT foCw== Received: by 10.50.149.234 with SMTP id ud10mr3620146igb.12.1351291507681; Fri, 26 Oct 2012 15:45:07 -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 dq9sm182146igc.5.2012.10.26.15.45.00 (version=SSLv3 cipher=OTHER); Fri, 26 Oct 2012 15:45:01 -0700 (PDT) Message-ID: <508B126C.8060200@inktank.com> Date: Fri, 26 Oct 2012 17:45:00 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: remove snapshots on error in rbd_add() References: <508B11E3.3040108@inktank.com> In-Reply-To: <508B11E3.3040108@inktank.com> X-Gm-Message-State: ALoCoQn38l4UuvyCZ41+Zo2SIEhJKouquaPgaiMyvIjnpLzRuaFFIVqerPyynmXyufQII7BO97ke Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org If rbd_dev_snaps_update() has ever been called for an rbd device structure there could be snapshot structures on its snaps list. In rbd_add(), this function is called but a subsequent error path neglected to clean up any of these snapshots. Add a call to rbd_remove_all_snaps() in the appropriate spot to remedy this. Change a couple of error labels to be a little clearer while there. And drop the leading underscorse from the function name; there's nothing special about that function that they might signify. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index cc06c55..147c8df 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1787,7 +1787,7 @@ static int rbd_read_header(struct rbd_device *rbd_dev, return ret; } -static void __rbd_remove_all_snaps(struct rbd_device *rbd_dev) +static void rbd_remove_all_snaps(struct rbd_device *rbd_dev) { struct rbd_snap *snap; struct rbd_snap *next; @@ -3179,11 +3179,11 @@ static ssize_t rbd_add(struct bus_type *bus, /* no need to lock here, as rbd_dev is not registered yet */ rc = rbd_dev_snaps_update(rbd_dev); if (rc) - goto err_out_header; + goto err_out_probe; rc = rbd_dev_set_mapping(rbd_dev, snap_name); if (rc) - goto err_out_header; + goto err_out_snaps; /* generate unique id: find highest unique id, add one */ rbd_dev_id_get(rbd_dev); @@ -3247,7 +3247,9 @@ err_out_blkdev: unregister_blkdev(rbd_dev->major, rbd_dev->name); err_out_id: rbd_dev_id_put(rbd_dev); -err_out_header: +err_out_snaps: + rbd_remove_all_snaps(rbd_dev); +err_out_probe: rbd_header_free(&rbd_dev->header); err_out_client: kfree(rbd_dev->header_name); @@ -3345,7 +3347,7 @@ static ssize_t rbd_remove(struct bus_type *bus, goto done; } - __rbd_remove_all_snaps(rbd_dev); + rbd_remove_all_snaps(rbd_dev); rbd_bus_del_dev(rbd_dev); done: