summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJoe Eykholt <jeykholt@cisco.com>2009-08-25 14:00:34 -0700
committerJames Bottomley <James.Bottomley@suse.de>2009-09-10 12:07:39 -0500
commitab28f1fd3b0d14c1bd693e640decd711d5e6642a (patch)
tree3d7b051d7ab8b6d7fb7d936f95e336bf25f26832 /include/scsi
parent090eb6c41aa74273d3f0721637cff738cfd80669 (diff)
downloadop-kernel-dev-ab28f1fd3b0d14c1bd693e640decd711d5e6642a.zip
op-kernel-dev-ab28f1fd3b0d14c1bd693e640decd711d5e6642a.tar.gz
[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>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/libfc.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 53b3881..aa21951 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);
OpenPOWER on IntegriCloud