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

sd: update the bdev size in sd_revalidate_disk 



This avoids the extra call to revalidate_disk_size in sd_rescan and
is otherwise a no-op because the size did not change, or we are in
the probe path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5dd55749

drivers/scsi/sd.c

+3 −5
Original line number Diff line number Diff line
@@ -1748,10 +1748,8 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr) 
static void sd_rescan(struct device *dev)

{

	struct scsi_disk *sdkp = dev_get_drvdata(dev);

	int ret;



	ret = sd_revalidate_disk(sdkp->disk);

	revalidate_disk_size(sdkp->disk, ret == 0);

	sd_revalidate_disk(sdkp->disk);

}



static int sd_ioctl(struct block_device *bdev, fmode_t mode,
@@ -3264,7 +3262,7 @@ static int sd_revalidate_disk(struct gendisk *disk) 
	sdkp->first_scan = 0;



	set_capacity_revalidate_and_notify(disk,

		logical_to_sectors(sdp, sdkp->capacity), false);

		logical_to_sectors(sdp, sdkp->capacity), true);

	sd_config_write_same(sdkp);

	kfree(buffer);
@@ -3274,7 +3272,7 @@ static int sd_revalidate_disk(struct gendisk *disk) 
	 * capacity to 0.

	 */

	if (sd_zbc_revalidate_zones(sdkp))

		set_capacity_revalidate_and_notify(disk, 0, false);

		set_capacity_revalidate_and_notify(disk, 0, true);



 out:

	return 0;