|
@@ -873,6 +873,11 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
|
|
ret = add_symlink(bdev->bd_part->holder_dir, &disk_to_dev(disk)->kobj);
|
|
ret = add_symlink(bdev->bd_part->holder_dir, &disk_to_dev(disk)->kobj);
|
|
if (ret)
|
|
if (ret)
|
|
goto out_del;
|
|
goto out_del;
|
|
|
|
+ /*
|
|
|
|
+ * bdev could be deleted beneath us which would implicitly destroy
|
|
|
|
+ * the holder directory. Hold on to it.
|
|
|
|
+ */
|
|
|
|
+ kobject_get(bdev->bd_part->holder_dir);
|
|
|
|
|
|
list_add(&holder->list, &bdev->bd_holder_disks);
|
|
list_add(&holder->list, &bdev->bd_holder_disks);
|
|
goto out_unlock;
|
|
goto out_unlock;
|
|
@@ -909,6 +914,7 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk)
|
|
del_symlink(disk->slave_dir, &part_to_dev(bdev->bd_part)->kobj);
|
|
del_symlink(disk->slave_dir, &part_to_dev(bdev->bd_part)->kobj);
|
|
del_symlink(bdev->bd_part->holder_dir,
|
|
del_symlink(bdev->bd_part->holder_dir,
|
|
&disk_to_dev(disk)->kobj);
|
|
&disk_to_dev(disk)->kobj);
|
|
|
|
+ kobject_put(bdev->bd_part->holder_dir);
|
|
list_del_init(&holder->list);
|
|
list_del_init(&holder->list);
|
|
kfree(holder);
|
|
kfree(holder);
|
|
}
|
|
}
|