Commit 84786546 authored by Nicholas Bellinger's avatar Nicholas Bellinger

target: Drop unused se_lun->lun_acl_list

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 22793de5
...@@ -1243,7 +1243,6 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl( ...@@ -1243,7 +1243,6 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
return NULL; return NULL;
} }
INIT_LIST_HEAD(&lacl->lacl_list);
lacl->mapped_lun = mapped_lun; lacl->mapped_lun = mapped_lun;
lacl->se_lun_nacl = nacl; lacl->se_lun_nacl = nacl;
snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s", snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",
...@@ -1273,11 +1272,6 @@ int core_dev_add_initiator_node_lun_acl( ...@@ -1273,11 +1272,6 @@ int core_dev_add_initiator_node_lun_acl(
lun_access, nacl, tpg) < 0) lun_access, nacl, tpg) < 0)
return -EINVAL; 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 " pr_debug("%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
" InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(), " InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun, 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( ...@@ -1304,19 +1298,12 @@ int core_dev_del_initiator_node_lun_acl(
if (!nacl) if (!nacl)
return -EINVAL; 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); mutex_lock(&nacl->lun_entry_mutex);
deve = target_nacl_find_deve(nacl, lacl->mapped_lun); deve = target_nacl_find_deve(nacl, lacl->mapped_lun);
if (deve) if (deve)
core_disable_device_list_for_node(lun, deve, nacl, tpg); core_disable_device_list_for_node(lun, deve, nacl, tpg);
mutex_unlock(&nacl->lun_entry_mutex); mutex_unlock(&nacl->lun_entry_mutex);
lacl->se_lun = NULL;
pr_debug("%s_TPG[%hu]_LUN[%u] - Removed ACL for" pr_debug("%s_TPG[%hu]_LUN[%u] - Removed ACL for"
" InitiatorNode: %s Mapped LUN: %u\n", " InitiatorNode: %s Mapped LUN: %u\n",
tpg->se_tpg_tfo->get_fabric_name(), tpg->se_tpg_tfo->get_fabric_name(),
...@@ -1446,8 +1433,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *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 = &dev->xcopy_lun;
xcopy_lun->lun_se_dev = dev; xcopy_lun->lun_se_dev = dev;
init_completion(&xcopy_lun->lun_shutdown_comp); 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); spin_lock_init(&xcopy_lun->lun_sep_lock);
init_completion(&xcopy_lun->lun_ref_comp); init_completion(&xcopy_lun->lun_ref_comp);
......
...@@ -495,8 +495,6 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg) ...@@ -495,8 +495,6 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
lun->lun_status = TRANSPORT_LUN_STATUS_FREE; lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
atomic_set(&lun->lun_acl_count, 0); atomic_set(&lun->lun_acl_count, 0);
init_completion(&lun->lun_shutdown_comp); 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); spin_lock_init(&lun->lun_sep_lock);
init_completion(&lun->lun_ref_comp); init_completion(&lun->lun_ref_comp);
...@@ -610,8 +608,6 @@ struct se_lun *core_tpg_alloc_lun( ...@@ -610,8 +608,6 @@ struct se_lun *core_tpg_alloc_lun(
lun->lun_status = TRANSPORT_LUN_STATUS_FREE; lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
atomic_set(&lun->lun_acl_count, 0); atomic_set(&lun->lun_acl_count, 0);
init_completion(&lun->lun_shutdown_comp); 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); spin_lock_init(&lun->lun_sep_lock);
init_completion(&lun->lun_ref_comp); init_completion(&lun->lun_ref_comp);
......
...@@ -632,7 +632,6 @@ struct se_lun_acl { ...@@ -632,7 +632,6 @@ struct se_lun_acl {
u32 mapped_lun; u32 mapped_lun;
struct se_node_acl *se_lun_nacl; struct se_node_acl *se_lun_nacl;
struct se_lun *se_lun; struct se_lun *se_lun;
struct list_head lacl_list;
struct config_group se_lun_group; struct config_group se_lun_group;
struct se_ml_stat_grps ml_stat_grps; struct se_ml_stat_grps ml_stat_grps;
}; };
...@@ -715,10 +714,8 @@ struct se_lun { ...@@ -715,10 +714,8 @@ struct se_lun {
u32 unpacked_lun; u32 unpacked_lun;
u32 lun_index; u32 lun_index;
atomic_t lun_acl_count; atomic_t lun_acl_count;
spinlock_t lun_acl_lock;
spinlock_t lun_sep_lock; spinlock_t lun_sep_lock;
struct completion lun_shutdown_comp; struct completion lun_shutdown_comp;
struct list_head lun_acl_list;
struct se_device *lun_se_dev; struct se_device *lun_se_dev;
struct se_port *lun_sep; struct se_port *lun_sep;
struct config_group lun_group; struct config_group lun_group;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment