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

Commit fd5e64de authored by Bart Van Assche's avatar Bart Van Assche Committed by Nicholas Bellinger
Browse files

target: Remove command flag CMD_T_BUSY 



The patch that reworks task management function handling guarantees
that target_remove_from_state_list() is always called with CMD_T_BUSY
cleared. Since that function is the only function that tests that flag
this means that that flag is now superfluous. Hence remove that flag.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarAndy Grover <agrover@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 6b6427b6

drivers/target/target_core_sbc.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes 


	spin_lock_irq(&cmd->t_state_lock);

	cmd->t_state = TRANSPORT_PROCESSING;

	cmd->transport_state |= CMD_T_ACTIVE|CMD_T_BUSY|CMD_T_SENT;

	cmd->transport_state |= CMD_T_ACTIVE | CMD_T_SENT;

	spin_unlock_irq(&cmd->t_state_lock);



	__target_execute_cmd(cmd, false);

drivers/target/target_core_transport.c

+4 −8
Original line number Diff line number Diff line
@@ -593,9 +593,6 @@ static void target_remove_from_state_list(struct se_cmd *cmd) 
	if (!dev)

		return;



	if (cmd->transport_state & CMD_T_BUSY)

		return;



	spin_lock_irqsave(&dev->execute_task_lock, flags);

	if (cmd->state_active) {

		list_del(&cmd->state_list);
@@ -714,7 +711,6 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) 




	spin_lock_irqsave(&cmd->t_state_lock, flags);

	cmd->transport_state &= ~CMD_T_BUSY;



	if (dev && dev->transport->transport_complete) {

		dev->transport->transport_complete(cmd,
@@ -1782,7 +1778,7 @@ void __target_execute_cmd(struct se_cmd *cmd, bool do_checks) 
		return;

err:

	spin_lock_irq(&cmd->t_state_lock);

	cmd->transport_state &= ~(CMD_T_BUSY|CMD_T_SENT);

	cmd->transport_state &= ~CMD_T_SENT;

	spin_unlock_irq(&cmd->t_state_lock);



	transport_generic_request_failure(cmd, ret);
@@ -1810,7 +1806,7 @@ static int target_write_prot_action(struct se_cmd *cmd) 
					     sectors, 0, cmd->t_prot_sg, 0);

		if (unlikely(cmd->pi_err)) {

			spin_lock_irq(&cmd->t_state_lock);

			cmd->transport_state &= ~(CMD_T_BUSY|CMD_T_SENT);

			cmd->transport_state &= ~CMD_T_SENT;

			spin_unlock_irq(&cmd->t_state_lock);

			transport_generic_request_failure(cmd, cmd->pi_err);

			return -1;
@@ -1899,7 +1895,7 @@ void target_execute_cmd(struct se_cmd *cmd) 
	}



	cmd->t_state = TRANSPORT_PROCESSING;

	cmd->transport_state |= CMD_T_ACTIVE|CMD_T_BUSY|CMD_T_SENT;

	cmd->transport_state |= CMD_T_ACTIVE | CMD_T_SENT;

	spin_unlock_irq(&cmd->t_state_lock);



	if (target_write_prot_action(cmd))
@@ -1907,7 +1903,7 @@ void target_execute_cmd(struct se_cmd *cmd) 


	if (target_handle_task_attr(cmd)) {

		spin_lock_irq(&cmd->t_state_lock);

		cmd->transport_state &= ~(CMD_T_BUSY | CMD_T_SENT);

		cmd->transport_state &= ~CMD_T_SENT;

		spin_unlock_irq(&cmd->t_state_lock);

		return;

	}

include/target/target_core_base.h

+0 −1
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ struct se_cmd { 
#define CMD_T_SENT		(1 << 4)

#define CMD_T_STOP		(1 << 5)

#define CMD_T_DEV_ACTIVE	(1 << 7)

#define CMD_T_BUSY		(1 << 9)

#define CMD_T_TAS		(1 << 10)

#define CMD_T_FABRIC_STOP	(1 << 11)

	spinlock_t		t_state_lock;