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

block: add back the bd_holder_dir reference in bd_link_disk_holder 



This essentially reverts "block: remove the extra kobject reference in
bd_link_disk_holder".  That commit dropped the extra reference because
the condition in the comment can't be true.  But it turns out that
comment did not actually describe the problematic situation, so add
back the extra reference and document it properly.

Fixes: fbd9a395 ("block: remove the extra kobject reference in bd_link_disk_holder")
Reported-by: default avatarTushar Sugandhi <tusharsu@linux.microsoft.com>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e70344c0

block/holder.c

+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk) 
	}



	list_add(&holder->list, &disk->slave_bdevs);

	/*

	 * del_gendisk drops the initial reference to bd_holder_dir, so we need

	 * to keep our own here to allow for cleanup past that point.

	 */

	kobject_get(bdev->bd_holder_dir);



out_unlock:

	mutex_unlock(&disk->open_mutex);

	return ret;
@@ -138,6 +144,7 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk) 
	if (!WARN_ON_ONCE(holder == NULL) && !--holder->refcnt) {

		if (disk->slave_dir)

			__unlink_disk_holder(bdev, disk);

		kobject_put(bdev->bd_holder_dir);

		list_del_init(&holder->list);

		kfree(holder);

	}