Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31cb1d64 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

block: Don't revalidate bdev of hidden gendisk 



When hidden gendisk is revalidated, there's no point in revalidating
associated block device as there's none. We would thus just create new
bdev inode, report "detected capacity change from 0 to XXX" message and
evict the bdev inode again. Avoid this pointless dance and confusing
message in the kernel log.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 33ec3e53

fs/block_dev.c

+16 −9
Original line number Diff line number Diff line
@@ -1406,12 +1406,18 @@ void check_disk_size_change(struct gendisk *disk, struct block_device *bdev, 
 */

int revalidate_disk(struct gendisk *disk)

{

	struct block_device *bdev;

	int ret = 0;



	if (disk->fops->revalidate_disk)

		ret = disk->fops->revalidate_disk(disk);

	bdev = bdget_disk(disk, 0);



	/*

	 * Hidden disks don't have associated bdev so there's no point in

	 * revalidating it.

	 */

	if (!(disk->flags & GENHD_FL_HIDDEN)) {

		struct block_device *bdev = bdget_disk(disk, 0);



		if (!bdev)

			return ret;
@@ -1420,6 +1426,7 @@ int revalidate_disk(struct gendisk *disk) 
		bdev->bd_invalidated = 0;

		mutex_unlock(&bdev->bd_mutex);

		bdput(bdev);

	}

	return ret;

}

EXPORT_SYMBOL(revalidate_disk);