Skip to content

Commit f76ccaa

Browse files
Daniel HanselJames Bottomley
authored andcommitted
[SCSI] zfcp: fix adapter (re)open recovery while link to SAN is down
FCP device remains in status ERP_FAILED when device is switched online or adapter recovery is triggered while link to SAN is down. When Exchange Configuration Data command returns the FSF status FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE it aborts the exchange process. The only retries are done during the common error recovery procedure (i.e. max. 3 retries with 8sec sleep between) and remains in status ERP_FAILED with QDIO down. This commit reverts the commit 0df1384 (zfcp: Fix adapter activation on link down). When FSF status FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE is received the adapter recovery will be finished without any retries. QDIO will be up now and status changes such as LINK UP will be received now. Signed-off-by: Daniel Hansel <[email protected]> Signed-off-by: Steffen Maier <[email protected]> Cc: <[email protected]> #2.6.37+ Signed-off-by: James Bottomley <[email protected]>
1 parent bd32386 commit f76ccaa

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/s390/scsi/zfcp_fsf.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,10 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
563563
fc_host_port_type(shost) = FC_PORTTYPE_UNKNOWN;
564564
adapter->hydra_version = 0;
565565

566+
/* avoids adapter shutdown to be able to recognize
567+
* events such as LINK UP */
568+
atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
569+
&adapter->status);
566570
zfcp_fsf_link_down_info_eval(req,
567571
&qtcb->header.fsf_status_qual.link_down_info);
568572
break;

0 commit comments

Comments
 (0)