sd: call sd_revalidate_disk ioctl(BLKRRPART)
PATCH 1/1 sd: call sd_revalidate_disk ioctl(BLKRRPART)
While the disk state has nothing to do with partitions, BLKRRPART is used to force a full revalidate after things like a format for historical reasons. Restore that behavior.
Fixes 471bd0af544b ("sd: use bdev_check_media_change")
Reported-by Xiang Chen <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
Tested-by Xiang Chen <[email protected]>
--- drivers/scsi/sd.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/scsi/sd.c +18 -4
@@ -1387,6 +1387,22 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt) } } +static bool sd_need_revalidate (struct block_device *bdev, +struct scsi_disk *sdkp) +{ +if (sdkp->device->removable || sdkp->write_prot) { +if (bdev_check_media_change (bdev)) +return true; + } + +/* +* Force a full rescan after ioctl(BLKRRPART). While the disk state has +* nothing to do with partitions, BLKRRPART is used to force a full +* revalidate after things like a format for historical reasons. +*/ +return test_bit (GD_NEED_PART_SCAN , &bdev->bd_disk->state); +} +/** * sd_open - open a scsi disk device * @bdev: Block device of the scsi disk to open
@@ -1423,10 +1439,8 @@ static int sd_open(struct block_device *bdev, fmode_t mode)if (!scsi_block_when_processing_errors (sdev)) goto error_out; -if (sdev->removable || sdkp->write_prot) { -if (bdev_check_media_change (bdev)) -sd_revalidate_disk (bdev->bd_disk); - } +if (sd_need_revalidate (bdev, sdkp)) +sd_revalidate_disk (bdev->bd_disk);/* * If the drive is empty, just let the open fail.
Signature · 1 line
2.30.2