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

Commit 67441b68 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

iscsit: use target_execute_cmd for WRITEs 



All three callers of transport_generic_handle_data are from user context
and can use target_execute_cmd directly to handle the backend I/O submission
of WRITE I/O.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Andy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent c3196f0c

drivers/target/iscsi/iscsi_target.c

+4 −2
Original line number Diff line number Diff line
@@ -1413,8 +1413,10 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf) 
		spin_unlock_bh(&cmd->istate_lock);



		iscsit_stop_dataout_timer(cmd);

		return (!ooo_cmdsn) ? transport_generic_handle_data(

					&cmd->se_cmd) : 0;

		if (ooo_cmdsn)

			return 0;

		target_execute_cmd(&cmd->se_cmd);

		return 0;

	} else /* DATAOUT_CANNOT_RECOVER */

		return -1;

drivers/target/iscsi/iscsi_target_erl1.c

+2 −2
Original line number Diff line number Diff line
@@ -965,8 +965,8 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo) 
		if (cmd->immediate_data) {

			if (cmd->cmd_flags & ICF_GOT_LAST_DATAOUT) {

				spin_unlock_bh(&cmd->istate_lock);

				return transport_generic_handle_data(

						&cmd->se_cmd);

				target_execute_cmd(&cmd->se_cmd);

				return 0;

			}

			spin_unlock_bh(&cmd->istate_lock);

drivers/target/iscsi/iscsi_target_tmr.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static int iscsit_task_reassign_complete_write( 
			pr_debug("WRITE ITT: 0x%08x: t_state: %d"

				" never sent to transport\n",

				cmd->init_task_tag, cmd->se_cmd.t_state);

			return transport_generic_handle_data(se_cmd);

			target_execute_cmd(se_cmd);

			return 0;

		}



		cmd->i_state = ISTATE_SEND_STATUS;