- patches.fixes/scsi-update-fc_block_scsi_eh: Device offlined
while array is momentarily unavailable (bnc#613330).
suse-commit: ab50bb10700cf1c5951a6359dc665c6c10644d3d
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 474e52f..c30a089 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -215,7 +215,7 @@
zfcp_erp_wait(adapter);
ret = fc_block_scsi_eh(scpnt);
- if (ret)
+ if (ret != SUCCESS)
return ret;
if (!(atomic_read(&adapter->status) &
ZFCP_STATUS_COMMON_RUNNING)) {
@@ -257,7 +257,7 @@
zfcp_erp_wait(adapter);
ret = fc_block_scsi_eh(scpnt);
- if (ret)
+ if (ret != SUCCESS)
return ret;
if (!(atomic_read(&adapter->status) &
@@ -302,11 +302,7 @@
zfcp_erp_adapter_reopen(adapter, 0, "schrh_1", scpnt);
zfcp_erp_wait(adapter);
- ret = fc_block_scsi_eh(scpnt);
- if (ret)
- return ret;
-
- return SUCCESS;
+ return fc_block_scsi_eh(scpnt);
}
int zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 37150e8..ffc6988 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1243,7 +1243,9 @@
DECLARE_COMPLETION_ONSTACK(tm_done);
/* Wait for rport to unblock */
- fc_block_scsi_eh(sc);
+ ret = fc_block_scsi_eh(sc);
+ if (ret != SUCCESS)
+ return ret;
/* Get local-port, check ready and link up */
lp = shost_priv(sc->device->host);
@@ -1519,13 +1521,15 @@
struct fnic_io_req *io_req;
struct fc_rport *rport;
int status;
- int ret = FAILED;
+ int ret;
spinlock_t *io_lock;
unsigned long flags;
DECLARE_COMPLETION_ONSTACK(tm_done);
/* Wait for rport to unblock */
- fc_block_scsi_eh(sc);
+ ret = fc_block_scsi_eh(sc);
+ if (ret != SUCCESS)
+ return ret;
/* Get local-port, check ready and link up */
lp = shost_priv(sc->device->host);
@@ -1537,7 +1541,7 @@
(starget_to_rport(scsi_target(sc->device)))->port_id,
sc->device->lun);
-
+ ret = FAILED;
if (lp->state != LPORT_ST_READY || !(lp->link_up))
goto fnic_device_reset_end;
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index a4881f2..df48f52 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -2989,7 +2989,10 @@
int ret = SUCCESS;
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
- fc_block_scsi_eh(cmnd);
+ ret = fc_block_scsi_eh(cmnd);
+ if (ret != SUCCESS)
+ return ret;
+
lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble;
BUG_ON(!lpfc_cmd);
@@ -3305,7 +3308,9 @@
return FAILED;
}
pnode = rdata->pnode;
- fc_block_scsi_eh(cmnd);
+ status = fc_block_scsi_eh(cmnd);
+ if (status != SUCCESS)
+ return status;
status = lpfc_chk_tgt_mapped(vport, cmnd);
if (status == FAILED) {
@@ -3370,7 +3375,9 @@
return FAILED;
}
pnode = rdata->pnode;
- fc_block_scsi_eh(cmnd);
+ status = fc_block_scsi_eh(cmnd);
+ if (status != SUCCESS)
+ return status;
status = lpfc_chk_tgt_mapped(vport, cmnd);
if (status == FAILED) {
@@ -3427,6 +3434,10 @@
int match;
int ret = SUCCESS, status, i;
+ ret = fc_block_scsi_eh(cmnd);
+ if (ret != SUCCESS)
+ return ret;
+
scsi_event.event_type = FC_REG_SCSI_EVENT;
scsi_event.subcategory = LPFC_EVENT_BUSRESET;
scsi_event.lun = 0;
@@ -3436,8 +3447,6 @@
fc_host_post_vendor_event(shost, fc_get_event_number(),
sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID);
- fc_block_scsi_eh(cmnd);
-
/*
* Since the driver manages a single bus device, reset all
* targets known to the driver. Should any target reset
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a6b1bd0..98fa59e 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -783,12 +783,12 @@
srb_t *spt;
int got_ref = 0;
- fc_block_scsi_eh(cmd);
-
if (!CMD_SP(cmd))
return SUCCESS;
- ret = SUCCESS;
+ ret = fc_block_scsi_eh(cmd);
+ if (ret != SUCCESS)
+ return ret;
id = cmd->device->id;
lun = cmd->device->lun;
@@ -921,7 +921,9 @@
fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
int err;
- fc_block_scsi_eh(cmd);
+ err = fc_block_scsi_eh(cmd);
+ if (err != SUCCESS)
+ return err;
if (!fcport)
return FAILED;
@@ -996,17 +998,21 @@
{
scsi_qla_host_t *vha = shost_priv(cmd->device->host);
fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
- int ret = FAILED;
+ int ret;
unsigned int id, lun;
unsigned long serial;
srb_t *sp = (srb_t *) CMD_SP(cmd);
- fc_block_scsi_eh(cmd);
+ ret = fc_block_scsi_eh(cmd);
+ if (ret != SUCCESS)
+ return ret;
id = cmd->device->id;
lun = cmd->device->lun;
serial = cmd->serial_number;
+ ret = FAILED;
+
if (!fcport)
return ret;
@@ -1058,18 +1064,22 @@
scsi_qla_host_t *vha = shost_priv(cmd->device->host);
fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
struct qla_hw_data *ha = vha->hw;
- int ret = FAILED;
+ int ret;
unsigned int id, lun;
unsigned long serial;
srb_t *sp = (srb_t *) CMD_SP(cmd);
scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
- fc_block_scsi_eh(cmd);
+ ret = fc_block_scsi_eh(cmd);
+ if (ret != SUCCESS)
+ return ret;
id = cmd->device->id;
lun = cmd->device->lun;
serial = cmd->serial_number;
+ ret = FAILED;
+
if (!fcport)
return ret;
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 3310e9e..1113c6fc 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3200,7 +3200,7 @@
* necessary to avoid the scsi_eh failing recovery actions for blocked
* rports which would lead to offlined SCSI devices.
*
- * Returns: 0 if the fc_rport left the state FC_PORTSTATE_BLOCKED.
+ * Returns: SUCCESS if the fc_rport left the state FC_PORTSTATE_BLOCKED.
* FAST_IO_FAIL if the fast_io_fail_tmo fired, this should be
* passed back to scsi_eh.
*/
@@ -3222,7 +3222,7 @@
if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT)
return FAST_IO_FAIL;
- return 0;
+ return SUCCESS;
}
EXPORT_SYMBOL(fc_block_scsi_eh);
