]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
target: Drop unused se_lun->lun_acl_list
authorNicholas Bellinger <nab@linux-iscsi.org>
Sun, 8 Mar 2015 08:04:44 +0000 (08:04 +0000)
committerNicholas Bellinger <nab@linux-iscsi.org>
Mon, 1 Jun 2015 07:25:04 +0000 (00:25 -0700)
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_device.c
drivers/target/target_core_tpg.c
include/target/target_core_base.h

index 1593d496584879b270277aaacabaa95fffd9ed38..ba8c65a670d89e32c4fc7bc0e57d34e8102b7776 100644 (file)
@@ -1243,7 +1243,6 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
                return NULL;
        }
 
-       INIT_LIST_HEAD(&lacl->lacl_list);
        lacl->mapped_lun = mapped_lun;
        lacl->se_lun_nacl = nacl;
        snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",
@@ -1273,11 +1272,6 @@ int core_dev_add_initiator_node_lun_acl(
                        lun_access, nacl, tpg) < 0)
                return -EINVAL;
 
-       spin_lock(&lun->lun_acl_lock);
-       list_add_tail(&lacl->lacl_list, &lun->lun_acl_list);
-       atomic_inc_mb(&lun->lun_acl_count);
-       spin_unlock(&lun->lun_acl_lock);
-
        pr_debug("%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
                " InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun,
@@ -1304,19 +1298,12 @@ int core_dev_del_initiator_node_lun_acl(
        if (!nacl)
                return -EINVAL;
 
-       spin_lock(&lun->lun_acl_lock);
-       list_del(&lacl->lacl_list);
-       atomic_dec_mb(&lun->lun_acl_count);
-       spin_unlock(&lun->lun_acl_lock);
-
        mutex_lock(&nacl->lun_entry_mutex);
        deve = target_nacl_find_deve(nacl, lacl->mapped_lun);
        if (deve)
                core_disable_device_list_for_node(lun, deve, nacl, tpg);
        mutex_unlock(&nacl->lun_entry_mutex);
 
-       lacl->se_lun = NULL;
-
        pr_debug("%s_TPG[%hu]_LUN[%u] - Removed ACL for"
                " InitiatorNode: %s Mapped LUN: %u\n",
                tpg->se_tpg_tfo->get_fabric_name(),
@@ -1446,8 +1433,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
        xcopy_lun = &dev->xcopy_lun;
        xcopy_lun->lun_se_dev = dev;
        init_completion(&xcopy_lun->lun_shutdown_comp);
-       INIT_LIST_HEAD(&xcopy_lun->lun_acl_list);
-       spin_lock_init(&xcopy_lun->lun_acl_lock);
        spin_lock_init(&xcopy_lun->lun_sep_lock);
        init_completion(&xcopy_lun->lun_ref_comp);
 
index e7745d21075be979a361fb2d13706e5f11f9a7cd..73c25bda5a2506960c752d277d87e3d3a34e398e 100644 (file)
@@ -495,8 +495,6 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
        lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
        atomic_set(&lun->lun_acl_count, 0);
        init_completion(&lun->lun_shutdown_comp);
-       INIT_LIST_HEAD(&lun->lun_acl_list);
-       spin_lock_init(&lun->lun_acl_lock);
        spin_lock_init(&lun->lun_sep_lock);
        init_completion(&lun->lun_ref_comp);
 
@@ -610,8 +608,6 @@ struct se_lun *core_tpg_alloc_lun(
        lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
        atomic_set(&lun->lun_acl_count, 0);
        init_completion(&lun->lun_shutdown_comp);
-       INIT_LIST_HEAD(&lun->lun_acl_list);
-       spin_lock_init(&lun->lun_acl_lock);
        spin_lock_init(&lun->lun_sep_lock);
        init_completion(&lun->lun_ref_comp);
 
index 2b6adace28b482557d3c6dc035c058367a148939..7908d6d04f91dad7c453ab6baa27af1e96496f93 100644 (file)
@@ -632,7 +632,6 @@ struct se_lun_acl {
        u32                     mapped_lun;
        struct se_node_acl      *se_lun_nacl;
        struct se_lun           *se_lun;
-       struct list_head        lacl_list;
        struct config_group     se_lun_group;
        struct se_ml_stat_grps  ml_stat_grps;
 };
@@ -715,10 +714,8 @@ struct se_lun {
        u32                     unpacked_lun;
        u32                     lun_index;
        atomic_t                lun_acl_count;
-       spinlock_t              lun_acl_lock;
        spinlock_t              lun_sep_lock;
        struct completion       lun_shutdown_comp;
-       struct list_head        lun_acl_list;
        struct se_device        *lun_se_dev;
        struct se_port          *lun_sep;
        struct config_group     lun_group;