Re: [PATCH 08/10] dm: add add_disk() error handling
- To: Luis Chamberlain <mcgrof@kernel.org>
- 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
- From: Christoph Hellwig <hch@infradead.org>
- Date: Tue, 24 Aug 2021 07:21:30 +0100
- Message-id: <[🔎] YSSP6ujNQttGN2sZ@infradead.org>
- In-reply-to: <20210823202930.137278-9-mcgrof@kernel.org>
- References: <20210823202930.137278-1-mcgrof@kernel.org> <20210823202930.137278-9-mcgrof@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.
Reply to: