diff mbox

sd: Fixup capacity for standby ports

Message ID 1430127322-90474-1-git-send-email-hare@suse.de (mailing list archive)
State New, archived
Headers show

Commit Message

Hannes Reinecke April 27, 2015, 9:35 a.m. UTC 
If a target port is in ALUA 'standby' state it does not need
to respond to a 'READ CAPACITY' command. So fixup the initialization
for these cases.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/scsi/sd.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
diff mbox

Patch

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7178b05..62065a6 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1992,6 +1992,11 @@  static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
 			    sshdr.asc == 0x04 && sshdr.ascq == 0x0A)
 				/* ALUA state transition; always retry */
 				continue;
+			if (sense_valid &&
+			    sshdr.sense_key == NOT_READY &&
+			    sshdr.asc == 0x04 && sshdr.ascq == 0x0B)
+				/* Target port in standy state */
+				return 0;
 		}
 		retries--;
 
@@ -2079,6 +2084,11 @@  static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
 			    sshdr.asc == 0x04 && sshdr.ascq == 0x0A)
 				/* ALUA state transition; always retry */
 				continue;
+			if (sense_valid &&
+			    sshdr.sense_key == NOT_READY &&
+			    sshdr.asc == 0x04 && sshdr.ascq == 0x0B)
+				/* Target port in standy state */
+				return 0;
 		}
 		retries--;
 
@@ -2193,6 +2203,8 @@  got_data:
 		sector_size = 512;
 		sd_printk(KERN_NOTICE, sdkp, "Sector size 0 reported, "
 			  "assuming 512.\n");
+		if (!sdkp->physical_block_size)
+			sdkp->physical_block_size = sector_size;
 	}
 
 	if (sector_size != 512 &&