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

sd: open code revalidate_disk 



Instead of calling revalidate_disk just do the work directly by
calling sd_revalidate_disk, and revalidate_disk_size where needed.

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 b55d3d21

drivers/scsi/sd.c

+4 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ cache_type_store(struct device *dev, struct device_attribute *attr, 
			sd_print_sense_hdr(sdkp, &sshdr);

		return -EINVAL;

	}

	revalidate_disk(sdkp->disk);

	sd_revalidate_disk(sdkp->disk);

	return count;

}
@@ -1706,8 +1706,10 @@ 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;



	revalidate_disk(sdkp->disk);

	ret = sd_revalidate_disk(sdkp->disk);

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

}



static int sd_ioctl(struct block_device *bdev, fmode_t mode,