From: Andreas Herrmann <aherrman@de.ibm.com>
Date: Sat, 11 Feb 2006 00:43:55 +0000 (+0100)
Subject: [SCSI] zfcp: fix: avoid race between fc_remote_port_add and scsi_add_device
X-Git-Tag: v2.6.16-rc4~41^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c41823c50302ca6cd455c48a1395f944c61f8f;p=linux-2.6

[SCSI] zfcp: fix: avoid race between fc_remote_port_add and scsi_add_device

Flush workqueue of a scsi host after a remote port for that host
is registered at the fc transport class. Otherwise immediate
registration of a scsi device on that host is racy.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 8ed6fcb416..e3c4bdd29a 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -3415,6 +3415,8 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,
 						"(adapter %s, wwpn=0x%016Lx)\n",
 						zfcp_get_busid_by_port(port),
 						port->wwpn);
+			else
+				scsi_flush_work(adapter->scsi_host);
 		}
 		zfcp_port_put(port);
 		break;