|
@@ -821,11 +821,6 @@ static int zfcp_erp_port_forced_strategy_close(struct zfcp_erp_action *act)
|
|
return ZFCP_ERP_CONTINUES;
|
|
return ZFCP_ERP_CONTINUES;
|
|
}
|
|
}
|
|
|
|
|
|
-static void zfcp_erp_port_strategy_clearstati(struct zfcp_port *port)
|
|
|
|
-{
|
|
|
|
- atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED, &port->status);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static int zfcp_erp_port_forced_strategy(struct zfcp_erp_action *erp_action)
|
|
static int zfcp_erp_port_forced_strategy(struct zfcp_erp_action *erp_action)
|
|
{
|
|
{
|
|
struct zfcp_port *port = erp_action->port;
|
|
struct zfcp_port *port = erp_action->port;
|
|
@@ -833,7 +828,6 @@ static int zfcp_erp_port_forced_strategy(struct zfcp_erp_action *erp_action)
|
|
|
|
|
|
switch (erp_action->step) {
|
|
switch (erp_action->step) {
|
|
case ZFCP_ERP_STEP_UNINITIALIZED:
|
|
case ZFCP_ERP_STEP_UNINITIALIZED:
|
|
- zfcp_erp_port_strategy_clearstati(port);
|
|
|
|
if ((status & ZFCP_STATUS_PORT_PHYS_OPEN) &&
|
|
if ((status & ZFCP_STATUS_PORT_PHYS_OPEN) &&
|
|
(status & ZFCP_STATUS_COMMON_OPEN))
|
|
(status & ZFCP_STATUS_COMMON_OPEN))
|
|
return zfcp_erp_port_forced_strategy_close(erp_action);
|
|
return zfcp_erp_port_forced_strategy_close(erp_action);
|
|
@@ -933,7 +927,6 @@ static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)
|
|
|
|
|
|
switch (erp_action->step) {
|
|
switch (erp_action->step) {
|
|
case ZFCP_ERP_STEP_UNINITIALIZED:
|
|
case ZFCP_ERP_STEP_UNINITIALIZED:
|
|
- zfcp_erp_port_strategy_clearstati(port);
|
|
|
|
if (p_status & ZFCP_STATUS_COMMON_OPEN)
|
|
if (p_status & ZFCP_STATUS_COMMON_OPEN)
|
|
return zfcp_erp_port_strategy_close(erp_action);
|
|
return zfcp_erp_port_strategy_close(erp_action);
|
|
break;
|
|
break;
|