summaryrefslogtreecommitdiff
path: root/drivers/target
diff options
context:
space:
mode:
authorJoern Engel <joern@logfs.org>2011-10-26 13:37:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:44:38 -0800
commit8981e86717bf2d682bf08db846d7daafd9fb6a45 (patch)
treef032c8f22d165452eef80bb63ed568be7e1d8b24 /drivers/target
parenta1dc5b0de6f3083000c3b990dc319dd842ad7420 (diff)
target: Fix wrong se_tmr being added to drain_tmr_list
commit 6eb40b2af4908e9aee71e43e7a384243128c56dd upstream. This patch fixes another bug from LUN_RESET re-org fallout in core_tmr_drain_tmr_list() that was adding the wrong se_tmr_req into the local drain_tmr_list to be walked + released. Signed-off-by: Joern Engel <joern@logfs.org> Cc: Joern Engel <joern@logfs.org> Reviewed-by: Roland Dreier <roland@purestorage.com> Cc: Roland Dreier <roland@purestorage.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_tmr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index c0deee33037c..5c1b8c599f6d 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -148,7 +148,7 @@ static void core_tmr_drain_tmr_list(
}
spin_unlock(&cmd->t_state_lock);
- list_move_tail(&tmr->tmr_list, &drain_tmr_list);
+ list_move_tail(&tmr_p->tmr_list, &drain_tmr_list);
}
spin_unlock_irqrestore(&dev->se_tmr_lock, flags);