summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorMartin Petermann <martin.petermann@de.ibm.com>2008-11-04 16:35:11 +0100
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-11-05 18:47:40 +0100
commit7ea633ffad0bcb0b3e0deee81997d07f292e7f44 (patch)
tree275464a4401f1d9255160d4cfff31e6b41328349 /drivers/s390
parent[SCSI] zfcp: Wait for port scan to complete when setting adapter online (diff)
downloadlinux-7ea633ffad0bcb0b3e0deee81997d07f292e7f44.tar.xz
linux-7ea633ffad0bcb0b3e0deee81997d07f292e7f44.zip
[SCSI] zfcp: fix erp timeout cleanup for port open requests
If an open port fsf request times out (in erp) the corresponding erp_action member of the fsf request need to set to NULL. If the port structure will be removed later-on there will be still a reference in the fsf request to the non existing erp_action otherwise. Signed-off-by: Martin Petermann <martin.petermann@de.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_erp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 9040f738ff33..35364f64da7f 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -472,6 +472,7 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act)
ZFCP_STATUS_ERP_TIMEDOUT)) {
act->fsf_req->status |= ZFCP_STATUS_FSFREQ_DISMISSED;
zfcp_rec_dbf_event_action(142, act);
+ act->fsf_req->erp_action = NULL;
}
if (act->status & ZFCP_STATUS_ERP_TIMEDOUT)
zfcp_rec_dbf_event_action(143, act);