aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2015-05-24 03:48:54 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2015-06-01 03:25:25 -0400
commit4624773765699ac3f4e0b918306b638cba385713 (patch)
tree192cf39d097f923bb19788a5ff401c2a5e5bd298
parentdf9766ca9da5d9c1f2bb4eea9c9f16a2e7e8e1a5 (diff)
target: Drop left-over se_lun->lun_status
Now that se_portal_group->tpg_lun_hlist is a RCU protected hlist, go ahead and drop the left-over lun->lun_status usage. Reported-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/target_core_tpg.c6
-rw-r--r--include/target/target_core_base.h8
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index f66c208386f8..91f8ddb6d783 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -98,8 +98,6 @@ void core_tpg_add_node_to_devs(
98 98
99 mutex_lock(&tpg->tpg_lun_mutex); 99 mutex_lock(&tpg->tpg_lun_mutex);
100 hlist_for_each_entry_rcu(lun, &tpg->tpg_lun_hlist, link) { 100 hlist_for_each_entry_rcu(lun, &tpg->tpg_lun_hlist, link) {
101 if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE)
102 continue;
103 if (lun_orig && lun != lun_orig) 101 if (lun_orig && lun != lun_orig)
104 continue; 102 continue;
105 103
@@ -495,7 +493,6 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
495 int ret; 493 int ret;
496 494
497 lun->unpacked_lun = 0; 495 lun->unpacked_lun = 0;
498 lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
499 atomic_set(&lun->lun_acl_count, 0); 496 atomic_set(&lun->lun_acl_count, 0);
500 init_completion(&lun->lun_shutdown_comp); 497 init_completion(&lun->lun_shutdown_comp);
501 spin_lock_init(&lun->lun_sep_lock); 498 spin_lock_init(&lun->lun_sep_lock);
@@ -608,7 +605,6 @@ struct se_lun *core_tpg_alloc_lun(
608 } 605 }
609 lun->unpacked_lun = unpacked_lun; 606 lun->unpacked_lun = unpacked_lun;
610 lun->lun_link_magic = SE_LUN_LINK_MAGIC; 607 lun->lun_link_magic = SE_LUN_LINK_MAGIC;
611 lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
612 atomic_set(&lun->lun_acl_count, 0); 608 atomic_set(&lun->lun_acl_count, 0);
613 init_completion(&lun->lun_shutdown_comp); 609 init_completion(&lun->lun_shutdown_comp);
614 spin_lock_init(&lun->lun_sep_lock); 610 spin_lock_init(&lun->lun_sep_lock);
@@ -638,7 +634,6 @@ int core_tpg_add_lun(
638 634
639 mutex_lock(&tpg->tpg_lun_mutex); 635 mutex_lock(&tpg->tpg_lun_mutex);
640 lun->lun_access = lun_access; 636 lun->lun_access = lun_access;
641 lun->lun_status = TRANSPORT_LUN_STATUS_ACTIVE;
642 if (!(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) 637 if (!(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE))
643 hlist_add_head_rcu(&lun->link, &tpg->tpg_lun_hlist); 638 hlist_add_head_rcu(&lun->link, &tpg->tpg_lun_hlist);
644 mutex_unlock(&tpg->tpg_lun_mutex); 639 mutex_unlock(&tpg->tpg_lun_mutex);
@@ -658,7 +653,6 @@ void core_tpg_remove_lun(
658 core_dev_unexport(lun->lun_se_dev, tpg, lun); 653 core_dev_unexport(lun->lun_se_dev, tpg, lun);
659 654
660 mutex_lock(&tpg->tpg_lun_mutex); 655 mutex_lock(&tpg->tpg_lun_mutex);
661 lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
662 if (!(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) 656 if (!(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE))
663 hlist_del_rcu(&lun->link); 657 hlist_del_rcu(&lun->link);
664 mutex_unlock(&tpg->tpg_lun_mutex); 658 mutex_unlock(&tpg->tpg_lun_mutex);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 7908d6d04f91..78ed2a83838c 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -119,12 +119,6 @@ enum hba_flags_table {
119 HBA_FLAGS_PSCSI_MODE = 0x02, 119 HBA_FLAGS_PSCSI_MODE = 0x02,
120}; 120};
121 121
122/* struct se_lun->lun_status */
123enum transport_lun_status_table {
124 TRANSPORT_LUN_STATUS_FREE = 0,
125 TRANSPORT_LUN_STATUS_ACTIVE = 1,
126};
127
128/* Special transport agnostic struct se_cmd->t_states */ 122/* Special transport agnostic struct se_cmd->t_states */
129enum transport_state_table { 123enum transport_state_table {
130 TRANSPORT_NO_STATE = 0, 124 TRANSPORT_NO_STATE = 0,
@@ -707,8 +701,6 @@ struct se_lun {
707 u16 lun_rtpi; 701 u16 lun_rtpi;
708#define SE_LUN_LINK_MAGIC 0xffff7771 702#define SE_LUN_LINK_MAGIC 0xffff7771
709 u32 lun_link_magic; 703 u32 lun_link_magic;
710 /* See transport_lun_status_table */
711 enum transport_lun_status_table lun_status;
712 u32 lun_access; 704 u32 lun_access;
713 u32 lun_flags; 705 u32 lun_flags;
714 u32 unpacked_lun; 706 u32 unpacked_lun;