mirror of
https://github.com/torvalds/linux.git
synced 2026-05-05 23:05:25 -04:00
block: move holder_dir to struct block_device
Move the holder_dir field to struct block_device in preparation for kill struct hd_struct. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
committed by
Jens Axboe
parent
231926dbf0
commit
1bdd5ae025
@@ -681,7 +681,8 @@ static void register_disk(struct device *parent, struct gendisk *disk,
|
||||
*/
|
||||
pm_runtime_set_memalloc_noio(ddev, true);
|
||||
|
||||
disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
|
||||
disk->part0.bdev->bd_holder_dir =
|
||||
kobject_create_and_add("holders", &ddev->kobj);
|
||||
disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
|
||||
|
||||
if (disk->flags & GENHD_FL_HIDDEN) {
|
||||
@@ -887,7 +888,7 @@ void del_gendisk(struct gendisk *disk)
|
||||
|
||||
blk_unregister_queue(disk);
|
||||
|
||||
kobject_put(disk->part0.holder_dir);
|
||||
kobject_put(disk->part0.bdev->bd_holder_dir);
|
||||
kobject_put(disk->slave_dir);
|
||||
|
||||
part_stat_set_all(&disk->part0, 0);
|
||||
|
||||
Reference in New Issue
Block a user