diff options
| author | Nicholas Bellinger | 2011-09-29 10:01:35 +0200 |
|---|---|---|
| committer | Nicholas Bellinger | 2011-10-24 05:20:01 +0200 |
| commit | 77039d1eafbbc192df71ee84b157b8973766737d (patch) | |
| tree | c2066c32153765fa1a605d02ec1861dd6ee85ec5 /drivers/target/target_core_transport.c | |
| parent | target: Prevent TRANSPORT_FREE_CMD_INTR processing in core_tmr_drain_cmd_list (diff) | |
| download | kernel-qcow2-linux-77039d1eafbbc192df71ee84b157b8973766737d.tar.gz kernel-qcow2-linux-77039d1eafbbc192df71ee84b157b8973766737d.tar.xz kernel-qcow2-linux-77039d1eafbbc192df71ee84b157b8973766737d.zip | |
target: Fix transport_cmd_finish_abort queue removal bug
This patch fixes a bug in LUN_RESET operation with transport_cmd_finish_abort()
where transport_remove_cmd_from_queue() was incorrectly being called, causing
descriptors with t_state == TRANSPORT_FREE_CMD_INTR to be incorrectly removed
from qobj->qobj_list during process context release. This change ensures the
descriptor is only removed via transport_remove_cmd_from_queue() when doing a
direct release via transport_generic_remove().
Cc: stable@kernel.org
Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
Diffstat (limited to 'drivers/target/target_core_transport.c')
| -rw-r--r-- | drivers/target/target_core_transport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 046da7f38230..009547b35574 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -593,13 +593,14 @@ check_lun: void transport_cmd_finish_abort(struct se_cmd *cmd, int remove) { - transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj); transport_lun_remove_cmd(cmd); if (transport_cmd_check_stop_to_fabric(cmd)) return; - if (remove) + if (remove) { + transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj); transport_generic_remove(cmd, 0); + } } void transport_cmd_finish_abort_tmr(struct se_cmd *cmd) |