target: Core cleanups from AGrover (round 1)

This patch contains the squashed version of a number of cleanups and
minor fixes from Andy's initial series (round 1) for target core this
past spring.  The condensed log looks like:

target: use errno values instead of returning -1 for everything
target: Rename transport_calc_sg_num to transport_init_task_sg
target: Fix leak in error path in transport_init_task_sg
target/pscsi: Remove pscsi_get_sh() usage
target: Make two runtime checks into WARN_ONs
target: Remove hba queue depth and convert to spin_lock_irq usage
target: dev->dev_status_queue_obj is unused
target: Make struct se_queue_req.cmd type struct se_cmd *
target: Remove __transport_get_qr_from_queue()
target: Rename se_dev->g_se_dev_list to se_dev_node
target: Remove struct se_global
target: Simplify scsi mib index table code
target: Make dev_queue_obj a member of se_device instead of a pointer
target: remove extraneous returns at end of void functions
target: Ensure transport_dump_vpd_ident_type returns null-terminated str
target: Function pointers don't need to use '&' to be assigned
target: Fix comment in __transport_execute_tasks()
target: Misc style cleanups
target: rename struct pr_reservation_template to pr_reservation
target: Remove #defines that just perform indirection
target: Inline transport_get_task_from_execute_queue()
target: Minor header comment fixes

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 74 insertions, 65 deletions

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 5ec745fed931..448129f74cf9 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -44,6 +44,12 @@
 #include <target/target_core_fabric_ops.h>
 
 #include "target_core_hba.h"
+#include "target_core_stat.h"
+
+extern struct se_device *g_lun0_dev;
+
+static DEFINE_SPINLOCK(tpg_lock);
+static LIST_HEAD(tpg_list);
 
 /*      core_clear_initiator_node_from_tpg():
  *
@@ -68,7 +74,7 @@ static void core_clear_initiator_node_from_tpg(
                 if (!deve->se_lun) {
                         printk(KERN_ERR "%s device entries device pointer is"
                                 " NULL, but Initiator has access.\n",
-                                TPG_TFO(tpg)->get_fabric_name());
+                                tpg->se_tpg_tfo->get_fabric_name());
                         continue;
                 }
 
@@ -171,7 +177,7 @@ void core_tpg_add_node_to_devs(
                  * By default in LIO-Target $FABRIC_MOD,
                  * demo_mode_write_protect is ON, or READ_ONLY;
                  */
