* [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder
@ 2022-06-23 7:41 Li Nan
2022-06-23 13:30 ` Christoph Hellwig
2022-06-23 13:48 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Li Nan @ 2022-06-23 7:41 UTC (permalink / raw)
To: axboe; +Cc: linux-block, linux-kernel, linan122, yukuai3, yi.zhang
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>
---
block/holder.c | 4 ----
1 file changed, 4 deletions(-)
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++;
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder
2022-06-23 7:41 [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder Li Nan
@ 2022-06-23 13:30 ` Christoph Hellwig
2022-06-23 13:48 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2022-06-23 13:30 UTC (permalink / raw)
To: Li Nan; +Cc: axboe, linux-block, linux-kernel, yukuai3, yi.zhang
Thanks, looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder
2022-06-23 7:41 [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder Li Nan
2022-06-23 13:30 ` Christoph Hellwig
@ 2022-06-23 13:48 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2022-06-23 13:48 UTC (permalink / raw)
To: linan122; +Cc: yi.zhang, linux-kernel, yukuai3, linux-block
On Thu, 23 Jun 2022 15:41:00 +0800, Li Nan wrote:
> 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.
>
>
Applied, thanks!
[1/1] block: remove WARN_ON() from bd_link_disk_holder
commit: ca2a3343d69741dae4df2dbb954fb806d9a835de
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-23 13:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 7:41 [PATCH -next v4] block: remove WARN_ON() from bd_link_disk_holder Li Nan
2022-06-23 13:30 ` Christoph Hellwig
2022-06-23 13:48 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®