Commit 5c73b678 authored by Jörn Engel's avatar Jörn Engel Committed by Nicholas Bellinger

target: remove unused struct fields

Some are never used, some are set but never read, dev_hoq_count is
incremented and decremented, but never read.
Signed-off-by: default avatarJoern Engel <joern@logfs.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 1289a057
...@@ -534,7 +534,6 @@ struct iscsi_conn { ...@@ -534,7 +534,6 @@ struct iscsi_conn {
atomic_t connection_exit; atomic_t connection_exit;
atomic_t connection_recovery; atomic_t connection_recovery;
atomic_t connection_reinstatement; atomic_t connection_reinstatement;
atomic_t connection_wait;
atomic_t connection_wait_rcfr; atomic_t connection_wait_rcfr;
atomic_t sleep_on_conn_wait_comp; atomic_t sleep_on_conn_wait_comp;
atomic_t transport_failed; atomic_t transport_failed;
...@@ -642,7 +641,6 @@ struct iscsi_session { ...@@ -642,7 +641,6 @@ struct iscsi_session {
atomic_t session_reinstatement; atomic_t session_reinstatement;
atomic_t session_stop_active; atomic_t session_stop_active;
atomic_t sleep_on_sess_wait_comp; atomic_t sleep_on_sess_wait_comp;
atomic_t transport_wait_cmds;
/* connection list */ /* connection list */
struct list_head sess_conn_list; struct list_head sess_conn_list;
struct list_head cr_active_list; struct list_head cr_active_list;
......
...@@ -1191,7 +1191,6 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp) ...@@ -1191,7 +1191,6 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
* struct t10_alua_lu_gp. * struct t10_alua_lu_gp.
*/ */
spin_lock(&lu_gps_lock); spin_lock(&lu_gps_lock);
atomic_set(&lu_gp->lu_gp_shutdown, 1);
list_del(&lu_gp->lu_gp_node); list_del(&lu_gp->lu_gp_node);
alua_lu_gps_count--; alua_lu_gps_count--;
spin_unlock(&lu_gps_lock); spin_unlock(&lu_gps_lock);
...@@ -1445,7 +1444,6 @@ struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem( ...@@ -1445,7 +1444,6 @@ struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem(
tg_pt_gp_mem->tg_pt = port; tg_pt_gp_mem->tg_pt = port;
port->sep_alua_tg_pt_gp_mem = tg_pt_gp_mem; port->sep_alua_tg_pt_gp_mem = tg_pt_gp_mem;
atomic_set(&port->sep_tg_pt_gp_active, 1);
return tg_pt_gp_mem; return tg_pt_gp_mem;
} }
......
...@@ -1326,7 +1326,6 @@ struct se_device *transport_add_device_to_core_hba( ...@@ -1326,7 +1326,6 @@ struct se_device *transport_add_device_to_core_hba(
dev->se_hba = hba; dev->se_hba = hba;
dev->se_sub_dev = se_dev; dev->se_sub_dev = se_dev;
dev->transport = transport; dev->transport = transport;
atomic_set(&dev->active_cmds, 0);
INIT_LIST_HEAD(&dev->dev_list); INIT_LIST_HEAD(&dev->dev_list);
INIT_LIST_HEAD(&dev->dev_sep_list); INIT_LIST_HEAD(&dev->dev_sep_list);
INIT_LIST_HEAD(&dev->dev_tmr_list); INIT_LIST_HEAD(&dev->dev_tmr_list);
...@@ -1336,11 +1335,8 @@ struct se_device *transport_add_device_to_core_hba( ...@@ -1336,11 +1335,8 @@ struct se_device *transport_add_device_to_core_hba(
INIT_LIST_HEAD(&dev->qf_cmd_list); INIT_LIST_HEAD(&dev->qf_cmd_list);
spin_lock_init(&dev->execute_task_lock); spin_lock_init(&dev->execute_task_lock);
spin_lock_init(&dev->delayed_cmd_lock); spin_lock_init(&dev->delayed_cmd_lock);
spin_lock_init(&dev->state_task_lock);
spin_lock_init(&dev->dev_alua_lock);
spin_lock_init(&dev->dev_reservation_lock); spin_lock_init(&dev->dev_reservation_lock);
spin_lock_init(&dev->dev_status_lock); spin_lock_init(&dev->dev_status_lock);
spin_lock_init(&dev->dev_status_thr_lock);
spin_lock_init(&dev->se_port_lock); spin_lock_init(&dev->se_port_lock);
spin_lock_init(&dev->se_tmr_lock); spin_lock_init(&dev->se_tmr_lock);
spin_lock_init(&dev->qf_cmd_lock); spin_lock_init(&dev->qf_cmd_lock);
...@@ -1952,8 +1948,6 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd) ...@@ -1952,8 +1948,6 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
* to allow the passed struct se_cmd list of tasks to the front of the list. * to allow the passed struct se_cmd list of tasks to the front of the list.
*/ */
if (cmd->sam_task_attr == MSG_HEAD_TAG) { if (cmd->sam_task_attr == MSG_HEAD_TAG) {
atomic_inc(&cmd->se_dev->dev_hoq_count);
smp_mb__after_atomic_inc();
pr_debug("Added HEAD_OF_QUEUE for CDB:" pr_debug("Added HEAD_OF_QUEUE for CDB:"
" 0x%02x, se_ordered_id: %u\n", " 0x%02x, se_ordered_id: %u\n",
cmd->t_task_cdb[0], cmd->t_task_cdb[0],
...@@ -3095,8 +3089,6 @@ static void transport_complete_task_attr(struct se_cmd *cmd) ...@@ -3095,8 +3089,6 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
" SIMPLE: %u\n", dev->dev_cur_ordered_id, " SIMPLE: %u\n", dev->dev_cur_ordered_id,
cmd->se_ordered_id); cmd->se_ordered_id);
} else if (cmd->sam_task_attr == MSG_HEAD_TAG) { } else if (cmd->sam_task_attr == MSG_HEAD_TAG) {
atomic_dec(&dev->dev_hoq_count);
smp_mb__after_atomic_dec();
dev->dev_cur_ordered_id++; dev->dev_cur_ordered_id++;
pr_debug("Incremented dev_cur_ordered_id: %u for" pr_debug("Incremented dev_cur_ordered_id: %u for"
" HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id, " HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id,
......
...@@ -213,7 +213,6 @@ struct t10_alua_lu_gp { ...@@ -213,7 +213,6 @@ struct t10_alua_lu_gp {
u16 lu_gp_id; u16 lu_gp_id;
int lu_gp_valid_id; int lu_gp_valid_id;
u32 lu_gp_members; u32 lu_gp_members;
atomic_t lu_gp_shutdown;
atomic_t lu_gp_ref_cnt; atomic_t lu_gp_ref_cnt;
spinlock_t lu_gp_lock; spinlock_t lu_gp_lock;
struct config_group lu_gp_group; struct config_group lu_gp_group;
...@@ -679,9 +678,6 @@ struct se_subsystem_dev { ...@@ -679,9 +678,6 @@ struct se_subsystem_dev {
} ____cacheline_aligned; } ____cacheline_aligned;
struct se_device { struct se_device {
/* Set to 1 if thread is NOT sleeping on thread_sem */
u8 thread_active;
u8 dev_status_timer_flags;
/* RELATIVE TARGET PORT IDENTIFER Counter */ /* RELATIVE TARGET PORT IDENTIFER Counter */
u16 dev_rpti_counter; u16 dev_rpti_counter;
/* Used for SAM Task Attribute ordering */ /* Used for SAM Task Attribute ordering */
...@@ -706,14 +702,10 @@ struct se_device { ...@@ -706,14 +702,10 @@ struct se_device {
u64 write_bytes; u64 write_bytes;
spinlock_t stats_lock; spinlock_t stats_lock;
/* Active commands on this virtual SE device */ /* Active commands on this virtual SE device */
atomic_t active_cmds;
atomic_t simple_cmds; atomic_t simple_cmds;
atomic_t depth_left; atomic_t depth_left;
atomic_t dev_ordered_id; atomic_t dev_ordered_id;
atomic_t dev_tur_active;
atomic_t execute_tasks; atomic_t execute_tasks;
atomic_t dev_status_thr_count;
atomic_t dev_hoq_count;
atomic_t dev_ordered_sync; atomic_t dev_ordered_sync;
atomic_t dev_qf_count; atomic_t dev_qf_count;
struct se_obj dev_obj; struct se_obj dev_obj;
...@@ -722,12 +714,8 @@ struct se_device { ...@@ -722,12 +714,8 @@ struct se_device {
struct se_queue_obj dev_queue_obj; struct se_queue_obj dev_queue_obj;
spinlock_t delayed_cmd_lock; spinlock_t delayed_cmd_lock;
spinlock_t execute_task_lock; spinlock_t execute_task_lock;
spinlock_t state_task_lock;
spinlock_t dev_alua_lock;
spinlock_t dev_reservation_lock; spinlock_t dev_reservation_lock;
spinlock_t dev_state_lock;
spinlock_t dev_status_lock; spinlock_t dev_status_lock;
spinlock_t dev_status_thr_lock;
spinlock_t se_port_lock; spinlock_t se_port_lock;
spinlock_t se_tmr_lock; spinlock_t se_tmr_lock;
spinlock_t qf_cmd_lock; spinlock_t qf_cmd_lock;
...@@ -739,11 +727,8 @@ struct se_device { ...@@ -739,11 +727,8 @@ struct se_device {
struct t10_pr_registration *dev_pr_res_holder; struct t10_pr_registration *dev_pr_res_holder;
struct list_head dev_sep_list; struct list_head dev_sep_list;
struct list_head dev_tmr_list; struct list_head dev_tmr_list;
struct timer_list dev_status_timer;
/* Pointer to descriptor for processing thread */ /* Pointer to descriptor for processing thread */
struct task_struct *process_thread; struct task_struct *process_thread;
pid_t process_thread_pid;
struct task_struct *dev_mgmt_thread;
struct work_struct qf_work_queue; struct work_struct qf_work_queue;
struct list_head delayed_cmd_list; struct list_head delayed_cmd_list;
struct list_head execute_task_list; struct list_head execute_task_list;
...@@ -756,8 +741,6 @@ struct se_device { ...@@ -756,8 +741,6 @@ struct se_device {
struct se_subsystem_api *transport; struct se_subsystem_api *transport;
/* Linked list for struct se_hba struct se_device list */ /* Linked list for struct se_hba struct se_device list */
struct list_head dev_list; struct list_head dev_list;
/* Linked list for struct se_global->g_se_dev_list */
struct list_head g_se_dev_list;
} ____cacheline_aligned; } ____cacheline_aligned;
struct se_hba { struct se_hba {
...@@ -819,7 +802,6 @@ struct se_port { ...@@ -819,7 +802,6 @@ struct se_port {
u32 sep_index; u32 sep_index;
struct scsi_port_stats sep_stats; struct scsi_port_stats sep_stats;
/* Used for ALUA Target Port Groups membership */ /* Used for ALUA Target Port Groups membership */
atomic_t sep_tg_pt_gp_active;
atomic_t sep_tg_pt_secondary_offline; atomic_t sep_tg_pt_secondary_offline;
/* Used for PR ALL_TG_PT=1 */ /* Used for PR ALL_TG_PT=1 */
atomic_t sep_tg_pt_ref_cnt; atomic_t sep_tg_pt_ref_cnt;
......
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