From c4b720647c36660e14bb858ee4a48894cda50d1a Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 19 May 2013 16:56:42 +0000
Subject: [PATCH] fcst: Move the ft_prov data structure

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4864 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/fcst.h    | 10 +---------
 fcst/ft_scst.c | 10 ----------
 fcst/ft_sess.c | 12 +++++++++++-
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/fcst/fcst.h b/fcst/fcst.h
index eff25a838..6425e6026 100644
--- a/fcst/fcst.h
+++ b/fcst/fcst.h
@@ -112,15 +112,7 @@ extern struct scst_tgt_template ft_scst_template;
 /*
  * libfc interface.
  */
-int ft_prli(struct fc_rport_priv *, u32 spp_len,
-	    const struct fc_els_spp *, struct fc_els_spp *);
-void ft_prlo(struct fc_rport_priv *);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) \
-	&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
-void ft_recv(struct fc_lport *, struct fc_seq *, struct fc_frame *);
-#else
-void ft_recv(struct fc_lport *, struct fc_frame *);
-#endif
+extern struct fc4_prov ft_prov;
 
 /*
  * SCST interface.
diff --git a/fcst/ft_scst.c b/fcst/ft_scst.c
index fc6d5b8a3..115c3d2b3 100644
--- a/fcst/ft_scst.c
+++ b/fcst/ft_scst.c
@@ -31,16 +31,6 @@ MODULE_PARM_DESC(debug_logging, "log levels bigmask");
 
 DEFINE_MUTEX(ft_lport_lock);
 
-/*
- * Provider ops for libfc.
- */
-static struct fc4_prov ft_prov = {
-	.prli = ft_prli,
-	.prlo = ft_prlo,
-	.recv = ft_recv,
-	.module = THIS_MODULE,
-};
-
 static struct notifier_block ft_notifier = {
 	.notifier_call = ft_lport_notify
 };
diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c
index df2ede540..eab7d7617 100644
--- a/fcst/ft_sess.c
+++ b/fcst/ft_sess.c
@@ -482,7 +482,7 @@ static struct ft_sess *ft_sess_lookup_delete(struct fc_rport_priv *rdata)
 /*
  * Handle PRLO.
  */
-void ft_prlo(struct fc_rport_priv *rdata)
+static void ft_prlo(struct fc_rport_priv *rdata)
 {
 	struct ft_sess *sess;
 
@@ -620,3 +620,13 @@ int ft_report_aen(struct scst_aen *aen)
 		    aen->event_fn, sess->port_id, scst_aen_get_lun(aen));
 	return SCST_AEN_RES_FAILED;	/* XXX TBD */
 }
+
+/*
+ * Provider ops for libfc.
+ */
+struct fc4_prov ft_prov = {
+	.prli = ft_prli,
+	.prlo = ft_prlo,
+	.recv = ft_recv,
+	.module = THIS_MODULE,
+};