From patchwork Thu Jul 15 19:51:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12380847 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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E2A65C636C9 for ; Thu, 15 Jul 2021 19:52:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC0E2613C4 for ; Thu, 15 Jul 2021 19:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343586AbhGOTzm (ORCPT ); Thu, 15 Jul 2021 15:55:42 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:39469 "EHLO mail-pf1-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344939AbhGOTyl (ORCPT ); Thu, 15 Jul 2021 15:54:41 -0400 Received: by mail-pf1-f176.google.com with SMTP id b12so6525758pfv.6; Thu, 15 Jul 2021 12:51:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5J4xjtFnDYruSN/ZXrs/qzKjWSmRmgInJ+MeQlMWoK4=; b=t97RnKmcTUI1W57WPxq7IzlI0Y1i46i9+ESUNqqDubvfXXDLuIU5geZELC33zsCPd+ 2b2FxMiM0LMmW48+JiKy0US5fCgV8NpVwX22YGc+TYU56maBymFBhESd4uwB8lnwWUO0 25vo/uK9EJiQmx2rgJSHFWrtzG4La0WIegMCXM9IiX8RnIRrww3kyv/iGmnrPIA8QZci Yp4hWzZTiTMfRrJe+NQ/+SxITX/Iu+yYh9kAPcxjcoCAbQL8HQFLe6xzWsxrAkkLl+/9 3U2cch/b10UT11yvR0JFU+Ay3Xy7SrgBgSUam9tTLBL91JLB8gTxYZu6ZsPfhlBHNpnz jQ9g== X-Gm-Message-State: AOAM533CYDdO+25Benbs5LI68minBMvKEc/BNp39HWYRbFbMjfkzEUAy zErcMnK1aUROECEreptgTyg= X-Google-Smtp-Source: ABdhPJweQ+nPM22EKIW5Ufy33HaXh3f2+DxXnFtFPyMIuVkbm2Ed7VOfEluv3VPbG8AHPwMsx6o/Tw== X-Received: by 2002:a63:1324:: with SMTP id i36mr6279793pgl.8.1626378706491; Thu, 15 Jul 2021 12:51:46 -0700 (PDT) Received: from localhost ([191.96.120.37]) by smtp.gmail.com with ESMTPSA id g141sm7469517pfb.210.2021.07.15.12.51.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jul 2021 12:51:45 -0700 (PDT) From: Luis Chamberlain To: axboe@kernel.dk Cc: hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, hch@infradead.org, jack@suse.cz, osandov@fb.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 1/3] loop: add error handling support for add_disk() Date: Thu, 15 Jul 2021 12:51:39 -0700 Message-Id: <20210715195141.1882285-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715195141.1882285-1-mcgrof@kernel.org> References: <20210715195141.1882285-1-mcgrof@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Signed-off-by: Luis Chamberlain --- drivers/block/loop.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index f37b9e3d833c..efbd8e29aca7 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -2326,10 +2326,17 @@ static int loop_add(int i) disk->private_data = lo; disk->queue = lo->lo_queue; sprintf(disk->disk_name, "loop%d", i); - add_disk(disk); + + err = add_disk(disk); + if (err) + goto out_cleanup_disk; + mutex_unlock(&loop_ctl_mutex); + return i; +out_cleanup_disk: + blk_cleanup_disk(disk); out_cleanup_tags: blk_mq_free_tag_set(&lo->tag_set); out_free_idr: From patchwork Thu Jul 15 19:51:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12380849 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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A2B30C636C9 for ; Thu, 15 Jul 2021 19:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C401613C7 for ; Thu, 15 Jul 2021 19:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238289AbhGOT4A (ORCPT ); Thu, 15 Jul 2021 15:56:00 -0400 Received: from mail-pf1-f177.google.com ([209.85.210.177]:34778 "EHLO mail-pf1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345106AbhGOTyn (ORCPT ); Thu, 15 Jul 2021 15:54:43 -0400 Received: by mail-pf1-f177.google.com with SMTP id o201so6531436pfd.1; Thu, 15 Jul 2021 12:51:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9xZLEXNXEvKK/ATe9o2Ld+14LkkyvorWKYSypyUoVK8=; b=PBveoAMzoIEqV4yTCRLZB/XgEKhnzaJ0h6eRwurulHwIbg1/GyYyVAN0loPZUsOIbW Dely1JVIUK4iJt9Z5fqPOIH5PHvj6EPbF4tnA/KosbyEH8gXEvcwyPfcodB2dpjDcvDb wccl6OskY+UdeTwZXUpAOlIg054kbT7QboJOj8TjHGPT4UxfI6ct5X7k3yZq/PgSbhAD lzu3u19MbGj0IpCvKeypcUKC0NAGm7+fMUZ+JBNf5H0QgJySQ9U2KW5FhE+SElQ7MGwN l94tNhTUgsrl5FSGsrohB3cyG6yMLPorUmooDgJ3A0YP7Q3CwgTHy8r3WKJfNDJ0+xrH 8mcQ== X-Gm-Message-State: AOAM533ySqwv6+I8EbFo4Yo/1/nBCTDVq11hJDMpt8q6ROXhc4bNDL6t JN9DGXPe373ODpgKU/andVY= X-Google-Smtp-Source: ABdhPJwvsdITlgmFZz31zuvVhiX/yqFksvb7rTQTRC8uXgTJ8peNV0C9qKjGMnwVu/SzryqrQOsaVw== X-Received: by 2002:a63:4e04:: with SMTP id c4mr5920581pgb.294.1626378708824; Thu, 15 Jul 2021 12:51:48 -0700 (PDT) Received: from localhost ([191.96.120.37]) by smtp.gmail.com with ESMTPSA id q11sm684450pjd.30.2021.07.15.12.51.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jul 2021 12:51:47 -0700 (PDT) From: Luis Chamberlain To: axboe@kernel.dk Cc: hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, hch@infradead.org, jack@suse.cz, osandov@fb.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 2/3] null_blk: add error handling support for add_disk() Date: Thu, 15 Jul 2021 12:51:40 -0700 Message-Id: <20210715195141.1882285-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715195141.1882285-1-mcgrof@kernel.org> References: <20210715195141.1882285-1-mcgrof@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. The actual cleanup in case of error is already handled by the caller of null_gendisk_register(). Signed-off-by: Luis Chamberlain --- drivers/block/null_blk/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index d734e9ee1546..2a8f3eee7159 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1721,8 +1721,7 @@ static int null_gendisk_register(struct nullb *nullb) return ret; } - add_disk(disk); - return 0; + return add_disk(disk); } static int null_init_tag_set(struct nullb *nullb, struct blk_mq_tag_set *set) From patchwork Thu Jul 15 19:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12380851 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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 60256C636C9 for ; Thu, 15 Jul 2021 19:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BA73613C7 for ; Thu, 15 Jul 2021 19:53:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344064AbhGOT4B (ORCPT ); Thu, 15 Jul 2021 15:56:01 -0400 Received: from mail-pl1-f179.google.com ([209.85.214.179]:37695 "EHLO mail-pl1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345146AbhGOTyp (ORCPT ); Thu, 15 Jul 2021 15:54:45 -0400 Received: by mail-pl1-f179.google.com with SMTP id a14so3985356pls.4; Thu, 15 Jul 2021 12:51:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mOZJguT6e/3qRtTmvglKU9JRoKMGH/7hjY62u5soSk8=; b=ZUi1OAQEE5vhE9yn0Ne7DvMF7nZPFR52sOggUoyx3Kq5QhMDEroPfL0DiNFA65TA4g FbrZHK8Ev/oDgRcq8dstvR9M1hgMzDRixI+sFMdTcP/qVs2TwCUYYdNLtxeRFYFpXj0e pNIvC05LVRrCGbgS3aMym66woFSOvHfB6D+4q4YGOvhH0wj1nAOVFTzKvcUM+b41JZ50 mrdUi728xDHsE5v/dbNLgOQEq51c1kGSuzgat7Gwsv8FMpNocLY+vHm60V8aOZa6Nh7n STMpncZ+qDygKOSakcZoy4fpnUuJFxlPXNvoPxWZEHnbYE79GzzL/kNANC8lfeNvwGDs H07Q== X-Gm-Message-State: AOAM533hR/5boazrL8v5XIO8nj8Ht/OydrqvgwWZQ5YSCFcwj03ExNz2 QUyRlK42OImVA1QxPd7f3ws= X-Google-Smtp-Source: ABdhPJwjYNjp+FUDGCk59hrqetTx4Z8BQ8/4Mba8i0AYXQM4OCICd+2wzT80C3/eHSYFlY+bFkda5w== X-Received: by 2002:a17:90a:4812:: with SMTP id a18mr11649926pjh.40.1626378710845; Thu, 15 Jul 2021 12:51:50 -0700 (PDT) Received: from localhost ([191.96.120.37]) by smtp.gmail.com with ESMTPSA id o1sm6095214pjf.56.2021.07.15.12.51.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jul 2021 12:51:50 -0700 (PDT) From: Luis Chamberlain To: axboe@kernel.dk Cc: hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, hch@infradead.org, jack@suse.cz, osandov@fb.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 3/3] nbd: add error handling support for add_disk() Date: Thu, 15 Jul 2021 12:51:41 -0700 Message-Id: <20210715195141.1882285-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715195141.1882285-1-mcgrof@kernel.org> References: <20210715195141.1882285-1-mcgrof@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Signed-off-by: Luis Chamberlain --- drivers/block/nbd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index b7d663736d35..0ecc1e4e16fd 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1730,10 +1730,14 @@ static int nbd_dev_add(int index) disk->fops = &nbd_fops; disk->private_data = nbd; sprintf(disk->disk_name, "nbd%d", index); - add_disk(disk); + err = add_disk(disk); + if (err) + goto out_err_disk; nbd_total_devices++; return index; +out_err_disk: + blk_cleanup_disk(disk); out_free_idr: idr_remove(&nbd_index_idr, index); out_free_tags: