Commit aad13ca2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger

target: remove the se_ordered_node se_cmd field

We never walk ordered_cmd_list in the se_device, so remove all code related
to supporting it.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 58a2801a
...@@ -1332,12 +1332,10 @@ struct se_device *transport_add_device_to_core_hba( ...@@ -1332,12 +1332,10 @@ struct se_device *transport_add_device_to_core_hba(
INIT_LIST_HEAD(&dev->dev_tmr_list); INIT_LIST_HEAD(&dev->dev_tmr_list);
INIT_LIST_HEAD(&dev->execute_task_list); INIT_LIST_HEAD(&dev->execute_task_list);
INIT_LIST_HEAD(&dev->delayed_cmd_list); INIT_LIST_HEAD(&dev->delayed_cmd_list);
INIT_LIST_HEAD(&dev->ordered_cmd_list);
INIT_LIST_HEAD(&dev->state_task_list); INIT_LIST_HEAD(&dev->state_task_list);
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->ordered_cmd_lock);
spin_lock_init(&dev->state_task_lock); spin_lock_init(&dev->state_task_lock);
spin_lock_init(&dev->dev_alua_lock); spin_lock_init(&dev->dev_alua_lock);
spin_lock_init(&dev->dev_reservation_lock); spin_lock_init(&dev->dev_reservation_lock);
...@@ -1498,7 +1496,6 @@ void transport_init_se_cmd( ...@@ -1498,7 +1496,6 @@ void transport_init_se_cmd(
{ {
INIT_LIST_HEAD(&cmd->se_lun_node); INIT_LIST_HEAD(&cmd->se_lun_node);
INIT_LIST_HEAD(&cmd->se_delayed_node); INIT_LIST_HEAD(&cmd->se_delayed_node);
INIT_LIST_HEAD(&cmd->se_ordered_node);
INIT_LIST_HEAD(&cmd->se_qf_node); INIT_LIST_HEAD(&cmd->se_qf_node);
INIT_LIST_HEAD(&cmd->se_queue_node); INIT_LIST_HEAD(&cmd->se_queue_node);
INIT_LIST_HEAD(&cmd->se_cmd_list); INIT_LIST_HEAD(&cmd->se_cmd_list);
...@@ -1963,11 +1960,6 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd) ...@@ -1963,11 +1960,6 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
cmd->se_ordered_id); cmd->se_ordered_id);
return 1; return 1;
} else if (cmd->sam_task_attr == MSG_ORDERED_TAG) { } else if (cmd->sam_task_attr == MSG_ORDERED_TAG) {
spin_lock(&cmd->se_dev->ordered_cmd_lock);
list_add_tail(&cmd->se_ordered_node,
&cmd->se_dev->ordered_cmd_list);
spin_unlock(&cmd->se_dev->ordered_cmd_lock);
atomic_inc(&cmd->se_dev->dev_ordered_sync); atomic_inc(&cmd->se_dev->dev_ordered_sync);
smp_mb__after_atomic_inc(); smp_mb__after_atomic_inc();
...@@ -3100,11 +3092,8 @@ static void transport_complete_task_attr(struct se_cmd *cmd) ...@@ -3100,11 +3092,8 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
" HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id, " HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id,
cmd->se_ordered_id); cmd->se_ordered_id);
} else if (cmd->sam_task_attr == MSG_ORDERED_TAG) { } else if (cmd->sam_task_attr == MSG_ORDERED_TAG) {
spin_lock(&dev->ordered_cmd_lock);
list_del(&cmd->se_ordered_node);
atomic_dec(&dev->dev_ordered_sync); atomic_dec(&dev->dev_ordered_sync);
smp_mb__after_atomic_dec(); smp_mb__after_atomic_dec();
spin_unlock(&dev->ordered_cmd_lock);
dev->dev_cur_ordered_id++; dev->dev_cur_ordered_id++;
pr_debug("Incremented dev_cur_ordered_id: %u for ORDERED:" pr_debug("Incremented dev_cur_ordered_id: %u for ORDERED:"
......
...@@ -439,7 +439,6 @@ struct se_cmd { ...@@ -439,7 +439,6 @@ struct se_cmd {
/* Used for sense data */ /* Used for sense data */
void *sense_buffer; void *sense_buffer;
struct list_head se_delayed_node; struct list_head se_delayed_node;
struct list_head se_ordered_node;
struct list_head se_lun_node; struct list_head se_lun_node;
struct list_head se_qf_node; struct list_head se_qf_node;
struct se_device *se_dev; struct se_device *se_dev;
...@@ -730,7 +729,6 @@ struct se_device { ...@@ -730,7 +729,6 @@ struct se_device {
struct se_obj dev_export_obj; struct se_obj dev_export_obj;
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 ordered_cmd_lock;
spinlock_t execute_task_lock; spinlock_t execute_task_lock;
spinlock_t state_task_lock; spinlock_t state_task_lock;
spinlock_t dev_alua_lock; spinlock_t dev_alua_lock;
...@@ -756,7 +754,6 @@ struct se_device { ...@@ -756,7 +754,6 @@ struct se_device {
struct task_struct *dev_mgmt_thread; 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 ordered_cmd_list;
struct list_head execute_task_list; struct list_head execute_task_list;
struct list_head state_task_list; struct list_head state_task_list;
struct list_head qf_cmd_list; struct list_head qf_cmd_list;
......
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