Commit d90db3b1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: 89f871af ("dm: delay registering the gendisk")
Reported-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarMike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/r/20221115141054.1051801-2-yukuai1@huaweicloud.com


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

block/genhd.c

+2 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 
	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;