3 files changed, 15 insertions, 10 deletions

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index d0fa9a0ddc8..04474556f2d 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -65,7 +65,7 @@ void fc_disc_stop_rports(struct fc_disc *disc)
         struct fc_lport *lport;
         struct fc_rport_priv *rdata;
 
-        lport = disc->lport;
+        lport = fc_disc_lport(disc);
 
         mutex_lock(&disc->disc_mutex);
         list_for_each_entry_rcu(rdata, &disc->rports, peers)
@@ -96,7 +96,7 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp,
         LIST_HEAD(disc_ports);
         struct fc_disc_port *dp, *next;
 
-        lport = disc->lport;
+        lport = fc_disc_lport(disc);
 
         FC_DISC_DBG(disc, "Received an RSCN event\n");
 
@@ -275,7 +275,7 @@ static void fc_disc_start(void (*disc_callback)(struct fc_lport *,
  */
 static void fc_disc_done(struct fc_disc *disc, enum fc_disc_event event)
 {
-        struct fc_lport *lport = disc->lport;
+        struct fc_lport *lport = fc_disc_lport(disc);
         struct fc_rport_priv *rdata;
 
         FC_DISC_DBG(disc, "Discovery complete\n");
@@ -313,7 +313,7 @@ static void fc_disc_done(struct fc_disc *disc, enum fc_disc_event event)
  */
 static void fc_disc_error(struct fc_disc *disc, struct fc_frame *fp)
 {
-        struct fc_lport *lport = disc->lport;
+        struct fc_lport *lport = fc_disc_lport(disc);
         unsigned long delay = 0;
 
         FC_DISC_DBG(disc, "Error %ld, retries %d/%d\n",
@@ -353,7 +353,7 @@ static void fc_disc_error(struct fc_disc *disc, struct fc_frame *fp)
 static void fc_disc_gpn_ft_req(struct fc_disc *disc)
 {
         struct fc_frame *fp;
-        struct fc_lport *lport = disc->lport;
+        struct fc_lport *lport = fc_disc_lport(disc);
 
         WARN_ON(!fc_lport_test_ready(lport));
 
@@ -396,7 +396,7 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len)
         struct fc_rport_identifiers ids;
         struct fc_rport_priv *rdata;
 
-        lport = disc->lport;
+        lport = fc_disc_lport(disc);
         disc->seq_count++;
 
         /*
@@ -733,7 +733,7 @@ int fc_disc_init(struct fc_lport *lport)
         mutex_init(&disc->disc_mutex);
         INIT_LIST_HEAD(&disc->rports);
 
-        disc->lport = lport;
+        disc->priv = lport;
 
         return 0;
 }
diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
index f5c0ca4b6ef..16d2162dda1 100644
--- a/drivers/scsi/libfc/fc_libfc.h
+++ b/drivers/scsi/libfc/fc_libfc.h
@@ -52,7 +52,7 @@ extern unsigned int fc_debug_logging;
 #define FC_DISC_DBG(disc, fmt, args...)                         \
         FC_CHECK_LOGGING(FC_DISC_LOGGING,                       \
                          printk(KERN_INFO "host%u: disc: " fmt, \
-                                (disc)->lport->host->host_no,   \
+                                fc_disc_lport(disc)->host->host_no,     \
                                 ##args))
 
 #define FC_RPORT_ID_DBG(lport, port_id, fmt, args...)                   \
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index fcbee8c38b0..5f64e593cca 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -739,7 +739,7 @@ struct libfc_function_template {
  * @buf_len:       Length of the discovery buffer
  * @disc_id:       Discovery ID
  * @rports:        List of discovered remote ports
- * @lport:         The local port that discovery is for
+ * @priv:          Private pointer for use by discovery code
  * @disc_mutex:    Mutex that protects the discovery context
  * @partial_buf:   Partial name buffer (if names are returned
  *                 in multiple frames)
@@ -755,7 +755,7 @@ struct fc_disc {
         u16                   disc_id;
 
         struct list_head      rports;
-        struct fc_lport       *lport;
+        void                  *priv;
         struct mutex          disc_mutex;
         struct fc_gpn_ft_resp partial_buf;
         struct delayed_work   disc_work;
@@ -1003,6 +1003,11 @@ void fc_rport_terminate_io(struct fc_rport *);
  *****************************/
 int fc_disc_init(struct fc_lport *);
 
+static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)
+{
+        return container_of(disc, struct fc_lport, disc);
+}
+
 /*
  * FCP LAYER
  *****************************/