Commit d1b7f920 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: sd: Call sd_revalidate_disk() for ioctl(BLKRRPART) 

While the disk state has nothing to do with partitions, BLKRRPART is used
to force a full revalidate after things like a disk format for historical
reasons. Restore that behavior.

Link: https://lore.kernel.org/r/20210617115504.1732350-1-hch@lst.de


Fixes: 471bd0af ("sd: use bdev_check_media_change")
Reported-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Tested-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7dd753ca

drivers/scsi/sd.c

+18 −4
Original line number Diff line number Diff line
@@ -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))

	if (sd_need_revalidate(bdev, sdkp))

		sd_revalidate_disk(bdev->bd_disk);

	}



	/*

	 * If the drive is empty, just let the open fail.