From 14a9a7a39d52ec56773aabcbd534137b39038e02 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 19 May 2013 16:27:18 +0000
Subject: [PATCH] fcst: Move an fr_seq() call to minimize diffs with upstream

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4858 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/ft_cmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index 320499ebf..135505881 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -428,7 +428,6 @@ static void ft_send_resp_status(struct fc_frame *rx_fp, u32 status,
 	struct fc_exch *ep;
 #endif
 
-	sp = fr_seq(rx_fp);
 	fh = fc_frame_header_get(rx_fp);
 	FT_IO_DBG("FCP error response: did %x oxid %x status %x code %x\n",
 		  ntoh24(fh->fh_s_id), ntohs(fh->fh_ox_id), status, code);
@@ -454,6 +453,7 @@ static void ft_send_resp_status(struct fc_frame *rx_fp, u32 status,
 	}
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+	sp = fr_seq(rx_fp);
 	sp = lport->tt.seq_start_next(sp);
 	ep = fc_seq_exch(sp);
 	fc_fill_fc_hdr(fp, FC_RCTL_DD_CMD_STATUS, ep->did, ep->sid, FC_TYPE_FCP,
@@ -464,6 +464,7 @@ out:
 	lport->tt.exch_done(sp);
 #else
 	fc_fill_reply_hdr(fp, rx_fp, FC_RCTL_DD_CMD_STATUS, 0);
+	sp = fr_seq(rx_fp);
 	if (sp)
 		lport->tt.seq_send(lport, sp, fp);
 	else