Commit 0fa50a8b authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: target: core: Remove target_submit_cmd_map_sgls() 

Convert target_submit_cmd() to do its own calls and then remove
target_submit_cmd_map_sgls() since no one uses it.

Link: https://lore.kernel.org/r/20210227170006.5077-15-michael.christie@oracle.com


Tested-by: default avatarLaurence Oberman <loberman@redhat.com>
Reviewed-by: default avatarBodo Stroesser <bostroesser@gmail.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 47edc84f

drivers/target/target_core_transport.c

+17 −59
Original line number Diff line number Diff line
@@ -1754,8 +1754,7 @@ void target_submit(struct se_cmd *se_cmd) 
EXPORT_SYMBOL_GPL(target_submit);



/**

 * target_submit_cmd_map_sgls - lookup unpacked lun and submit uninitialized

 *					se_cmd + use pre-allocated SGL memory.

 * target_submit_cmd - lookup unpacked lun and submit uninitialized se_cmd

 *

 * @se_cmd: command descriptor to submit

 * @se_sess: associated se_sess for endpoint
@@ -1766,76 +1765,35 @@ EXPORT_SYMBOL_GPL(target_submit); 
 * @task_attr: SAM task attribute

 * @data_dir: DMA data direction

 * @flags: flags for command submission from target_sc_flags_tables

 * @sgl: struct scatterlist memory for unidirectional mapping

 * @sgl_count: scatterlist count for unidirectional mapping

 * @sgl_bidi: struct scatterlist memory for bidirectional READ mapping

 * @sgl_bidi_count: scatterlist count for bidirectional READ mapping

 * @sgl_prot: struct scatterlist memory protection information

 * @sgl_prot_count: scatterlist count for protection information

 *

 * Task tags are supported if the caller has set @se_cmd->tag.

 *

 * Returns non zero to signal active I/O shutdown failure.  All other

 * setup exceptions will be returned as a SCSI CHECK_CONDITION response,

 * but still return zero here.

 *

 * This may only be called from process context, and also currently

 * assumes internal allocation of fabric payload buffer by target-core.

 *

 * It also assumes interal target core SGL memory allocation.

 *

 * This function must only be used by drivers that do their own

 * sync during shutdown and does not use target_stop_session. If there

 * is a failure this function will call into the fabric driver's

 * queue_status with a CHECK_CONDITION.

 */

int target_submit_cmd_map_sgls(struct se_cmd *se_cmd, struct se_session *se_sess,

void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,

		unsigned char *cdb, unsigned char *sense, u64 unpacked_lun,

		u32 data_length, int task_attr, int data_dir, int flags,

		struct scatterlist *sgl, u32 sgl_count,

		struct scatterlist *sgl_bidi, u32 sgl_bidi_count,

		struct scatterlist *sgl_prot, u32 sgl_prot_count)

		u32 data_length, int task_attr, int data_dir, int flags)

{

	int rc;



	rc = target_init_cmd(se_cmd, se_sess, sense, unpacked_lun,

			     data_length, task_attr, data_dir, flags);

	if (rc < 0)

		return rc;

	rc = target_init_cmd(se_cmd, se_sess, sense, unpacked_lun, data_length,

			     task_attr, data_dir, flags);

	WARN(rc, "Invalid target_submit_cmd use. Driver must not use target_stop_session or call target_init_cmd directly.\n");

	if (rc)

		return;



	if (target_submit_prep(se_cmd, cdb, sgl, sgl_count, sgl_bidi,

			       sgl_bidi_count, sgl_prot, sgl_prot_count))

		return 0;

	if (target_submit_prep(se_cmd, cdb, NULL, 0, NULL, 0, NULL, 0))

		return;



	target_submit(se_cmd);

	return 0;

}

EXPORT_SYMBOL(target_submit_cmd_map_sgls);



/**

 * target_submit_cmd - lookup unpacked lun and submit uninitialized se_cmd

 *

 * @se_cmd: command descriptor to submit

 * @se_sess: associated se_sess for endpoint

 * @cdb: pointer to SCSI CDB

 * @sense: pointer to SCSI sense buffer

 * @unpacked_lun: unpacked LUN to reference for struct se_lun

 * @data_length: fabric expected data transfer length

 * @task_attr: SAM task attribute

 * @data_dir: DMA data direction

 * @flags: flags for command submission from target_sc_flags_tables

 *

 * Task tags are supported if the caller has set @se_cmd->tag.

 *

 * Returns non zero to signal active I/O shutdown failure.  All other

 * setup exceptions will be returned as a SCSI CHECK_CONDITION response,

 * but still return zero here.

 *

 * This may only be called from process context, and also currently

 * assumes internal allocation of fabric payload buffer by target-core.

 *

 * It also assumes interal target core SGL memory allocation.

 */

int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,

		unsigned char *cdb, unsigned char *sense, u64 unpacked_lun,

		u32 data_length, int task_attr, int data_dir, int flags)

{

	return target_submit_cmd_map_sgls(se_cmd, se_sess, cdb, sense,

			unpacked_lun, data_length, task_attr, data_dir,

			flags, NULL, 0, NULL, 0, NULL, 0);

}

EXPORT_SYMBOL(target_submit_cmd);

include/target/target_core_fabric.h

+1 −5
Original line number Diff line number Diff line
@@ -162,11 +162,7 @@ void target_submit(struct se_cmd *se_cmd); 
sense_reason_t transport_lookup_cmd_lun(struct se_cmd *);

sense_reason_t target_cmd_init_cdb(struct se_cmd *, unsigned char *);

sense_reason_t target_cmd_parse_cdb(struct se_cmd *);

int	target_submit_cmd_map_sgls(struct se_cmd *, struct se_session *,

		unsigned char *, unsigned char *, u64, u32, int, int, int,

		struct scatterlist *, u32, struct scatterlist *, u32,

		struct scatterlist *, u32);

int	target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,

void	target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,

		unsigned char *, u64, u32, int, int, int);

int	target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,

		unsigned char *sense, u64 unpacked_lun,