target: kill struct se_subsystem_dev

Simplify the code a lot by killing the superflous struct se_subsystem_dev.
Instead se_device is allocated early on by the backend driver, which allocates
it as part of its own per-device structure, borrowing the scheme that is for
example used for inode allocation.

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

26 files changed, 1049 insertions, 1909 deletions

diff --git a/drivers/target/loopback/tcm_loop.h b/drivers/target/loopback/tcm_loop.h
index 7b54893db665..dd7a84ee78e1 100644
--- a/drivers/target/loopback/tcm_loop.h
+++ b/drivers/target/loopback/tcm_loop.h
@@ -53,7 +53,6 @@ struct tcm_loop_hba {
         struct se_hba_s *se_hba;
         struct se_lun *tl_hba_lun;
         struct se_port *tl_hba_lun_sep;
-        struct se_device_s *se_dev_hba_ptr;
         struct tcm_loop_nexus *tl_nexus;
         struct device dev;
         struct Scsi_Host *sh;
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 9a5f9a7aecd2..15c127b780d8 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -61,7 +61,7 @@ struct t10_alua_lu_gp *default_lu_gp;
  */
 int target_emulate_report_target_port_groups(struct se_cmd *cmd)
 {
-        struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
+        struct se_device *dev = cmd->se_dev;
         struct se_port *port;
         struct t10_alua_tg_pt_gp *tg_pt_gp;
         struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
@@ -86,8 +86,8 @@ int target_emulate_report_target_port_groups(struct se_cmd *cmd)
         }
         buf = transport_kmap_data_sg(cmd);
 
-        spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
-        list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
+        spin_lock(&dev->t10_alua.tg_pt_gps_lock);
+        list_for_each_entry(tg_pt_gp, &dev->t10_alua.tg_pt_gps_list,
                         tg_pt_gp_list) {
                 /*
                  * Check if the Target port group and Target port descriptor list
@@ -160,7 +160,7 @@ int target_emulate_report_target_port_groups(struct se_cmd *cmd)
                 }
                 spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
         }
-        spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
+        spin_unlock(&dev->t10_alua.tg_pt_gps_lock);
         /*
          * Set the RETURN DATA LENGTH set in the header of the DataIN Payload
          */
@@ -203,7 +203,6 @@ int target_emulate_report_target_port_groups(struct se_cmd *cmd)
 int target_emulate_set_target_port_groups(struct se_cmd *cmd)
 {
         struct se_device *dev = cmd->se_dev;
-        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
         struct se_port *port, *l_port = cmd->se_lun->lun_sep;
         struct se_node_acl *nacl = cmd->se_sess->se_node_acl;
         struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp;
@@ -303,9 +302,9 @@ int target_emulate_set_target_port_groups(struct se_cmd *cmd)
                          * Locate the matching target port group ID from
                          * the global tg_pt_gp list
                          */
-                        spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+                        spin_lock(&dev->t10_alua.tg_pt_gps_lock);
                         list_for_each_entry(tg_pt_gp,
-                                        &su_dev->t10_alua.tg_pt_gps_list,
+                                        &dev->t10_alua.tg_pt_gps_list,
                                         tg_pt_gp_list) {
                                 if (!tg_pt_gp->tg_pt_gp_valid_id)
                                         continue;
@@ -315,18 +314,18 @@ int target_emulate_set_target_port_groups(struct se_cmd *cmd)
 
                                 atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
                                 smp_mb__after_atomic_inc();
-                                spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
+                                spin_unlock(&dev->t10_alua.tg_pt_gps_lock);
 
                                 rc = core_alua_do_port_transition(tg_pt_gp,
                                                 dev, l_port, nacl,
                                                 alua_access_state, 1);
 
-                                spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+                                spin_lock(&dev->t10_alua.tg_pt_gps_lock);
                                 atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
                                 smp_mb__after_atomic_dec();
                                 break;
                         }
-                        spin_unlock(&su_dev->t10_alua.tg_pt_gps_lock);
+                        spin_unlock(&dev->t10_alua.tg_pt_gps_lock);
                         /*
                          * If not matching target port group ID can be located
                          * throw an exception with ASCQ: INVALID_PARAMETER_LIST
@@ -758,8 +757,7 @@ static int core_alua_update_tpg_primary_metadata(
         int primary_state,
         unsigned char *md_buf)
 {
-        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
-        struct t10_wwn *wwn = &su_dev->t10_wwn;
+        struct t10_wwn *wwn = &tg_pt_gp->tg_pt_gp_dev->t10_wwn;
         char path[ALUA_METADATA_PATH_LEN];
         int len;
 
@@ -899,7 +897,6 @@ int core_alua_do_port_transition(
 {
         struct se_device *dev;
         struct se_port *port;
-        struct se_subsystem_dev *su_dev;
         struct se_node_acl *nacl;
         struct t10_alua_lu_gp *lu_gp;
         struct t10_alua_lu_gp_member *lu_gp_mem, *local_lu_gp_mem;
@@ -949,14 +946,13 @@ int core_alua_do_port_transition(
                                 lu_gp_mem_list) {
 
                 dev = lu_gp_mem->lu_gp_mem_dev;
-                su_dev = dev->se_sub_dev;
                 atomic_inc(&lu_gp_mem->lu_gp_mem_ref_cnt);
                 smp_mb__after_atomic_inc();
                 spin_unlock(&lu_gp->lu_gp_lock);
 
-                spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
+                spin_lock(&dev->t10_alua.tg_pt_gps_lock);