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

block: move adjusting bd_part_count out of __blkdev_get 



Keep in the callers and thus remove the for_part argument.  This mirrors
what is done on the blkdev_get side and slightly simplifies
blkdev_get_part as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@rehat.com>
Link: https://lore.kernel.org/r/20210525061301.2242282-5-hch@lst.de


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

fs/block_dev.c

+7 −9
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk) 
EXPORT_SYMBOL_GPL(bd_unlink_disk_holder);

#endif



static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);

static void __blkdev_put(struct block_device *bdev, fmode_t mode);



int bdev_disk_changed(struct block_device *bdev, bool invalidate)

{
@@ -1329,12 +1329,12 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode) 
	ret = blkdev_get_whole(whole, mode);

	if (ret)

		goto out_put_whole;

	whole->bd_part_count++;



	ret = -ENXIO;

	if (!bdev_nr_sectors(part))

		goto out_blkdev_put;



	whole->bd_part_count++;

	set_init_blocksize(part);

	if (part->bd_bdi == &noop_backing_dev_info)

		part->bd_bdi = bdi_get(disk->queue->backing_dev_info);
@@ -1343,7 +1343,7 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode) 
	return 0;



out_blkdev_put:

	__blkdev_put(whole, mode, 1);

	__blkdev_put(whole, mode);

out_put_whole:

	bdput(whole);

	return ret;
@@ -1542,14 +1542,11 @@ static int blkdev_open(struct inode * inode, struct file * filp) 
	return 0;

}



static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)

static void __blkdev_put(struct block_device *bdev, fmode_t mode)

{

	struct gendisk *disk = bdev->bd_disk;

	struct block_device *victim = NULL;



	if (for_part)

		bdev->bd_part_count--;



	if (!--bdev->bd_openers) {

		WARN_ON_ONCE(bdev->bd_holders);

		sync_blockdev(bdev);
@@ -1562,7 +1559,8 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) 
	if (!bdev_is_partition(bdev) && disk->fops->release)

		disk->fops->release(disk, mode);

	if (victim) {

		__blkdev_put(victim, mode, 1);

		victim->bd_part_count--;

		__blkdev_put(victim, mode);

		bdput(victim);

	}

}
@@ -1620,7 +1618,7 @@ void blkdev_put(struct block_device *bdev, fmode_t mode) 
	 */

	disk_flush_events(disk, DISK_EVENT_MEDIA_CHANGE);



	__blkdev_put(bdev, mode, 0);

	__blkdev_put(bdev, mode);

	mutex_unlock(&disk->open_mutex);



	blkdev_put_no_open(bdev);