From d795b4e02d0eb7cff0c4b68f50370aae906b7a37 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen@vnet.ibm.com>
Date: Wed, 17 Nov 2010 14:23:40 +0100
Subject: [PATCH] --- yaml --- r: 223167 b: refs/heads/master c:
 5bfb2c31487eaff3840e02548e6acf89a048765b h: refs/heads/master i:   223165:
 53d2d51d66df11e2251cdf134401584017fbd6c7   223163:
 bbb35b6fb5b78281472c67f48fe6913e8019308c   223159:
 4703d1ea3a3a169df391ebea93ac6a827104687b   223151:
 c5e254f13b2206d5b9736440c158d0c8086fae1c   223135:
 573e910585cbe287ddd3fc4b86bab72da7b5a755   223103:
 eb98a01a1322ce3aa4646ffc5f58967b219bb24d v: v3

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

diff --git a/[refs] b/[refs]
index 7a72944473b2..93b6898f6f52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459dbf72e4d2b4aa13620e6b70d54f098547bf13
+refs/heads/master: 5bfb2c31487eaff3840e02548e6acf89a048765b
diff --git a/trunk/drivers/s390/scsi/zfcp_fsf.c b/trunk/drivers/s390/scsi/zfcp_fsf.c
index be0317457147..aa0cd2322738 100644
--- a/trunk/drivers/s390/scsi/zfcp_fsf.c
+++ b/trunk/drivers/s390/scsi/zfcp_fsf.c
@@ -2069,8 +2069,6 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
 	struct fcp_resp_with_ext *fcp_rsp;
 	unsigned long flags;
 
-	zfcp_fsf_fcp_handler_common(req);
-
 	read_lock_irqsave(&req->adapter->abort_lock, flags);
 
 	scpnt = req->data;
@@ -2079,6 +2077,8 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req)
 		return;
 	}
 
+	zfcp_fsf_fcp_handler_common(req);
+
 	if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
 		set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);
 		goto skip_fsfstatus;