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

Commit 8dc52b54 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Merge transport_cmd_finish_abort_tmr into transport_cmd_finish_abort 



This patch merges transport_cmd_finish_abort_tmr() logic into a single
transport_cmd_finish_abort() function by adding a cmd->se_tmr_req check
around transport_lun_remove_cmd(), and updates the single caller within
core_tmr_drain_tmr_list().

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent d270190a

drivers/target/target_core_tmr.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void core_tmr_drain_tmr_list( 
			(preempt_and_abort_list) ? "Preempt" : "", tmr,

			tmr->function, tmr->response, cmd->t_state);



		transport_cmd_finish_abort_tmr(cmd);

		transport_cmd_finish_abort(cmd, 1);

	}

}

drivers/target/target_core_transport.c

+2 −11
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ check_lun: 


void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)

{

	if (!cmd->se_tmr_req)

		transport_lun_remove_cmd(cmd);



	if (transport_cmd_check_stop_to_fabric(cmd))
@@ -601,16 +602,6 @@ void transport_cmd_finish_abort(struct se_cmd *cmd, int remove) 
	}

}



void transport_cmd_finish_abort_tmr(struct se_cmd *cmd)

{

	transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj);



	if (transport_cmd_check_stop_to_fabric(cmd))

		return;



	transport_put_cmd(cmd);

}



static void transport_add_cmd_to_queue(

	struct se_cmd *cmd,

	int t_state)

include/target/target_core_transport.h

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ extern void transport_free_session(struct se_session *); 
extern void transport_deregister_session_configfs(struct se_session *);

extern void transport_deregister_session(struct se_session *);

extern void transport_cmd_finish_abort(struct se_cmd *, int);

extern void transport_cmd_finish_abort_tmr(struct se_cmd *);

extern void transport_complete_sync_cache(struct se_cmd *, int);

extern void transport_complete_task(struct se_task *, int);

extern void transport_add_task_to_execute_queue(struct se_task *,