From 779b6d31e47c389188dfaf637c431bc01c726c6b Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Fri, 15 Aug 2008 10:59:22 -0500
Subject: [PATCH] --- yaml --- r: 108894 b: refs/heads/master c:
 915be024414c52e311f795566ac938223ba3c847 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ebde23491b07..33f24c3c5fc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eddc569770a76f2ca65621cdde3c0a2552b5b0c
+refs/heads/master: 915be024414c52e311f795566ac938223ba3c847
diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
index ee11568d581f..406ab27f80e9 100644
--- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -3602,8 +3602,9 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
 			}
 		}
 
-		if (vhost->reinit) {
+		if (vhost->reinit && !ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) {
 			vhost->reinit = 0;
+			scsi_block_requests(vhost->host);
 			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY);
 		} else {
 			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE);