diff options
Diffstat (limited to 'drivers/s390/scsi/zfcp_fc.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_fc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 0f435ed9d1a0..ec700b3c2100 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
@@ -150,7 +150,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, | |||
150 | /* Try to connect to unused ports anyway. */ | 150 | /* Try to connect to unused ports anyway. */ |
151 | zfcp_erp_port_reopen(port, | 151 | zfcp_erp_port_reopen(port, |
152 | ZFCP_STATUS_COMMON_ERP_FAILED, | 152 | ZFCP_STATUS_COMMON_ERP_FAILED, |
153 | 82, fsf_req); | 153 | "fcirsc1", fsf_req); |
154 | else if ((port->d_id & range) == (elem->nport_did & range)) | 154 | else if ((port->d_id & range) == (elem->nport_did & range)) |
155 | /* Check connection status for connected ports */ | 155 | /* Check connection status for connected ports */ |
156 | zfcp_test_link(port); | 156 | zfcp_test_link(port); |
@@ -196,7 +196,7 @@ static void zfcp_fc_incoming_wwpn(struct zfcp_fsf_req *req, u64 wwpn) | |||
196 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); | 196 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); |
197 | 197 | ||
198 | if (port && (port->wwpn == wwpn)) | 198 | if (port && (port->wwpn == wwpn)) |
199 | zfcp_erp_port_forced_reopen(port, 0, 83, req); | 199 | zfcp_erp_port_forced_reopen(port, 0, "fciwwp1", req); |
200 | } | 200 | } |
201 | 201 | ||
202 | static void zfcp_fc_incoming_plogi(struct zfcp_fsf_req *req) | 202 | static void zfcp_fc_incoming_plogi(struct zfcp_fsf_req *req) |
@@ -374,7 +374,7 @@ static void zfcp_fc_adisc_handler(unsigned long data) | |||
374 | 374 | ||
375 | if (adisc->els.status) { | 375 | if (adisc->els.status) { |
376 | /* request rejected or timed out */ | 376 | /* request rejected or timed out */ |
377 | zfcp_erp_port_forced_reopen(port, 0, 63, NULL); | 377 | zfcp_erp_port_forced_reopen(port, 0, "fcadh_1", NULL); |
378 | goto out; | 378 | goto out; |
379 | } | 379 | } |
380 | 380 | ||
@@ -382,7 +382,7 @@ static void zfcp_fc_adisc_handler(unsigned long data) | |||
382 | port->wwnn = ls_adisc->wwnn; | 382 | port->wwnn = ls_adisc->wwnn; |
383 | 383 | ||
384 | if (port->wwpn != ls_adisc->wwpn) | 384 | if (port->wwpn != ls_adisc->wwpn) |
385 | zfcp_erp_port_reopen(port, 0, 64, NULL); | 385 | zfcp_erp_port_reopen(port, 0, "fcadh_2", NULL); |
386 | 386 | ||
387 | out: | 387 | out: |
388 | zfcp_port_put(port); | 388 | zfcp_port_put(port); |
@@ -434,7 +434,7 @@ void zfcp_fc_link_test_work(struct work_struct *work) | |||
434 | /* send of ADISC was not possible */ | 434 | /* send of ADISC was not possible */ |
435 | zfcp_port_put(port); | 435 | zfcp_port_put(port); |
436 | if (retval != -EBUSY) | 436 | if (retval != -EBUSY) |
437 | zfcp_erp_port_forced_reopen(port, 0, 65, NULL); | 437 | zfcp_erp_port_forced_reopen(port, 0, "fcltwk1", NULL); |
438 | } | 438 | } |
439 | 439 | ||
440 | /** | 440 | /** |
@@ -536,7 +536,7 @@ static void zfcp_validate_port(struct zfcp_port *port) | |||
536 | zfcp_port_put(port); | 536 | zfcp_port_put(port); |
537 | return; | 537 | return; |
538 | } | 538 | } |
539 | zfcp_erp_port_shutdown(port, 0, 151, NULL); | 539 | zfcp_erp_port_shutdown(port, 0, "fcpval1", NULL); |
540 | zfcp_erp_wait(adapter); | 540 | zfcp_erp_wait(adapter); |
541 | zfcp_port_put(port); | 541 | zfcp_port_put(port); |
542 | zfcp_port_dequeue(port); | 542 | zfcp_port_dequeue(port); |
@@ -599,7 +599,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft, int max_entries) | |||
599 | if (IS_ERR(port)) | 599 | if (IS_ERR(port)) |
600 | ret = PTR_ERR(port); | 600 | ret = PTR_ERR(port); |
601 | else | 601 | else |
602 | zfcp_erp_port_reopen(port, 0, 149, NULL); | 602 | zfcp_erp_port_reopen(port, 0, "fcegpf1", NULL); |
603 | } | 603 | } |
604 | 604 | ||
605 | zfcp_erp_wait(adapter); | 605 | zfcp_erp_wait(adapter); |