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>

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index c0deee33037ca7c5fded4dc7e49ec307dbbb2e0b..5c1b8c599f6df522c64d385dc83248123426c186 100644 (file)
--- 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);