Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

fda604a4 · Linus Torvalds <[email protected]> · 2016-03-12 17:14:07 -08:00

Pull SCSI target bug fix from Nicholas Bellinger:
 "Here is an outstanding target-core bug-fix for v4.5 code."

  This patch addresses a recent Task Management (TMR) regression related
  to larger set of multi-port LUN_RESET bug-fixes in v4.5-rc5.

  It drops a left-over target_put_sess_cmd() of se_cmd->cmd_kref within
  ABORT_TASK failure path, once a se_cmd descriptor has already
  completed posting response to fabric driver logic, and must be skipped
  during normal ABORT_TASK se_cmd->tag lookup"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Drop incorrect ABORT_TASK put for completed commands

Commit: fda604a4daa19ead458ce5471892fa1d4b382d82
Parents: 03c668a9 · 7f54ab5f

Merge commit. Changes below are compared with the first parent: 03c668a9.

Changes

1 files changed · +0 −1

File	Status	Add	Del	Content
drivers/target/target_core_tmr.c	modified	+0	−1	View file

drivers/target/target_core_tmr.c

View file

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 82a663b..4f229e7 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -177,7 +177,6 @@ void core_tmr_abort_task(
 
 		if (!__target_check_io_state(se_cmd, se_sess, 0)) {
 			spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
-			target_put_sess_cmd(se_cmd);
 			goto out;
 		}
 		list_del_init(&se_cmd->se_cmd_list);