target: change core_tpg_register prototype

Remove the unneeded fabric_ptr argument, and change the type argument
to pass in a SPC protocol identifier.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 7 insertions, 11 deletions

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 9f8f5a1b527d..c462fb0a47f4 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -125,12 +125,6 @@ enum transport_lun_status_table {
         TRANSPORT_LUN_STATUS_ACTIVE = 1,
 };
 
-/* struct se_portal_group->se_tpg_type */
-enum transport_tpg_type_table {
-        TRANSPORT_TPG_TYPE_NORMAL = 0,
-        TRANSPORT_TPG_TYPE_DISCOVERY = 1,
-};
-
 /* Special transport agnostic struct se_cmd->t_states */
 enum transport_state_table {
         TRANSPORT_NO_STATE      = 0,
@@ -864,8 +858,12 @@ struct se_tpg_np {
 };
 
 struct se_portal_group {
-        /* Type of target portal group, see transport_tpg_type_table */
-        enum transport_tpg_type_table se_tpg_type;
+        /*
+         * PROTOCOL IDENTIFIER value per SPC4, 7.5.1.
+         *
+         * Negative values can be used by fabric drivers for internal use TPGs.
+         */
+        int                     proto_id;
         /* Number of ACLed Initiator Nodes for this TPG */
         u32                     num_node_acls;
         /* Used for PR SPEC_I_PT=1 and REGISTER_AND_MOVE */
@@ -875,8 +873,6 @@ struct se_portal_group {
         /* Spinlock for adding/removing sessions */
         spinlock_t              session_lock;
         spinlock_t              tpg_lun_lock;
-        /* Pointer to $FABRIC_MOD portal group */
-        void                    *se_tpg_fabric_ptr;
         struct list_head        se_tpg_node;
         /* linked list for initiator ACL list */
         struct list_head        acl_node_list;
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index e5414744bf2d..e0adc141de07 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -175,7 +175,7 @@ int	core_tpg_set_initiator_node_queue_depth(struct se_portal_group *,
 int     core_tpg_set_initiator_node_tag(struct se_portal_group *,
                 struct se_node_acl *, const char *);
 int     core_tpg_register(const struct target_core_fabric_ops *,
-                struct se_wwn *, struct se_portal_group *, void *, int);
+                struct se_wwn *, struct se_portal_group *, int);
 int     core_tpg_deregister(struct se_portal_group *);
 
 /* SAS helpers */