[SCSI] qla2xxx: Check return value of fc_block_scsi_eh()

The fc_block_scsi_eh() might return with status FAST_IO_FAIL
indicating I/O has been terminated due to fast_io_fail timeout.
In this case the rport is still blocked, so any error recovery
will be failing on this port. Hence we need to check if the
return value from fc_block_scsi_eh() is something other than 0,
in which case it should just return with that status.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 032d494da0db1acf6be3a9dddb17718688124843..110cac08121d01f3c578f20034257dadb0fffff1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -812,17 +812,20 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 {
        scsi_qla_host_t *vha = shost_priv(cmd->device->host);
        srb_t *sp;
-       int ret = SUCCESS;
+       int ret;
        unsigned int id, lun;
        unsigned long flags;
        int wait = 0;
        struct qla_hw_data *ha = vha->hw;
 
-       fc_block_scsi_eh(cmd);
-
        if (!CMD_SP(cmd))
                return SUCCESS;
 
+       ret = fc_block_scsi_eh(cmd);
+       if (ret != 0)
+               return ret;
+       ret = SUCCESS;
+
        id = cmd->device->id;
        lun = cmd->device->lun;
 
@@ -931,11 +934,13 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
        fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
        int err;
 
-       fc_block_scsi_eh(cmd);
-
        if (!fcport)
                return FAILED;
 
+       err = fc_block_scsi_eh(cmd);
+       if (err != 0)
+               return err;
+
        qla_printk(KERN_INFO, vha->hw, "scsi(%ld:%d:%d): %s RESET ISSUED.\n",
            vha->host_no, cmd->device->id, cmd->device->lun, name);
 
@@ -1009,14 +1014,17 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
        int ret = FAILED;
        unsigned int id, lun;
 
-       fc_block_scsi_eh(cmd);
-
        id = cmd->device->id;
        lun = cmd->device->lun;
 
        if (!fcport)
                return ret;
 
+       ret = fc_block_scsi_eh(cmd);
+       if (ret != 0)
+               return ret;
+       ret = FAILED;
+
        qla_printk(KERN_INFO, vha->hw,
            "scsi(%ld:%d:%d): BUS RESET ISSUED.\n", vha->host_no, id, lun);
 
@@ -1069,14 +1077,17 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
        unsigned int id, lun;
        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
-       fc_block_scsi_eh(cmd);
-
        id = cmd->device->id;
        lun = cmd->device->lun;
 
        if (!fcport)
                return ret;
 
+       ret = fc_block_scsi_eh(cmd);
+       if (ret != 0)
+               return ret;
+       ret = FAILED;
+
        qla_printk(KERN_INFO, ha,
            "scsi(%ld:%d:%d): ADAPTER RESET ISSUED.\n", vha->host_no, id, lun);