From d94c42df7beff5047026ee18fb733b1b544f6e53 Mon Sep 17 00:00:00 2001
From: Robert Love <robert.w.love@intel.com>
Date: Mon, 25 Mar 2013 11:00:27 -0700
Subject: [PATCH] --- yaml --- r: 362079 b: refs/heads/master c:
 8a9a71381208b2364a2d12b0d257ae333917a1bc h: refs/heads/master i:   362077:
 fb96d353c7f1c7cb2ce419a97d1582cb16418bd9   362075:
 6d01a148fa950a598b2d6f4dca34e262882d17c5   362071:
 787614f8e79d0c1f803e0e2c3afe01cd865792e4   362063:
 44e5b83998c54a4efae2a3e452e0495a4d7d71ab   362047:
 52bc94ba5405f263cf3fd6d5c07ea71389fcca9a v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c |  2 +-
 trunk/drivers/scsi/fcoe/fcoe_ctlr.c     | 11 ++++++-----
 trunk/drivers/scsi/libfc/fc_disc.c      |  5 +++--
 trunk/include/scsi/libfc.h              |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 78994736c6e9..c4e957362051 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c4358edb285cead00a0d6cf0644c84ee773026
+refs/heads/master: 8a9a71381208b2364a2d12b0d257ae333917a1bc
diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index cc4791cf575b..b867b1bfa908 100644
--- a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -939,7 +939,7 @@ static int bnx2fc_libfc_config(struct fc_lport *lport)
 	fc_elsct_init(lport);
 	fc_exch_init(lport);
 	fc_rport_init(lport);
-	fc_disc_init(lport);
+	fc_disc_init(lport, lport);
 	return 0;
 }
 
diff --git a/trunk/drivers/scsi/fcoe/fcoe_ctlr.c b/trunk/drivers/scsi/fcoe/fcoe_ctlr.c
index 08c3bc398da2..ba2f977a6e1d 100644
--- a/trunk/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/trunk/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -2826,6 +2826,8 @@ static void fcoe_ctlr_vn_timeout(struct fcoe_ctlr *fip)
 int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
 		      const struct libfc_function_template *tt, int init_fcp)
 {
+	void *priv = lport;
+
 	/* Set the function pointers set by the LLDD */
 	memcpy(&lport->tt, tt, sizeof(*tt));
 	if (init_fcp && fc_fcp_init(lport))
@@ -2842,12 +2844,11 @@ int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
 		lport->tt.disc_start = fcoe_ctlr_disc_start;
 		lport->tt.disc_stop = fcoe_ctlr_disc_stop;
 		lport->tt.disc_stop_final = fcoe_ctlr_disc_stop_final;
-		mutex_init(&lport->disc.disc_mutex);
-		INIT_LIST_HEAD(&lport->disc.rports);
-		lport->disc.priv = fip;
-	} else {
-		fc_disc_init(lport);
+		priv = fip;
 	}
+
+	fc_disc_init(lport, priv);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(fcoe_libfc_config);
diff --git a/trunk/drivers/scsi/libfc/fc_disc.c b/trunk/drivers/scsi/libfc/fc_disc.c
index 8e561e6a557c..141c54b97082 100644
--- a/trunk/drivers/scsi/libfc/fc_disc.c
+++ b/trunk/drivers/scsi/libfc/fc_disc.c
@@ -714,8 +714,9 @@ static void fc_disc_stop_final(struct fc_lport *lport)
 /**
  * fc_disc_init() - Initialize the discovery layer for a local port
  * @lport: The local port that needs the discovery layer to be initialized
+ * @priv: Private data structre for users of the discovery layer
  */
-int fc_disc_init(struct fc_lport *lport)
+int fc_disc_init(struct fc_lport *lport, void *priv)
 {
 	struct fc_disc *disc;
 
@@ -736,7 +737,7 @@ int fc_disc_init(struct fc_lport *lport)
 	mutex_init(&disc->disc_mutex);
 	INIT_LIST_HEAD(&disc->rports);
 
-	disc->priv = lport;
+	disc->priv = priv;
 
 	return 0;
 }
diff --git a/trunk/include/scsi/libfc.h b/trunk/include/scsi/libfc.h
index 399162b50a8d..add2a498bd44 100644
--- a/trunk/include/scsi/libfc.h
+++ b/trunk/include/scsi/libfc.h
@@ -1074,7 +1074,7 @@ void fc_rport_terminate_io(struct fc_rport *);
 /*
  * DISCOVERY LAYER
  *****************************/
-int fc_disc_init(struct fc_lport *);
+int fc_disc_init(struct fc_lport *, void *);
 
 static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
 {