Преглед изворни кода

[SCSI] zfcp: Fix retry after failed "open port" erp action

Trying to enqueue a port erp action from the port erp strategy will
fail in zfcp_erp_required_act. To try the same action again, return
ZFCP_ERP_FAILED.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Christof Schmitt пре 15 година
родитељ
комит
f7bd7c3627
1 измењених фајлова са 1 додато и 2 уклоњено
  1. 1 2
      drivers/s390/scsi/zfcp_erp.c

+ 1 - 2
drivers/s390/scsi/zfcp_erp.c

@@ -897,8 +897,7 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 		}
 		}
 		if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
 		if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
 			port->d_id = 0;
 			port->d_id = 0;
-			_zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);
-			return ZFCP_ERP_EXIT;
+			return ZFCP_ERP_FAILED;
 		}
 		}
 		/* fall through otherwise */
 		/* fall through otherwise */
 	}
 	}