Commit 8acf608e authored May 20, 2019 by Martin K. Petersen

Revert "scsi: sd: Keep disk read-only when re-reading partition"



This reverts commit 20bd1d02.

This patch introduced regressions for devices that come online in
read-only state and subsequently switch to read-write.

Given how the partition code is currently implemented it is not
possible to persist the read-only flag across a device revalidate
call. This may need to get addressed in the future since it is common
for user applications to proactively call BLKRRPART.

Reverting this commit will re-introduce a regression where a
device-initiated revalidate event will cause the admin state to be
forgotten. A separate patch will address this issue.

Fixes: 20bd1d02 ("scsi: sd: Keep disk read-only when re-reading partition")
Cc: <stable@vger.kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent d0c0d902

drivers/scsi/sd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2603,7 +2603,6 @@ sd_read_write_protect_flag(struct scsi_disk sdkp, unsigned char buffer)
		int res;
		struct scsi_device *sdp = sdkp->device;
		struct scsi_mode_data data;
		int disk_ro = get_disk_ro(sdkp->disk);
		int old_wp = sdkp->write_prot;

		set_disk_ro(sdkp->disk, 0);
		@@ -2644,7 +2643,7 @@ sd_read_write_protect_flag(struct scsi_disk sdkp, unsigned char buffer)
		"Test WP failed, assume Write Enabled\n");
		} else {
		sdkp->write_prot = ((data.device_specific & 0x80) != 0);
		set_disk_ro(sdkp->disk, sdkp->write_prot \|\| disk_ro);
		set_disk_ro(sdkp->disk, sdkp->write_prot);
		if (sdkp->first_scan \|\| old_wp != sdkp->write_prot) {
		sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
		sdkp->write_prot ? "on" : "off");

Admin message