From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A77FC4338F for ; Tue, 24 Aug 2021 06:25:16 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A4E161265 for ; Tue, 24 Aug 2021 06:25:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2A4E161265 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-353-m5gmjD4sN7e_fNB8MiAvdA-1; Tue, 24 Aug 2021 02:25:11 -0400 X-MC-Unique: m5gmjD4sN7e_fNB8MiAvdA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2926787D542; Tue, 24 Aug 2021 06:25:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0394060C05; Tue, 24 Aug 2021 06:25:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9B9734A7C8; Tue, 24 Aug 2021 06:25:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17O6P3Oi027137 for ; Tue, 24 Aug 2021 02:25:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC9B8112D432; Tue, 24 Aug 2021 06:25:03 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8724112D431 for ; Tue, 24 Aug 2021 06:25:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4EE9805F44 for ; Tue, 24 Aug 2021 06:25:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-581-kycYEa-1PzCNAifd3GrR6Q-1; Tue, 24 Aug 2021 02:24:58 -0400 X-MC-Unique: kycYEa-1PzCNAifd3GrR6Q-1 Received: from hch by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIPoQ-00AeEP-DQ; Tue, 24 Aug 2021 06:21:46 +0000 Date: Tue, 24 Aug 2021 07:21:30 +0100 From: Christoph Hellwig To: Luis Chamberlain Message-ID: References: <20210823202930.137278-1-mcgrof@kernel.org> <20210823202930.137278-9-mcgrof@kernel.org> MIME-Version: 1.0 In-Reply-To: <20210823202930.137278-9-mcgrof@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: dm-devel@redhat.com Cc: ulf.hansson@linaro.org, snitzer@redhat.com, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, dm-devel@redhat.com, agk@redhat.com, beanhuo@micron.com, ming.lei@redhat.com, sagi@grimberg.me, linux-scsi@vger.kernel.org, hch@infradead.org, jejb@linux.ibm.com, josef@toxicpanda.com, nbd@other.debian.org, linux-block@vger.kernel.org, avri.altman@wdc.com, kbusch@kernel.org, swboyd@chromium.org, bvanassche@acm.org, axboe@kernel.dk, martin.petersen@oracle.com, linux-mmc@vger.kernel.org, adrian.hunter@intel.com Subject: Re: [dm-devel] [PATCH 08/10] dm: add add_disk() error handling X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Mon, Aug 23, 2021 at 01:29:28PM -0700, Luis Chamberlain wrote: > - add_disk(md->disk); > + r = add_disk(md->disk); > + if (r) > + goto out_cleanup_disk; > > r = dm_sysfs_init(md); > - if (r) { > - del_gendisk(md->disk); > - return r; > - } > + if (r) > + goto out_del_gendisk; > md->type = type; > return 0; > + > +out_cleanup_disk: > + blk_cleanup_disk(md->disk); > +out_del_gendisk: > + del_gendisk(md->disk); > + return r; I think the add_disk should just return r. If you look at the callers they eventualy end up in dm_table_destroy, which does this cleanup. -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0638DC432BE for ; Tue, 24 Aug 2021 06:26:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3F9961076 for ; Tue, 24 Aug 2021 06:26:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230038AbhHXG0r (ORCPT ); Tue, 24 Aug 2021 02:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231265AbhHXG0p (ORCPT ); Tue, 24 Aug 2021 02:26:45 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B638C061575; Mon, 23 Aug 2021 23:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=NKFJoeYTqWpvwgOnvXGlWBRk4r7Ma5K7sZ2OJmDpXzU=; b=U7bi6QnCeU8LmhajLwuLPmnZlS LjSyGkqk3km9uYYmJ7D5A9FFyl8qVqyLW2dfuD8Ey8BE2oTJ7QhvGHnt6NVlXtwcw0N/4OKry2xhN ba3337soV7oOg168NKc9dJPzJA1GboxJ1Qg8fj/tc7TI9Qcy7teO73MZ+eDQn7lsnB2FMUEps7QP0 KaNE4SkdKl+SeKbKHrIYiizI5JxTpPKmjNEV88s8nzhoGAiwvVk2/fA1iL0kMowDCe/U8zlI41FuG QyC+3ZjOnn4G15hGXUmlVCQ6nZQOKtHTa5N3QvBQ3yFlhFGWpoMdoW17uzS4YCcvcRY36HbpEwDJc 85FfU+PQ==; Received: from hch by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIPoQ-00AeEP-DQ; Tue, 24 Aug 2021 06:21:46 +0000 Date: Tue, 24 Aug 2021 07:21:30 +0100 From: Christoph Hellwig To: Luis Chamberlain Cc: axboe@kernel.dk, martin.petersen@oracle.com, jejb@linux.ibm.com, kbusch@kernel.org, sagi@grimberg.me, adrian.hunter@intel.com, beanhuo@micron.com, ulf.hansson@linaro.org, avri.altman@wdc.com, swboyd@chromium.org, agk@redhat.com, snitzer@redhat.com, josef@toxicpanda.com, hch@infradead.org, hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-mmc@vger.kernel.org, dm-devel@redhat.com, nbd@other.debian.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 08/10] dm: add add_disk() error handling Message-ID: References: <20210823202930.137278-1-mcgrof@kernel.org> <20210823202930.137278-9-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210823202930.137278-9-mcgrof@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Mon, Aug 23, 2021 at 01:29:28PM -0700, Luis Chamberlain wrote: > - add_disk(md->disk); > + r = add_disk(md->disk); > + if (r) > + goto out_cleanup_disk; > > r = dm_sysfs_init(md); > - if (r) { > - del_gendisk(md->disk); > - return r; > - } > + if (r) > + goto out_del_gendisk; > md->type = type; > return 0; > + > +out_cleanup_disk: > + blk_cleanup_disk(md->disk); > +out_del_gendisk: > + del_gendisk(md->disk); > + return r; I think the add_disk should just return r. If you look at the callers they eventualy end up in dm_table_destroy, which does this cleanup. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDF86C4338F for ; Tue, 24 Aug 2021 06:23:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80B9B60FDA for ; Tue, 24 Aug 2021 06:23:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 80B9B60FDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jpc/vfEuS75jSv0qgv+aLAsUnNlmhdNkptUPYGIO6vo=; b=0BPrTHO2vu9Sda nlCyuXciHi6/c+UqSShlbPN0czJ0itgECHFANin8Dev5YLomxLHLltl4Ff2Rd+YQ88RuUH3uFPmD2 3ZD06U+hq2qdIfoKQU644y6GawVK8kAYiWQC7QoXoid+rwzup5tpODUyjREQLt43eo34FYYN4Uj6R dcfMjuTH+u8GKdB9r/xCUQSVv+FSn9+Rb3GtuP/xHKhl3WvHvUtvmbJCWZvGLTKbPLEr5idZnbqyz 3hSyVbMN0XWAHkKIHC9M+Yx0pLNqxtoQFewrT1UHJ2KOQFdyjPERHQjYCb3LngtB5OpAIKDqkKRLn TaIy7I6AviTqHcj2NPfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIPpn-001psZ-7p; Tue, 24 Aug 2021 06:22:55 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIPpl-001prt-NT for linux-nvme@bombadil.infradead.org; Tue, 24 Aug 2021 06:22:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=NKFJoeYTqWpvwgOnvXGlWBRk4r7Ma5K7sZ2OJmDpXzU=; b=U7bi6QnCeU8LmhajLwuLPmnZlS LjSyGkqk3km9uYYmJ7D5A9FFyl8qVqyLW2dfuD8Ey8BE2oTJ7QhvGHnt6NVlXtwcw0N/4OKry2xhN ba3337soV7oOg168NKc9dJPzJA1GboxJ1Qg8fj/tc7TI9Qcy7teO73MZ+eDQn7lsnB2FMUEps7QP0 KaNE4SkdKl+SeKbKHrIYiizI5JxTpPKmjNEV88s8nzhoGAiwvVk2/fA1iL0kMowDCe/U8zlI41FuG QyC+3ZjOnn4G15hGXUmlVCQ6nZQOKtHTa5N3QvBQ3yFlhFGWpoMdoW17uzS4YCcvcRY36HbpEwDJc 85FfU+PQ==; Received: from hch by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIPoQ-00AeEP-DQ; Tue, 24 Aug 2021 06:21:46 +0000 Date: Tue, 24 Aug 2021 07:21:30 +0100 From: Christoph Hellwig To: Luis Chamberlain Cc: axboe@kernel.dk, martin.petersen@oracle.com, jejb@linux.ibm.com, kbusch@kernel.org, sagi@grimberg.me, adrian.hunter@intel.com, beanhuo@micron.com, ulf.hansson@linaro.org, avri.altman@wdc.com, swboyd@chromium.org, agk@redhat.com, snitzer@redhat.com, josef@toxicpanda.com, hch@infradead.org, hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-mmc@vger.kernel.org, dm-devel@redhat.com, nbd@other.debian.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 08/10] dm: add add_disk() error handling Message-ID: References: <20210823202930.137278-1-mcgrof@kernel.org> <20210823202930.137278-9-mcgrof@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210823202930.137278-9-mcgrof@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Mon, Aug 23, 2021 at 01:29:28PM -0700, Luis Chamberlain wrote: > - add_disk(md->disk); > + r = add_disk(md->disk); > + if (r) > + goto out_cleanup_disk; > > r = dm_sysfs_init(md); > - if (r) { > - del_gendisk(md->disk); > - return r; > - } > + if (r) > + goto out_del_gendisk; > md->type = type; > return 0; > + > +out_cleanup_disk: > + blk_cleanup_disk(md->disk); > +out_del_gendisk: > + del_gendisk(md->disk); > + return r; I think the add_disk should just return r. If you look at the callers they eventualy end up in dm_table_destroy, which does this cleanup. _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme