Commit ca2a3343 authored by Li Nan's avatar Li Nan Committed by Jens Axboe
Browse files

block: remove WARN_ON() from bd_link_disk_holder 



Since commit 83cbce95("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: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220623074100.2251301-1-linan122@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2645672f

block/holder.c

+0 −4
Original line number Diff line number Diff line
@@ -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++;