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

Commit 2281c95f authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: target/core: Simplify the LUN RESET implementation 



Due to the task management handling rework it is safe to wait for a TMF
that is not in the active state. Hence remove the CMD_T_ACTIVE test from
core_tmr_drain_tmr_list(). Additionally, call __target_check_io_state()
instead of open coding it.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3f0661a4

drivers/target/target_core_tmr.c

+2 −12
Original line number Diff line number Diff line
@@ -217,23 +217,13 @@ static void core_tmr_drain_tmr_list( 
			continue;



		spin_lock(&sess->sess_cmd_lock);

		spin_lock(&cmd->t_state_lock);

		if (!(cmd->transport_state & CMD_T_ACTIVE) ||

		     (cmd->transport_state & CMD_T_FABRIC_STOP)) {

			spin_unlock(&cmd->t_state_lock);

		rc = __target_check_io_state(cmd, sess, 0);

		spin_unlock(&sess->sess_cmd_lock);

			continue;

		}

		cmd->transport_state |= CMD_T_ABORTED;

		spin_unlock(&cmd->t_state_lock);



		rc = kref_get_unless_zero(&cmd->cmd_kref);

		if (!rc) {

			printk("LUN_RESET TMR: non-zero kref_get_unless_zero\n");

			spin_unlock(&sess->sess_cmd_lock);

			continue;

		}

		spin_unlock(&sess->sess_cmd_lock);



		list_move_tail(&tmr_p->tmr_list, &drain_tmr_list);

	}