From: Li Nan Date: Thu, 23 Jun 2022 07:41:00 +0000 (+0800) Subject: block: remove WARN_ON() from bd_link_disk_holder X-Git-Tag: howlett/maple/20220722_2~204^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca2a3343d69741dae4df2dbb954fb806d9a835de;p=users%2Fjedix%2Flinux-maple.git block: remove WARN_ON() from bd_link_disk_holder Since commit 83cbce957446("block: add error handling for device_add_disk / add_disk"), bdev->bd_holder_dir can not be empty now, so remove WARN_ON() from bd_link_disk_holder. Signed-off-by: Li Nan Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20220623074100.2251301-1-linan122@huawei.com Signed-off-by: Jens Axboe --- diff --git a/block/holder.c b/block/holder.c index 8d750281a1cd..5283bc804cc1 100644 --- a/block/holder.c +++ b/block/holder.c @@ -79,10 +79,6 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk) WARN_ON_ONCE(!bdev->bd_holder); - /* FIXME: remove the following once add_disk() handles errors */ - if (WARN_ON(!bdev->bd_holder_dir)) - goto out_unlock; - holder = bd_find_holder_disk(bdev, disk); if (holder) { holder->refcnt++;