projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2645672
)
block: remove WARN_ON() from bd_link_disk_holder
author
Li Nan
<linan122@huawei.com>
Thu, 23 Jun 2022 07:41:00 +0000
(15:41 +0800)
committer
Jens Axboe
<axboe@kernel.dk>
Thu, 23 Jun 2022 13:48:05 +0000
(07:48 -0600)
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 <linan122@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link:
https://lore.kernel.org/r/20220623074100.2251301-1-linan122@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/holder.c
patch
|
blob
|
history
diff --git
a/block/holder.c
b/block/holder.c
index 8d750281a1cd958f9686151f940a27c1e65c7be5..5283bc804cc14c3882f1dee28a90f3a0e45ce6e1 100644
(file)
--- 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++;