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

Commit 70baf0ab authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

target: remove transport_generic_process_write 



Just call target_execute_cmd directly.  Also, convert loopback, sbp,
usb-gadget to use the newly exported target_execute_cmd().

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

drivers/target/loopback/tcm_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static int tcm_loop_write_pending(struct se_cmd *se_cmd) 
	 * We now tell TCM to add this WRITE CDB directly into the TCM storage

	 * object execution queue.

	 */

	transport_generic_process_write(se_cmd);

	target_execute_cmd(se_cmd);

	return 0;

}

drivers/target/sbp/sbp_target.c

+1 −2
Original line number Diff line number Diff line
@@ -1784,8 +1784,7 @@ static int sbp_write_pending(struct se_cmd *se_cmd) 
		return ret;

	}



	transport_generic_process_write(se_cmd);



	target_execute_cmd(se_cmd);

	return 0;

}

drivers/target/target_core_transport.c

+3 −12
Original line number Diff line number Diff line
@@ -1860,7 +1860,7 @@ static void __target_execute_cmd(struct se_cmd *cmd) 
	}

}



static void target_execute_cmd(struct se_cmd *cmd)

void target_execute_cmd(struct se_cmd *cmd)

{

	struct se_device *dev = cmd->se_dev;
@@ -1950,6 +1950,7 @@ execute: 
	 */

	__target_execute_cmd(cmd);

}

EXPORT_SYMBOL(target_execute_cmd);



/*

 * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd
@@ -2500,16 +2501,6 @@ out_fail: 
}

EXPORT_SYMBOL(transport_generic_new_cmd);



/*	transport_generic_process_write():

 *

 *

 */

void transport_generic_process_write(struct se_cmd *cmd)

{

	target_execute_cmd(cmd);

}

EXPORT_SYMBOL(transport_generic_process_write);



static void transport_write_pending_qf(struct se_cmd *cmd)

{

	int ret;
@@ -3321,7 +3312,7 @@ get_cmd: 
			}

			break;

		case TRANSPORT_PROCESS_WRITE:

			transport_generic_process_write(cmd);

			target_execute_cmd(cmd);

			break;

		case TRANSPORT_PROCESS_TMR:

			transport_generic_do_tmr(cmd);

drivers/usb/gadget/tcm_usb_gadget.c

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int bot_send_write_request(struct usbg_cmd *cmd) 
		pr_err("%s(%d)\n", __func__, __LINE__);



	wait_for_completion(&cmd->write_complete);

	transport_generic_process_write(se_cmd);

	target_execute_cmd(se_cmd);

cleanup:

	return ret;

}
@@ -725,7 +725,7 @@ static int uasp_send_write_request(struct usbg_cmd *cmd) 
	}



	wait_for_completion(&cmd->write_complete);

	transport_generic_process_write(se_cmd);

	target_execute_cmd(se_cmd);

cleanup:

	return ret;

}

include/target/target_core_fabric.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int transport_generic_map_mem_to_cmd(struct se_cmd *cmd, 
		struct scatterlist *, u32, struct scatterlist *, u32);

int	transport_generic_new_cmd(struct se_cmd *);



void	transport_generic_process_write(struct se_cmd *);

void	target_execute_cmd(struct se_cmd *cmd);



void	transport_generic_free_cmd(struct se_cmd *, int);