From 0b7f98c191cbdb51d8712503c845e094498fde2a Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 24 Nov 2009 16:54:16 +0100 Subject: [PATCH] --- yaml --- r: 173759 b: refs/heads/master c: af4de36d911ab907b92c5f3f81ceff8474ed7485 h: refs/heads/master i: 173757: 2596e176f05b863fba17e0585eecb98aff2679f8 173755: ae7e83c072778f8cc7b48f760a032f75294e591c 173751: 281fc3dd39e9113d9b3b1aad9c6662045e766915 173743: 990200aff1658f22918b2086f549a56a60e16e8e 173727: 459cdd33f16c1f3043b197c144ed32611aa7268b 173695: 61e77752919210d792ee2e8056e2af8bfd3e0517 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_scsi.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad41971ae258..4b7bc5654d7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c571c659e9d41332b6981ca5379047681ce9d2f +refs/heads/master: af4de36d911ab907b92c5f3f81ceff8474ed7485 diff --git a/trunk/drivers/s390/scsi/zfcp_scsi.c b/trunk/drivers/s390/scsi/zfcp_scsi.c index 535f36cf2819..3f1011663af5 100644 --- a/trunk/drivers/s390/scsi/zfcp_scsi.c +++ b/trunk/drivers/s390/scsi/zfcp_scsi.c @@ -209,6 +209,7 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) break; zfcp_erp_wait(adapter); + fc_block_scsi_eh(scpnt); if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_RUNNING)) { zfcp_dbf_scsi_abort("nres", adapter->dbf, scpnt, NULL, @@ -248,6 +249,7 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags) break; zfcp_erp_wait(adapter); + fc_block_scsi_eh(scpnt); if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_RUNNING)) { zfcp_dbf_scsi_devreset("nres", tm_flags, unit, scpnt); @@ -289,6 +291,7 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt) zfcp_erp_adapter_reopen(adapter, 0, "schrh_1", scpnt); zfcp_erp_wait(adapter); + fc_block_scsi_eh(scpnt); return SUCCESS; }