Merge tag 'ceph-for-4.9-rc2' of git://github.com/ceph/ceph-client

[linux-2.6-block.git] / drivers / target / sbp / sbp_target.h

diff --git a/drivers/target/sbp/sbp_target.h b/drivers/target/sbp/sbp_target.h
index 6d0d74a2c54522cdbd277943c2a38291efd2c81a..73bcb12088322779ebcf8a325830859d2f29a672 100644 (file)
--- a/drivers/target/sbp/sbp_target.h
+++ b/drivers/target/sbp/sbp_target.h
@@ -125,7 +125,7 @@ struct sbp_login_descriptor {
        struct sbp_session *sess;
        struct list_head link;
 
-       struct se_lun *lun;
+       u32 login_lun;
 
        u64 status_fifo_addr;
        int exclusive;
@@ -151,15 +151,6 @@ struct sbp_session {
        u64 reconnect_expires;
 };
 
-struct sbp_nacl {
-       /* Initiator EUI-64 */
-       u64 guid;
-       /* ASCII formatted GUID for SBP Initiator port */
-       char iport_name[SBP_NAMELEN];
-       /* Returned by sbp_make_nodeacl() */
-       struct se_node_acl se_node_acl;
-};
-
 struct sbp_tpg {
        /* Target portal group tag for TCM */
        u16 tport_tpgt;