-                if (!(TPG_TFO(tpg)->tpg_check_demo_mode_write_protect(tpg))) {
+                if (!(tpg->se_tpg_tfo->tpg_check_demo_mode_write_protect(tpg))) {
                         if (dev->dev_flags & DF_READ_ONLY)
                                 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
                         else
@@ -181,7 +187,7 @@ void core_tpg_add_node_to_devs(
                          * Allow only optical drives to issue R/W in default RO
                          * demo mode.
                          */
-                        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_DISK)
+                        if (dev->transport->get_device_type(dev) == TYPE_DISK)
                                 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
                         else
                                 lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
@@ -189,8 +195,8 @@ void core_tpg_add_node_to_devs(
 
                 printk(KERN_INFO "TARGET_CORE[%s]->TPG[%u]_LUN[%u] - Adding %s"
                         " access for LUN in Demo Mode\n",
-                        TPG_TFO(tpg)->get_fabric_name(),
-                        TPG_TFO(tpg)->tpg_get_tag(tpg), lun->unpacked_lun,
+                        tpg->se_tpg_tfo->get_fabric_name(),
+                        tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                         (lun_access == TRANSPORT_LUNFLAGS_READ_WRITE) ?
                         "READ-WRITE" : "READ-ONLY");
 
@@ -211,7 +217,7 @@ static int core_set_queue_depth_for_node(
 {
         if (!acl->queue_depth) {
                 printk(KERN_ERR "Queue depth for %s Initiator Node: %s is 0,"
-                        "defaulting to 1.\n", TPG_TFO(tpg)->get_fabric_name(),
+                        "defaulting to 1.\n", tpg->se_tpg_tfo->get_fabric_name(),
                         acl->initiatorname);
                 acl->queue_depth = 1;
         }
@@ -233,7 +239,7 @@ static int core_create_device_list_for_node(struct se_node_acl *nacl)
         if (!(nacl->device_list)) {
                 printk(KERN_ERR "Unable to allocate memory for"
                         " struct se_node_acl->device_list\n");
-                return -1;
+                return -ENOMEM;
         }
         for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
                 deve = &nacl->device_list[i];
@@ -262,10 +268,10 @@ struct se_node_acl *core_tpg_check_initiator_node_acl(
         if ((acl))
                 return acl;
 
-        if (!(TPG_TFO(tpg)->tpg_check_demo_mode(tpg)))
+        if (!(tpg->se_tpg_tfo->tpg_check_demo_mode(tpg)))
                 return NULL;
 
-        acl =  TPG_TFO(tpg)->tpg_alloc_fabric_acl(tpg);
+        acl =  tpg->se_tpg_tfo->tpg_alloc_fabric_acl(tpg);
         if (!(acl))
                 return NULL;
 
@@ -274,23 +280,23 @@ struct se_node_acl *core_tpg_check_initiator_node_acl(
         spin_lock_init(&acl->device_list_lock);
         spin_lock_init(&acl->nacl_sess_lock);
         atomic_set(&acl->acl_pr_ref_count, 0);
-        acl->queue_depth = TPG_TFO(tpg)->tpg_get_default_depth(tpg);
+        acl->queue_depth = tpg->se_tpg_tfo->tpg_get_default_depth(tpg);
         snprintf(acl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname);
         acl->se_tpg = tpg;
         acl->acl_index = scsi_get_new_index(SCSI_AUTH_INTR_INDEX);
         spin_lock_init(&acl->stats_lock);
         acl->dynamic_node_acl = 1;
 
-        TPG_TFO(tpg)->set_default_node_attributes(acl);
+        tpg->se_tpg_tfo->set_default_node_attributes(acl);
 
         if (core_create_device_list_for_node(acl) < 0) {
-                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                tpg->se_tpg_tfo->tpg_release_fabric_acl(tpg, acl);
                 return NULL;
         }
 
         if (core_set_queue_depth_for_node(tpg, acl) < 0) {
                 core_free_device_list_for_node(acl, tpg);
-                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                tpg->se_tpg_tfo->tpg_release_fabric_acl(tpg, acl);
                 return NULL;
         }
 
@@ -302,9 +308,9 @@ struct se_node_acl *core_tpg_check_initiator_node_acl(
         spin_unlock_bh(&tpg->acl_node_lock);
 
         printk("%s_TPG[%u] - Added DYNAMIC ACL with TCQ Depth: %d for %s"
-                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
-                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
-                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+                " Initiator Node: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->tpg_get_tag(tpg), acl->queue_depth,
+                tpg->se_tpg_tfo->get_fabric_name(), initiatorname);
 
         return acl;
 }
@@ -355,8 +361,8 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
                 if (acl->dynamic_node_acl) {
                         acl->dynamic_node_acl = 0;
                         printk(KERN_INFO "%s_TPG[%u] - Replacing dynamic ACL"
-                                " for %s\n", TPG_TFO(tpg)->get_fabric_name(),
-                                TPG_TFO(tpg)->tpg_get_tag(tpg), initiatorname);
+                                " for %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                                tpg->se_tpg_tfo->tpg_get_tag(tpg), initiatorname);
                         spin_unlock_bh(&tpg->acl_node_lock);
                         /*
                          * Release the locally allocated struct se_node_acl
@@ -364,15 +370,15 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
                          * a pointer to an existing demo mode node ACL.
                          */
                         if (se_nacl)
-                                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg,
+                                tpg->se_tpg_tfo->tpg_release_fabric_acl(tpg,
                                                         se_nacl);
                         goto done;
                 }
 
                 printk(KERN_ERR "ACL entry for %s Initiator"
                         " Node %s already exists for TPG %u, ignoring"
-                        " request.\n",  TPG_TFO(tpg)->get_fabric_name(),
-                        initiatorname, TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        " request.\n",  tpg->se_tpg_tfo->get_fabric_name(),
+                        initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 spin_unlock_bh(&tpg->acl_node_lock);
                 return ERR_PTR(-EEXIST);
         }
@@ -400,16 +406,16 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
         acl->acl_index = scsi_get_new_index(SCSI_AUTH_INTR_INDEX);
         spin_lock_init(&acl->stats_lock);
 
-        TPG_TFO(tpg)->set_default_node_attributes(acl);
+        tpg->se_tpg_tfo->set_default_node_attributes(acl);
 
         if (core_create_device_list_for_node(acl) < 0) {
-                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                tpg->se_tpg_tfo->tpg_release_fabric_acl(tpg, acl);
                 return ERR_PTR(-ENOMEM);
         }
 
         if (core_set_queue_depth_for_node(tpg, acl) < 0) {
                 core_free_device_list_for_node(acl, tpg);
-                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                tpg->se_tpg_tfo->tpg_release_fabric_acl(tpg, acl);
                 return ERR_PTR(-EINVAL);
         }
 
@@ -420,9 +426,9 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
 
 done:
         printk(KERN_INFO "%s_TPG[%hu] - Added ACL with TCQ Depth: %d for %s"
-                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
-                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
-                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+                " Initiator Node: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->tpg_get_tag(tpg), acl->queue_depth,
+                tpg->se_tpg_tfo->get_fabric_name(), initiatorname);
 
         return acl;
 }
@@ -457,7 +463,7 @@ int core_tpg_del_initiator_node_acl(
                 /*
                  * Determine if the session needs to be closed by our context.
                  */
-                if (!(TPG_TFO(tpg)->shutdown_session(sess)))
+                if (!(tpg->se_tpg_tfo->shutdown_session(sess)))
                         continue;
 
                 spin_unlock_bh(&tpg->session_lock);
@@ -465,7 +471,7 @@ int core_tpg_del_initiator_node_acl(
                  * If the $FABRIC_MOD session for the Initiator Node ACL exists,
                  * forcefully shutdown the $FABRIC_MOD session/nexus.
                  */
-                TPG_TFO(tpg)->close_session(sess);
+                tpg->se_tpg_tfo->close_session(sess);
 
                 spin_lock_bh(&tpg->session_lock);
         }
@@ -476,9 +482,9 @@ int core_tpg_del_initiator_node_acl(
         core_free_device_list_for_node(acl, tpg);
 
         printk(KERN_INFO "%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
-                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
-                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
-                TPG_TFO(tpg)->get_fabric_name(), acl->initiatorname);
+                " Initiator Node: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->tpg_get_tag(tpg), acl->queue_depth,
+                tpg->se_tpg_tfo->get_fabric_name(), acl->initiatorname);
 
         return 0;
 }
@@ -503,8 +509,8 @@ int core_tpg_set_initiator_node_queue_depth(
         if (!(acl)) {
                 printk(KERN_ERR "Access Control List entry for %s Initiator"
                         " Node %s does not exists for TPG %hu, ignoring"
-                        " request.\n", TPG_TFO(tpg)->get_fabric_name(),
-                        initiatorname, TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        " request.\n", tpg->se_tpg_tfo->get_fabric_name(),
+                        initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 spin_unlock_bh(&tpg->acl_node_lock);
                 return -ENODEV;
         }
@@ -525,7 +531,7 @@ int core_tpg_set_initiator_node_queue_depth(
                                 " operational.  To forcefully change the queue"
                                 " depth and force session reinstatement"
                                 " use the \"force=1\" parameter.\n",
-                                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+                                tpg->se_tpg_tfo->get_fabric_name(), initiatorname);
                         spin_unlock_bh(&tpg->session_lock);
 
                         spin_lock_bh(&tpg->acl_node_lock);
@@ -537,7 +543,7 @@ int core_tpg_set_initiator_node_queue_depth(
                 /*
                  * Determine if the session needs to be closed by our context.
                  */
-                if (!(TPG_TFO(tpg)->shutdown_session(sess)))
+                if (!(tpg->se_tpg_tfo->shutdown_session(sess)))
                         continue;
 
                 init_sess = sess;
@@ -549,7 +555,7 @@ int core_tpg_set_initiator_node_queue_depth(
          * Change the value in the Node's struct se_node_acl, and call
          * core_set_queue_depth_for_node() to add the requested queue depth.
          *
-         * Finally call  TPG_TFO(tpg)->close_session() to force session
+         * Finally call  tpg->se_tpg_tfo->close_session() to force session
          * reinstatement to occur if there is an active session for the
          * $FABRIC_MOD Initiator Node in question.
          */
@@ -561,10 +567,10 @@ int core_tpg_set_initiator_node_queue_depth(
                  * Force session reinstatement if
                  * core_set_queue_depth_for_node() failed, because we assume
                  * the $FABRIC_MOD has already the set session reinstatement
-                 * bit from TPG_TFO(tpg)->shutdown_session() called above.
+                 * bit from tpg->se_tpg_tfo->shutdown_session() called above.
                  */
                 if (init_sess)
-                        TPG_TFO(tpg)->close_session(init_sess);
+                        tpg->se_tpg_tfo->close_session(init_sess);
 
                 spin_lock_bh(&tpg->acl_node_lock);
                 if (dynamic_acl)
@@ -578,12 +584,12 @@ int core_tpg_set_initiator_node_queue_depth(
          * forcefully shutdown the $FABRIC_MOD session/nexus.
          */
         if (init_sess)
-                TPG_TFO(tpg)->close_session(init_sess);
+                tpg->se_tpg_tfo->close_session(init_sess);
 
         printk(KERN_INFO "Successfuly changed queue depth to: %d for Initiator"
                 " Node: %s on %s Target Portal Group: %u\n", queue_depth,
-                initiatorname, TPG_TFO(tpg)->get_fabric_name(),
-                TPG_TFO(tpg)->tpg_get_tag(tpg));
+                initiatorname, tpg->se_tpg_tfo->get_fabric_name(),
+                tpg->se_tpg_tfo->tpg_get_tag(tpg));
 
         spin_lock_bh(&tpg->acl_node_lock);
         if (dynamic_acl)
@@ -597,7 +603,7 @@ EXPORT_SYMBOL(core_tpg_set_initiator_node_queue_depth);
 static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
 {
         /* Set in core_dev_setup_virtual_lun0() */
-        struct se_device *dev = se_global->g_lun0_dev;
+        struct se_device *dev = g_lun0_dev;
         struct se_lun *lun = &se_tpg->tpg_virt_lun0;
         u32 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
         int ret;
@@ -614,7 +620,7 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
 
         ret = core_tpg_post_addlun(se_tpg, lun, lun_access, dev);
         if (ret < 0)
-                return -1;
+                return ret;
 
         return 0;
 }
@@ -663,7 +669,7 @@ int core_tpg_register(
         se_tpg->se_tpg_wwn = se_wwn;
         atomic_set(&se_tpg->tpg_pr_ref_count, 0);
         INIT_LIST_HEAD(&se_tpg->acl_node_list);
-        INIT_LIST_HEAD(&se_tpg->se_tpg_list);
+        INIT_LIST_HEAD(&se_tpg->se_tpg_node);
         INIT_LIST_HEAD(&se_tpg->tpg_sess_list);
         spin_lock_init(&se_tpg->acl_node_lock);
         spin_lock_init(&se_tpg->session_lock);
@@ -676,9 +682,9 @@ int core_tpg_register(
                 }
         }
 
-        spin_lock_bh(&se_global->se_tpg_lock);
-        list_add_tail(&se_tpg->se_tpg_list, &se_global->g_se_tpg_list);
-        spin_unlock_bh(&se_global->se_tpg_lock);
+        spin_lock_bh(&tpg_lock);
+        list_add_tail(&se_tpg->se_tpg_node, &tpg_list);
+        spin_unlock_bh(&tpg_lock);
 
         printk(KERN_INFO "TARGET_CORE[%s]: Allocated %s struct se_portal_group for"
                 " endpoint: %s, Portal Tag: %u\n", tfo->get_fabric_name(),
@@ -697,13 +703,13 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
         printk(KERN_INFO "TARGET_CORE[%s]: Deallocating %s struct se_portal_group"
                 " for endpoint: %s Portal Tag %u\n",
                 (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) ?
-                "Normal" : "Discovery", TPG_TFO(se_tpg)->get_fabric_name(),
-                TPG_TFO(se_tpg)->tpg_get_wwn(se_tpg),
-                TPG_TFO(se_tpg)->tpg_get_tag(se_tpg));
+                "Normal" : "Discovery", se_tpg->se_tpg_tfo->get_fabric_name(),
+                se_tpg->se_tpg_tfo->tpg_get_wwn(se_tpg),
+                se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg));
 
-        spin_lock_bh(&se_global->se_tpg_lock);
-        list_del(&se_tpg->se_tpg_list);
-        spin_unlock_bh(&se_global->se_tpg_lock);
+        spin_lock_bh(&tpg_lock);
+        list_del(&se_tpg->se_tpg_node);
+        spin_unlock_bh(&tpg_lock);
 
         while (atomic_read(&se_tpg->tpg_pr_ref_count) != 0)
                 cpu_relax();
@@ -721,7 +727,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
 
                 core_tpg_wait_for_nacl_pr_ref(nacl);
                 core_free_device_list_for_node(nacl, se_tpg);
-                TPG_TFO(se_tpg)->tpg_release_fabric_acl(se_tpg, nacl);
+                se_tpg->se_tpg_tfo->tpg_release_fabric_acl(se_tpg, nacl);
 
                 spin_lock_bh(&se_tpg->acl_node_lock);
         }
@@ -745,9 +751,9 @@ struct se_lun *core_tpg_pre_addlun(
         if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
                 printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
                         "-1: %u for Target Portal Group: %u\n",
-                        TPG_TFO(tpg)->get_fabric_name(),
+                        tpg->se_tpg_tfo->get_fabric_name(),
                         unpacked_lun, TRANSPORT_MAX_LUNS_PER_TPG-1,
-                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 return ERR_PTR(-EOVERFLOW);
         }
 
@@ -756,8 +762,8 @@ struct se_lun *core_tpg_pre_addlun(
         if (lun->lun_status == TRANSPORT_LUN_STATUS_ACTIVE) {
                 printk(KERN_ERR "TPG Logical Unit Number: %u is already active"
                         " on %s Target Portal Group: %u, ignoring request.\n",
-                        unpacked_lun, TPG_TFO(tpg)->get_fabric_name(),
-                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        unpacked_lun, tpg->se_tpg_tfo->get_fabric_name(),
+                        tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 spin_unlock(&tpg->tpg_lun_lock);
                 return ERR_PTR(-EINVAL);
         }
@@ -772,8 +778,11 @@ int core_tpg_post_addlun(
         u32 lun_access,
         void *lun_ptr)
 {
-        if (core_dev_export(lun_ptr, tpg, lun) < 0)
-                return -1;
+        int ret;
+
+        ret = core_dev_export(lun_ptr, tpg, lun);
+        if (ret < 0)
+                return ret;
 
         spin_lock(&tpg->tpg_lun_lock);
         lun->lun_access = lun_access;
@@ -801,9 +810,9 @@ struct se_lun *core_tpg_pre_dellun(
         if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
                 printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
                         "-1: %u for Target Portal Group: %u\n",
-                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
                         TRANSPORT_MAX_LUNS_PER_TPG-1,
-                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 return ERR_PTR(-EOVERFLOW);
         }
 
@@ -812,8 +821,8 @@ struct se_lun *core_tpg_pre_dellun(
         if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
                 printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
                         " Target Portal Group: %u, ignoring request.\n",
-                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
-                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                        tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
+                        tpg->se_tpg_tfo->tpg_get_tag(tpg));
                 spin_unlock(&tpg->tpg_lun_lock);
                 return ERR_PTR(-ENODEV);
         }