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

torvalds · torvalds · commit fda604a4daa1 · 2016-03-12T17:14:07.000-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-&gt;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-&gt;tag lookup"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Drop incorrect ABORT_TASK put for completed commands
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ void core_tmr_abort_task(`
`177`	`177`
`178`	`178`	`if (!__target_check_io_state(se_cmd, se_sess, 0)) {`
`179`	`179`	`spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);`
`180`		`- target_put_sess_cmd(se_cmd);`
`181`	`180`	`goto out;`
`182`	`181`	`}`
`183`	`182`	`list_del_init(&se_cmd->se_cmd_list);`