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

block: use revalidate_disk_size in set_capacity_revalidate_and_notify 



Only virtio_blk and xen-blkfront set the revalidate argument to true,
and both do not implement the ->revalidate_disk method.  So switch
to the helper that just updates the size instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 659e56ba

block/genhd.c

+3 −4
Original line number Diff line number Diff line
@@ -50,14 +50,13 @@ static void disk_release_events(struct gendisk *disk); 
 * zero and will not be set to zero

 */

void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,

					bool revalidate)

					bool update_bdev)

{

	sector_t capacity = get_capacity(disk);



	set_capacity(disk, size);



	if (revalidate)

		revalidate_disk(disk);

	if (update_bdev)

		revalidate_disk_size(disk, true);



	if (capacity != size && capacity != 0 && size != 0) {

		char *envp[] = { "RESIZE=1", NULL };

include/linux/genhd.h

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ static inline int get_disk_ro(struct gendisk *disk) 
extern void disk_block_events(struct gendisk *disk);

extern void disk_unblock_events(struct gendisk *disk);

extern void disk_flush_events(struct gendisk *disk, unsigned int mask);

extern void set_capacity_revalidate_and_notify(struct gendisk *disk,

			sector_t size, bool revalidate);

void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,

		bool update_bdev);

extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);



/* drivers/char/random.c */