Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b45b161d authored Nov 30, 2012 by Linus Torvalds

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

Pull target fix from Nicholas Bellinger:
 "So just a single target fix for v3.7.0 this time around from Roland to
  address a aborted command bug w/ tcm_qla2xxx fabric ports.

  Also, there is one outstanding IBLOCK + virtio-blk bug that is still
  being tracked down effecting v3.6.x, but AFAICT thus far this appears
  to be a bug outside of target code."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Fix handling of aborted commands

parents cc19528b 3ea160b3

drivers/target/target_core_transport.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1819,8 +1819,10 @@ void target_execute_cmd(struct se_cmd *cmd)
		/*
		* If the received CDB has aleady been aborted stop processing it here.
		*/
		if (transport_check_aborted_status(cmd, 1))
		if (transport_check_aborted_status(cmd, 1)) {
		complete(&cmd->t_transport_stop_comp);
		return;
		}

		/*
		* Determine if IOCTL context caller in requesting the stopping of this
		@@ -3067,7 +3069,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
		unsigned long flags;

		spin_lock_irqsave(&cmd->t_state_lock, flags);
		if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
		if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION \| SCF_SENT_DELAYED_TAS)) {
		spin_unlock_irqrestore(&cmd->t_state_lock, flags);
		return;
		}