diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-11-15 15:10:45 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-11-16 23:19:53 +0100 |
| commit | d90db3b1c8676bc88b4309c5a571333de2263b8e (patch) | |
| tree | bf30d673b8f05f7fda454466d1aab0da41d188ef /block/genhd.c | |
| parent | sbitmap: Try each queue to wake up at least one waiter (diff) | |
| download | linux-d90db3b1c8676bc88b4309c5a571333de2263b8e.tar.xz linux-d90db3b1c8676bc88b4309c5a571333de2263b8e.zip | |
block: clear ->slave_dir when dropping the main slave_dir reference
Zero out the pointer to ->slave_dir so that the holder code doesn't
incorrectly treat the object as alive when add_disk failed or after
del_gendisk was called.
Fixes: 89f871af1b26 ("dm: delay registering the gendisk")
Reported-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/r/20221115141054.1051801-2-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index 09cde914e054..6271ad06ed07 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -528,6 +528,7 @@ out_unregister_queue: blk_unregister_queue(disk); out_put_slave_dir: kobject_put(disk->slave_dir); + disk->slave_dir = NULL; out_put_holder_dir: kobject_put(disk->part0->bd_holder_dir); out_del_integrity: @@ -629,6 +630,7 @@ void del_gendisk(struct gendisk *disk) kobject_put(disk->part0->bd_holder_dir); kobject_put(disk->slave_dir); + disk->slave_dir = NULL; part_stat_set_all(disk->part0, 0); disk->part0->bd_stamp = 0; |