target: Follow up core updates from AGrover and HCH (round 4)

[mirror_ubuntu-zesty-kernel.git] / drivers / target / target_core_tpg.c

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 448129f74cf9060b4268ee6ebf0c147bc3ea824c..4f1ba4c5ef1196e43e0d5ff4b52836c02e0dc9fe 100644 (file)
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -72,7 +72,7 @@ static void core_clear_initiator_node_from_tpg(
                        continue;
 
                if (!deve->se_lun) {
-                       printk(KERN_ERR "%s device entries device pointer is"
+                       pr_err("%s device entries device pointer is"
                                " NULL, but Initiator has access.\n",
                                tpg->se_tpg_tfo->get_fabric_name());
                        continue;
@@ -86,14 +86,13 @@ static void core_clear_initiator_node_from_tpg(
                spin_lock(&lun->lun_acl_lock);
                list_for_each_entry_safe(acl, acl_tmp,
                                        &lun->lun_acl_list, lacl_list) {
-                       if (!(strcmp(acl->initiatorname,
-                                       nacl->initiatorname)) &&
-                            (acl->mapped_lun == deve->mapped_lun))
+                       if (!strcmp(acl->initiatorname, nacl->initiatorname) &&
+                           (acl->mapped_lun == deve->mapped_lun))
                                break;
                }
 
                if (!acl) {
-                       printk(KERN_ERR "Unable to locate struct se_lun_acl for %s,"
+                       pr_err("Unable to locate struct se_lun_acl for %s,"
                                " mapped_lun: %u\n", nacl->initiatorname,
                                deve->mapped_lun);
                        spin_unlock(&lun->lun_acl_lock);
@@ -121,7 +120,7 @@ struct se_node_acl *__core_tpg_get_initiator_node_acl(
        struct se_node_acl *acl;
 
        list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
-               if (!(strcmp(acl->initiatorname, initiatorname)))
+               if (!strcmp(acl->initiatorname, initiatorname))
                        return acl;
        }
 
@@ -140,8 +139,8 @@ struct se_node_acl *core_tpg_get_initiator_node_acl(
 
        spin_lock_bh(&tpg->acl_node_lock);
        list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
-               if (!(strcmp(acl->initiatorname, initiatorname)) &&
-                  (!(acl->dynamic_node_acl))) {
+               if (!strcmp(acl->initiatorname, initiatorname) &&
+                   !acl->dynamic_node_acl) {
                        spin_unlock_bh(&tpg->acl_node_lock);
                        return acl;
                }
@@ -177,7 +176,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->se_tpg_tfo->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
@@ -193,7 +192,7 @@ void core_tpg_add_node_to_devs(
                                lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
                }
 
-               printk(KERN_INFO "TARGET_CORE[%s]->TPG[%u]_LUN[%u] - Adding %s"
+               pr_debug("TARGET_CORE[%s]->TPG[%u]_LUN[%u] - Adding %s"
                        " access for LUN in Demo Mode\n",
                        tpg->se_tpg_tfo->get_fabric_name(),
                        tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
@@ -216,7 +215,7 @@ static int core_set_queue_depth_for_node(
        struct se_node_acl *acl)
 {
        if (!acl->queue_depth) {
-               printk(KERN_ERR "Queue depth for %s Initiator Node: %s is 0,"
+               pr_err("Queue depth for %s Initiator Node: %s is 0,"
                        "defaulting to 1.\n", tpg->se_tpg_tfo->get_fabric_name(),
                        acl->initiatorname);
                acl->queue_depth = 1;
@@ -236,8 +235,8 @@ static int core_create_device_list_for_node(struct se_node_acl *nacl)
 
        nacl->device_list = kzalloc(sizeof(struct se_dev_entry) *
                                TRANSPORT_MAX_LUNS_PER_TPG, GFP_KERNEL);
-       if (!(nacl->device_list)) {
-               printk(KERN_ERR "Unable to allocate memory for"
+       if (!nacl->device_list) {
+               pr_err("Unable to allocate memory for"
                        " struct se_node_acl->device_list\n");
                return -ENOMEM;
        }
@@ -265,14 +264,14 @@ struct se_node_acl *core_tpg_check_initiator_node_acl(
        struct se_node_acl *acl;
 
        acl = core_tpg_get_initiator_node_acl(tpg, initiatorname);
-       if ((acl))
+       if (acl)
                return acl;
 
-       if (!(tpg->se_tpg_tfo->tpg_check_demo_mode(tpg)))
+       if (!tpg->se_tpg_tfo->tpg_check_demo_mode(tpg))
                return NULL;
 
        acl =  tpg->se_tpg_tfo->tpg_alloc_fabric_acl(tpg);
-       if (!(acl))
+       if (!acl)
                return NULL;
 
        INIT_LIST_HEAD(&acl->acl_list);
@@ -307,7 +306,7 @@ struct se_node_acl *core_tpg_check_initiator_node_acl(
        tpg->num_node_acls++;
        spin_unlock_bh(&tpg->acl_node_lock);
 
-       printk("%s_TPG[%u] - Added DYNAMIC ACL with TCQ Depth: %d for %s"
+       pr_debug("%s_TPG[%u] - Added DYNAMIC ACL with TCQ Depth: %d for %s"
                " 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);
@@ -357,10 +356,10 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
 
        spin_lock_bh(&tpg->acl_node_lock);
        acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname);
-       if ((acl)) {
+       if (acl) {
                if (acl->dynamic_node_acl) {
                        acl->dynamic_node_acl = 0;
-                       printk(KERN_INFO "%s_TPG[%u] - Replacing dynamic ACL"
+                       pr_debug("%s_TPG[%u] - Replacing dynamic ACL"
                                " 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);
@@ -375,7 +374,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
                        goto done;
                }
 
-               printk(KERN_ERR "ACL entry for %s Initiator"
+               pr_err("ACL entry for %s Initiator"
                        " Node %s already exists for TPG %u, ignoring"
                        " request.\n",  tpg->se_tpg_tfo->get_fabric_name(),
                        initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
@@ -384,8 +383,8 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
        }
        spin_unlock_bh(&tpg->acl_node_lock);
 
-       if (!(se_nacl)) {
-               printk("struct se_node_acl pointer is NULL\n");
+       if (!se_nacl) {
+               pr_err("struct se_node_acl pointer is NULL\n");
                return ERR_PTR(-EINVAL);
        }
        /*
@@ -425,7 +424,7 @@ struct se_node_acl *core_tpg_add_initiator_node_acl(
        spin_unlock_bh(&tpg->acl_node_lock);
 
 done:
-       printk(KERN_INFO "%s_TPG[%hu] - Added ACL with TCQ Depth: %d for %s"
+       pr_debug("%s_TPG[%hu] - Added ACL with TCQ Depth: %d for %s"
                " 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);
@@ -463,7 +462,7 @@ int core_tpg_del_initiator_node_acl(
                /*
                 * Determine if the session needs to be closed by our context.
                 */
-               if (!(tpg->se_tpg_tfo->shutdown_session(sess)))
+               if (!tpg->se_tpg_tfo->shutdown_session(sess))
                        continue;
 
                spin_unlock_bh(&tpg->session_lock);
@@ -481,7 +480,7 @@ int core_tpg_del_initiator_node_acl(
        core_clear_initiator_node_from_tpg(acl, tpg);
        core_free_device_list_for_node(acl, tpg);
 
-       printk(KERN_INFO "%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
+       pr_debug("%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
                " 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);
@@ -506,8 +505,8 @@ int core_tpg_set_initiator_node_queue_depth(
 
        spin_lock_bh(&tpg->acl_node_lock);
        acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname);
-       if (!(acl)) {
-               printk(KERN_ERR "Access Control List entry for %s Initiator"
+       if (!acl) {
+               pr_err("Access Control List entry for %s Initiator"
                        " Node %s does not exists for TPG %hu, ignoring"
                        " request.\n", tpg->se_tpg_tfo->get_fabric_name(),
                        initiatorname, tpg->se_tpg_tfo->tpg_get_tag(tpg));
@@ -526,7 +525,7 @@ int core_tpg_set_initiator_node_queue_depth(
                        continue;
 
                if (!force) {
-                       printk(KERN_ERR "Unable to change queue depth for %s"
+                       pr_err("Unable to change queue depth for %s"
                                " Initiator Node: %s while session is"
                                " operational.  To forcefully change the queue"
                                " depth and force session reinstatement"
@@ -543,7 +542,7 @@ int core_tpg_set_initiator_node_queue_depth(
                /*
                 * Determine if the session needs to be closed by our context.
                 */
-               if (!(tpg->se_tpg_tfo->shutdown_session(sess)))
+               if (!tpg->se_tpg_tfo->shutdown_session(sess))
                        continue;
 
                init_sess = sess;
@@ -586,7 +585,7 @@ int core_tpg_set_initiator_node_queue_depth(
        if (init_sess)
                tpg->se_tpg_tfo->close_session(init_sess);
 
-       printk(KERN_INFO "Successfuly changed queue depth to: %d for Initiator"
+       pr_debug("Successfuly changed queue depth to: %d for Initiator"
                " Node: %s on %s Target Portal Group: %u\n", queue_depth,
                initiatorname, tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg));
@@ -644,8 +643,8 @@ int core_tpg_register(
 
        se_tpg->tpg_lun_list = kzalloc((sizeof(struct se_lun) *
                                TRANSPORT_MAX_LUNS_PER_TPG), GFP_KERNEL);
-       if (!(se_tpg->tpg_lun_list)) {
-               printk(KERN_ERR "Unable to allocate struct se_portal_group->"
+       if (!se_tpg->tpg_lun_list) {
+               pr_err("Unable to allocate struct se_portal_group->"
                                "tpg_lun_list\n");
                return -ENOMEM;
        }
@@ -686,7 +685,7 @@ int core_tpg_register(
        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"
+       pr_debug("TARGET_CORE[%s]: Allocated %s struct se_portal_group for"
                " endpoint: %s, Portal Tag: %u\n", tfo->get_fabric_name(),
                (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) ?
                "Normal" : "Discovery", (tfo->tpg_get_wwn(se_tpg) == NULL) ?
@@ -700,7 +699,7 @@ int core_tpg_deregister(struct se_portal_group *se_tpg)
 {
        struct se_node_acl *nacl, *nacl_tmp;
 
-       printk(KERN_INFO "TARGET_CORE[%s]: Deallocating %s struct se_portal_group"
+       pr_debug("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", se_tpg->se_tpg_tfo->get_fabric_name(),
@@ -749,7 +748,7 @@ struct se_lun *core_tpg_pre_addlun(
        struct se_lun *lun;
 
        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
+               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
                        "-1: %u for Target Portal Group: %u\n",
                        tpg->se_tpg_tfo->get_fabric_name(),
                        unpacked_lun, TRANSPORT_MAX_LUNS_PER_TPG-1,
@@ -760,7 +759,7 @@ struct se_lun *core_tpg_pre_addlun(
        spin_lock(&tpg->tpg_lun_lock);
        lun = &tpg->tpg_lun_list[unpacked_lun];
        if (lun->lun_status == TRANSPORT_LUN_STATUS_ACTIVE) {
-               printk(KERN_ERR "TPG Logical Unit Number: %u is already active"
+               pr_err("TPG Logical Unit Number: %u is already active"
                        " on %s Target Portal Group: %u, ignoring request.\n",
                        unpacked_lun, tpg->se_tpg_tfo->get_fabric_name(),
                        tpg->se_tpg_tfo->tpg_get_tag(tpg));
@@ -808,7 +807,7 @@ struct se_lun *core_tpg_pre_dellun(
        struct se_lun *lun;
 
        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
+               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
                        "-1: %u for Target Portal Group: %u\n",
                        tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
                        TRANSPORT_MAX_LUNS_PER_TPG-1,
@@ -819,7 +818,7 @@ struct se_lun *core_tpg_pre_dellun(
        spin_lock(&tpg->tpg_lun_lock);
        lun = &tpg->tpg_lun_list[unpacked_lun];
        if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
-               printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+               pr_err("%s Logical Unit Number: %u is not active on"
                        " Target Portal Group: %u, ignoring request.\n",
                        tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
                        tpg->se_tpg_tfo->tpg_get_tag(tpg));