summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorSwen Schillig2009-04-17 15:08:10 +0200
committerJames Bottomley2009-04-27 17:07:32 +0200
commit5b43e719308143ac02e6f4ee24132f8acad99ea7 (patch)
tree34a015635a6527696bc086a86282b32e2ac266da /drivers/s390
parent[SCSI] zfcp: Let actcli handle control file errors (diff)
downloadkernel-qcow2-linux-5b43e719308143ac02e6f4ee24132f8acad99ea7.tar.gz
kernel-qcow2-linux-5b43e719308143ac02e6f4ee24132f8acad99ea7.tar.xz
kernel-qcow2-linux-5b43e719308143ac02e6f4ee24132f8acad99ea7.zip
[SCSI] zfcp: no port recovery after ADISC request timeout
A remote port remains in error state even if we receive a RSCN stating that the connection is re-established. The port recovery is not started due to a flag which is not reset. The solution is to clear the flag in question before we trigger a ERP. Signed-off-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_fc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index a0f925013acf..db409684e06f 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -373,7 +373,8 @@ static void zfcp_fc_adisc_handler(unsigned long data)
if (adisc->els.status) {
/* request rejected or timed out */
- zfcp_erp_port_forced_reopen(port, 0, "fcadh_1", NULL);
+ zfcp_erp_port_forced_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
+ "fcadh_1", NULL);
goto out;
}