If a target port is in ALUA 'standby' or 'transitioning' state it
might not need to respond to a 'READ CAPACITY' command. So fixup
the initialization for these cases.

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

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3b2fcb4..03fdfa9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1981,6 +1981,16 @@ static int read_capacity_16(struct scsi_disk *sdkp, 
struct scsi_device *sdp,
                                 * give it one more chance */
                                if (--reset_retries > 0)
                                        continue;
+                       if (sense_valid &&
+                           sshdr.sense_key == NOT_READY &&
+                           sshdr.asc == 0x04 && sshdr.ascq == 0x0a)
+                               /* Target port in transition */
+                               return 0;
+                       if (sense_valid &&
+                           sshdr.sense_key == NOT_READY &&
+                           sshdr.asc == 0x04 && sshdr.ascq == 0x0b)
+                               /* Target port in standy state */
+                               return 0;
                }
                retries--;
 
@@ -2063,6 +2073,16 @@ static int read_capacity_10(struct scsi_disk *sdkp, 
struct scsi_device *sdp,
                                 * give it one more chance */
                                if (--reset_retries > 0)
                                        continue;
+                       if (sense_valid &&
+                           sshdr.sense_key == NOT_READY &&
+                           sshdr.asc == 0x04 && sshdr.ascq == 0x0a)
+                               /* Target port in transition */
+                               return 0;
+                       if (sense_valid &&
+                           sshdr.sense_key == NOT_READY &&
+                           sshdr.asc == 0x04 && sshdr.ascq == 0x0b)
+                               /* Target port in standy state */
+                               return 0;
                }
                retries--;
 
@@ -2177,6 +2197,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 &&
-- 
1.8.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to