diff options
author | Jörn Engel <joern@logfs.org> | 2011-11-23 20:04:16 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-12-06 01:00:56 -0500 |
commit | 5c73b678f729ea087ef57b59a5d7b5dd3a97042b (patch) | |
tree | 1dfbf0564bba408d6728cb2cf1054b3f0f2eddbc /drivers | |
parent | 1289a0571c037b4757f60597d646aedb70361ec3 (diff) |
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: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_core.h | 2 | ||||
-rw-r--r-- | drivers/target/target_core_alua.c | 2 | ||||
-rw-r--r-- | drivers/target/target_core_transport.c | 8 |
3 files changed, 0 insertions, 12 deletions
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h index 0e96a6b13174..f1a02dad05a0 100644 --- a/drivers/target/iscsi/iscsi_target_core.h +++ b/drivers/target/iscsi/iscsi_target_core.h | |||
@@ -534,7 +534,6 @@ struct iscsi_conn { | |||
534 | atomic_t connection_exit; | 534 | atomic_t connection_exit; |
535 | atomic_t connection_recovery; | 535 | atomic_t connection_recovery; |
536 | atomic_t connection_reinstatement; | 536 | atomic_t connection_reinstatement; |
537 | atomic_t connection_wait; | ||
538 | atomic_t connection_wait_rcfr; | 537 | atomic_t connection_wait_rcfr; |
539 | atomic_t sleep_on_conn_wait_comp; | 538 | atomic_t sleep_on_conn_wait_comp; |
540 | atomic_t transport_failed; | 539 | atomic_t transport_failed; |
@@ -642,7 +641,6 @@ struct iscsi_session { | |||
642 | atomic_t session_reinstatement; | 641 | atomic_t session_reinstatement; |
643 | atomic_t session_stop_active; | 642 | atomic_t session_stop_active; |
644 | atomic_t sleep_on_sess_wait_comp; | 643 | atomic_t sleep_on_sess_wait_comp; |
645 | atomic_t transport_wait_cmds; | ||
646 | /* connection list */ | 644 | /* connection list */ |
647 | struct list_head sess_conn_list; | 645 | struct list_head sess_conn_list; |
648 | struct list_head cr_active_list; | 646 | struct list_head cr_active_list; |
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index cd61331c1482..1dcbef499d6a 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
@@ -1191,7 +1191,6 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp) | |||
1191 | * struct t10_alua_lu_gp. | 1191 | * struct t10_alua_lu_gp. |
1192 | */ | 1192 | */ |
1193 | spin_lock(&lu_gps_lock); | 1193 | spin_lock(&lu_gps_lock); |
1194 | atomic_set(&lu_gp->lu_gp_shutdown, 1); | ||
1195 | list_del(&lu_gp->lu_gp_node); | 1194 | list_del(&lu_gp->lu_gp_node); |
1196 | alua_lu_gps_count--; | 1195 | alua_lu_gps_count--; |
1197 | spin_unlock(&lu_gps_lock); | 1196 | spin_unlock(&lu_gps_lock); |
@@ -1445,7 +1444,6 @@ struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem( | |||
1445 | 1444 | ||
1446 | tg_pt_gp_mem->tg_pt = port; | 1445 | tg_pt_gp_mem->tg_pt = port; |
1447 | port->sep_alua_tg_pt_gp_mem = tg_pt_gp_mem; | 1446 | port->sep_alua_tg_pt_gp_mem = tg_pt_gp_mem; |
1448 | atomic_set(&port->sep_tg_pt_gp_active, 1); | ||
1449 | 1447 | ||
1450 | return tg_pt_gp_mem; | 1448 | return tg_pt_gp_mem; |
1451 | } | 1449 | } |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 9faaaae78b0a..0257658e2e3e 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -1326,7 +1326,6 @@ struct se_device *transport_add_device_to_core_hba( | |||
1326 | dev->se_hba = hba; | 1326 | dev->se_hba = hba; |
1327 | dev->se_sub_dev = se_dev; | 1327 | dev->se_sub_dev = se_dev; |
1328 | dev->transport = transport; | 1328 | dev->transport = transport; |
1329 | atomic_set(&dev->active_cmds, 0); | ||
1330 | INIT_LIST_HEAD(&dev->dev_list); | 1329 | INIT_LIST_HEAD(&dev->dev_list); |
1331 | INIT_LIST_HEAD(&dev->dev_sep_list); | 1330 | INIT_LIST_HEAD(&dev->dev_sep_list); |
1332 | INIT_LIST_HEAD(&dev->dev_tmr_list); | 1331 | INIT_LIST_HEAD(&dev->dev_tmr_list); |
@@ -1336,11 +1335,8 @@ struct se_device *transport_add_device_to_core_hba( | |||
1336 | INIT_LIST_HEAD(&dev->qf_cmd_list); | 1335 | INIT_LIST_HEAD(&dev->qf_cmd_list); |
1337 | spin_lock_init(&dev->execute_task_lock); | 1336 | spin_lock_init(&dev->execute_task_lock); |
1338 | spin_lock_init(&dev->delayed_cmd_lock); | 1337 | spin_lock_init(&dev->delayed_cmd_lock); |
1339 | spin_lock_init(&dev->state_task_lock); | ||
1340 | spin_lock_init(&dev->dev_alua_lock); | ||
1341 | spin_lock_init(&dev->dev_reservation_lock); | 1338 | spin_lock_init(&dev->dev_reservation_lock); |
1342 | spin_lock_init(&dev->dev_status_lock); | 1339 | spin_lock_init(&dev->dev_status_lock); |
1343 | spin_lock_init(&dev->dev_status_thr_lock); | ||
1344 | spin_lock_init(&dev->se_port_lock); | 1340 | spin_lock_init(&dev->se_port_lock); |
1345 | spin_lock_init(&dev->se_tmr_lock); | 1341 | spin_lock_init(&dev->se_tmr_lock); |
1346 | spin_lock_init(&dev->qf_cmd_lock); | 1342 | spin_lock_init(&dev->qf_cmd_lock); |
@@ -1952,8 +1948,6 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd) | |||
1952 | * to allow the passed struct se_cmd list of tasks to the front of the list. | 1948 | * to allow the passed struct se_cmd list of tasks to the front of the list. |
1953 | */ | 1949 | */ |
1954 | if (cmd->sam_task_attr == MSG_HEAD_TAG) { | 1950 | if (cmd->sam_task_attr == MSG_HEAD_TAG) { |
1955 | atomic_inc(&cmd->se_dev->dev_hoq_count); | ||
1956 | smp_mb__after_atomic_inc(); | ||
1957 | pr_debug("Added HEAD_OF_QUEUE for CDB:" | 1951 | pr_debug("Added HEAD_OF_QUEUE for CDB:" |
1958 | " 0x%02x, se_ordered_id: %u\n", | 1952 | " 0x%02x, se_ordered_id: %u\n", |
1959 | cmd->t_task_cdb[0], | 1953 | cmd->t_task_cdb[0], |
@@ -3095,8 +3089,6 @@ static void transport_complete_task_attr(struct se_cmd *cmd) | |||
3095 | " SIMPLE: %u\n", dev->dev_cur_ordered_id, | 3089 | " SIMPLE: %u\n", dev->dev_cur_ordered_id, |
3096 | cmd->se_ordered_id); | 3090 | cmd->se_ordered_id); |
3097 | } else if (cmd->sam_task_attr == MSG_HEAD_TAG) { | 3091 | } else if (cmd->sam_task_attr == MSG_HEAD_TAG) { |
3098 | atomic_dec(&dev->dev_hoq_count); | ||
3099 | smp_mb__after_atomic_dec(); | ||
3100 | dev->dev_cur_ordered_id++; | 3092 | dev->dev_cur_ordered_id++; |
3101 | pr_debug("Incremented dev_cur_ordered_id: %u for" | 3093 | pr_debug("Incremented dev_cur_ordered_id: %u for" |
3102 | " HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id, | 3094 | " HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id, |