diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-12 21:27:23 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-12 21:27:23 -0400 |
| commit | 17631462cd49f3dfa9db38a9e578c59f71ccf414 (patch) | |
| tree | 0e44caf23bacf31cea3b414132db94ba92bd7e34 /drivers/s390/scsi/zfcp_scsi.c | |
| parent | scsi: target/iscsi: Make sure PDU processing continues if parsing a command fails (diff) | |
| parent | scsi: csiostor: fix missing data copy in csio_scsi_err_handler() (diff) | |
| download | linux-dev-17631462cd49f3dfa9db38a9e578c59f71ccf414.tar.xz linux-dev-17631462cd49f3dfa9db38a9e578c59f71ccf414.zip | |
Merge branch '5.1/scsi-fixes' into 5.2/merge
We have a few submissions for 5.2 that depend on fixes merged post
5.1-rc1. Merge the fixes branch into queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_scsi.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_scsi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index f4f6a07c5222..221d0dfb8493 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c @@ -368,6 +368,10 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt) struct zfcp_adapter *adapter = zfcp_sdev->port->adapter; int ret = SUCCESS, fc_ret; + if (!(adapter->connection_features & FSF_FEATURE_NPIV_MODE)) { + zfcp_erp_port_forced_reopen_all(adapter, 0, "schrh_p"); + zfcp_erp_wait(adapter); + } zfcp_erp_adapter_reopen(adapter, 0, "schrh_1"); zfcp_erp_wait(adapter); fc_ret = fc_block_scsi_eh(scpnt); |