[SCSI] libfc: prepare to split off struct fc_rport_priv from fc_rport_libfc_priv

While the I/O and LLD interfaces use fc_rport_libfc_priv, the
disc and rport interfaces will use fc_rport_priv, which will
be separately allocated.

Change the disc and rport usage of fc_rport_libfc_priv to fc_rport_priv.

Use #define temporarily to make both names equivalent until a
subsequent patch splits them.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 9 insertions, 1 deletions

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 53b38814d38a..aa219514c96b 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -77,7 +77,7 @@ do {								\
 
 #define FC_RPORT_DBG(rport, fmt, args...)                               \
 do {                                                                    \
-        struct fc_rport_libfc_priv *rdata = rport->dd_data;             \
+        struct fc_rport_priv *rdata = rport->dd_data;                   \
         struct fc_lport *lport = rdata->local_port;                     \
         FC_RPORT_ID_DBG(lport, rport->port_id, fmt, ##args);            \
 } while (0)
@@ -177,6 +177,14 @@ enum fc_rport_event {
         RPORT_EV_LOGO
 };
 
+/*
+ * Temporary definition to prepare for split off from fc_rport_libfc_priv
+ * of a separately-allocated structure called fc_rport_priv.  This will
+ * be the primary object for the discovery and rport state machines.
+ * This definition is just to make this patch series easier to review.
+ */
+#define fc_rport_priv fc_rport_libfc_priv
+
 struct fc_rport_operations {
         void (*event_callback)(struct fc_lport *, struct fc_rport *,
                                enum fc_rport_event);