[SCSI] iscsi_transport: wait on session in error handler path

wait for session to come online in eh_device_reset_handler
and eh_target_reset_handler

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 821384147a41..5529b2a39741 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2020,6 +2020,11 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
         if (!ddb_entry)
                 return ret;
 
+        ret = iscsi_block_scsi_eh(cmd);
+        if (ret)
+                return ret;
+        ret = FAILED;
+
         ql4_printk(KERN_INFO, ha,
                    "scsi%ld:%d:%d:%d: DEVICE RESET ISSUED.\n", ha->host_no,
                    cmd->device->channel, cmd->device->id, cmd->device->lun);
@@ -2072,11 +2077,15 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
 {
         struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
         struct ddb_entry *ddb_entry = cmd->device->hostdata;
-        int stat;
+        int stat, ret;
 
         if (!ddb_entry)
                 return FAILED;
 
+        ret = iscsi_block_scsi_eh(cmd);
+        if (ret)
+                return ret;
+
         starget_printk(KERN_INFO, scsi_target(cmd->device),
                        "WARM TARGET RESET ISSUED.\n");