From: Luis Chamberlain <mcgrof@kernel.org> To: axboe@kernel.dk, gregkh@linuxfoundation.org, chaitanya.kulkarni@wdc.com, atulgopinathan@gmail.com, hare@suse.de, maximlevitsky@gmail.com, oakad@yahoo.com, ulf.hansson@linaro.org, colin.king@canonical.com, shubhankarvk@gmail.com, baijiaju1990@gmail.com, trix@redhat.com, dongsheng.yang@easystack.cn, ceph-devel@vger.kernel.org, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sth@linux.ibm.com, hoeppner@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, borntraeger@de.ibm.com, oberpar@linux.ibm.com, tj@kernel.org Cc: linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org, linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH 2/9] ms_block: add error handling support for add_disk() Date: Thu, 2 Sep 2021 10:40:58 -0700 [thread overview] Message-ID: <20210902174105.2418771-3-mcgrof@kernel.org> (raw) In-Reply-To: <20210902174105.2418771-1-mcgrof@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. Contrary to the typical removal which delays the put_disk() until later, since we are failing on a probe we immediately put the disk on failure from add_disk by using blk_cleanup_disk(). Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/memstick/core/ms_block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 4a4573fa7b0f..86c626933c1a 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -2156,10 +2156,14 @@ static int msb_init_disk(struct memstick_dev *card) set_disk_ro(msb->disk, 1); msb_start(card); - device_add_disk(&card->dev, msb->disk, NULL); + rc = device_add_disk(&card->dev, msb->disk, NULL); + if (rc) + goto out_cleanup_disk; dbg("Disk added"); return 0; +out_cleanup_disk: + blk_cleanup_disk(msb->disk); out_free_tag_set: blk_mq_free_tag_set(&msb->tag_set); out_release_id: -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Luis Chamberlain <mcgrof@kernel.org> To: axboe@kernel.dk, gregkh@linuxfoundation.org, chaitanya.kulkarni@wdc.com, atulgopinathan@gmail.com, hare@suse.de, maximlevitsky@gmail.com, oakad@yahoo.com, ulf.hansson@linaro.org, colin.king@canonical.com, shubhankarvk@gmail.com, baijiaju1990@gmail.com, trix@redhat.com, dongsheng.yang@easystack.cn, ceph-devel@vger.kernel.org, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sth@linux.ibm.com, hoeppner@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, borntraeger@de.ibm.com, oberpar@linux.ibm.com, tj@kernel.org Cc: linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org, linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH 2/9] ms_block: add error handling support for add_disk() Date: Thu, 2 Sep 2021 10:40:58 -0700 [thread overview] Message-ID: <20210902174105.2418771-3-mcgrof@kernel.org> (raw) In-Reply-To: <20210902174105.2418771-1-mcgrof@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. Contrary to the typical removal which delays the put_disk() until later, since we are failing on a probe we immediately put the disk on failure from add_disk by using blk_cleanup_disk(). Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/memstick/core/ms_block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 4a4573fa7b0f..86c626933c1a 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -2156,10 +2156,14 @@ static int msb_init_disk(struct memstick_dev *card) set_disk_ro(msb->disk, 1); msb_start(card); - device_add_disk(&card->dev, msb->disk, NULL); + rc = device_add_disk(&card->dev, msb->disk, NULL); + if (rc) + goto out_cleanup_disk; dbg("Disk added"); return 0; +out_cleanup_disk: + blk_cleanup_disk(msb->disk); out_free_tag_set: blk_mq_free_tag_set(&msb->tag_set); out_release_id: -- 2.30.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-09-02 17:41 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-02 17:40 [PATCH 0/9] block: 5th batch of add_disk() error handling conversions Luis Chamberlain 2021-09-02 17:40 ` Luis Chamberlain 2021-09-02 17:40 ` [PATCH 1/9] cdrom/gdrom: add error handling support for add_disk() Luis Chamberlain 2021-09-02 17:40 ` Luis Chamberlain 2021-09-02 17:40 ` Luis Chamberlain [this message] 2021-09-02 17:40 ` [PATCH 2/9] ms_block: " Luis Chamberlain 2021-09-06 17:10 ` Ulf Hansson 2021-09-06 17:10 ` Ulf Hansson 2021-09-02 17:40 ` [PATCH 3/9] mspro_block: " Luis Chamberlain 2021-09-02 17:40 ` Luis Chamberlain 2021-09-06 17:10 ` Ulf Hansson 2021-09-06 17:10 ` Ulf Hansson 2021-09-02 17:41 ` [PATCH 4/9] rbd: add add_disk() error handling Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-02 17:41 ` [PATCH 5/9] mtd: " Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-02 19:09 ` Miquel Raynal 2021-09-02 19:09 ` Miquel Raynal 2021-09-02 17:41 ` [PATCH 6/9] s390/block/dasd_genhd: add error handling support for add_disk() Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-13 8:17 ` Jan Höppner 2021-09-13 8:17 ` Jan Höppner 2021-09-13 8:42 ` Christoph Hellwig 2021-09-13 8:42 ` Christoph Hellwig 2021-09-13 12:15 ` Jan Höppner 2021-09-13 12:15 ` Jan Höppner 2021-09-13 12:19 ` Jan Höppner 2021-09-13 12:19 ` Jan Höppner 2021-09-13 16:51 ` Luis Chamberlain 2021-09-13 16:51 ` Luis Chamberlain 2021-09-15 14:57 ` Jan Höppner 2021-09-15 14:57 ` Jan Höppner 2021-09-02 17:41 ` [PATCH 7/9] s390/block/dcssblk: " Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-03 14:08 ` Heiko Carstens 2021-09-03 14:08 ` Heiko Carstens 2021-09-04 1:46 ` Luis Chamberlain 2021-09-04 1:46 ` Luis Chamberlain 2021-09-06 11:43 ` Gerald Schaefer 2021-09-06 11:43 ` Gerald Schaefer 2021-09-06 14:33 ` Heiko Carstens 2021-09-06 14:33 ` Heiko Carstens 2021-09-13 16:53 ` Luis Chamberlain 2021-09-13 16:53 ` Luis Chamberlain 2021-09-23 8:52 ` Heiko Carstens 2021-09-23 8:52 ` Heiko Carstens 2021-09-02 17:41 ` [PATCH 8/9] s390/block/scm_blk: " Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-03 14:30 ` Heiko Carstens 2021-09-03 14:30 ` Heiko Carstens 2021-09-02 17:41 ` [PATCH 9/9] s390/block/xpram: " Luis Chamberlain 2021-09-02 17:41 ` Luis Chamberlain 2021-09-03 14:06 ` Heiko Carstens 2021-09-03 14:06 ` Heiko Carstens 2021-09-04 1:44 ` Luis Chamberlain 2021-09-04 1:44 ` Luis Chamberlain 2021-09-06 9:15 ` Christoph Hellwig 2021-09-06 9:15 ` Christoph Hellwig 2021-09-06 14:35 ` Heiko Carstens 2021-09-06 14:35 ` Heiko Carstens
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210902174105.2418771-3-mcgrof@kernel.org \ --to=mcgrof@kernel.org \ --cc=atulgopinathan@gmail.com \ --cc=axboe@kernel.dk \ --cc=baijiaju1990@gmail.com \ --cc=borntraeger@de.ibm.com \ --cc=ceph-devel@vger.kernel.org \ --cc=chaitanya.kulkarni@wdc.com \ --cc=colin.king@canonical.com \ --cc=dongsheng.yang@easystack.cn \ --cc=gor@linux.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=hare@suse.de \ --cc=hca@linux.ibm.com \ --cc=hoeppner@linux.ibm.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-s390@vger.kernel.org \ --cc=maximlevitsky@gmail.com \ --cc=miquel.raynal@bootlin.com \ --cc=oakad@yahoo.com \ --cc=oberpar@linux.ibm.com \ --cc=richard@nod.at \ --cc=shubhankarvk@gmail.com \ --cc=sth@linux.ibm.com \ --cc=tj@kernel.org \ --cc=trix@redhat.com \ --cc=ulf.hansson@linaro.org \ --cc=vigneshr@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.