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

Commit 33c3fafc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

target: remove the t_tasks_bidi se_cmd field 



And use a SCF_BIDI flag instead.

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

drivers/target/loopback/tcm_loop.c

+3 −5
Original line number Diff line number Diff line
@@ -113,11 +113,9 @@ static struct se_cmd *tcm_loop_allocate_core_cmd( 
			scsi_bufflen(sc), sc->sc_data_direction, sam_task_attr,

			&tl_cmd->tl_sense_buf[0]);



	/*

	 * Signal BIDI usage with T_TASK(cmd)->t_tasks_bidi

	 */

	if (scsi_bidi_cmnd(sc))

		se_cmd->t_tasks_bidi = 1;

		se_cmd->se_cmd_flags |= SCF_BIDI;



	/*

	 * Locate the struct se_lun pointer and attach it to struct se_cmd

	 */
@@ -154,7 +152,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd) 
	 * For BIDI commands, pass in the extra READ buffer

	 * to transport_generic_map_mem_to_cmd() below..

	 */

	if (se_cmd->t_tasks_bidi) {

	if (se_cmd->se_cmd_flags & SCF_BIDI) {

		struct scsi_data_buffer *sdb = scsi_in(sc);



		sgl_bidi = sdb->table.sgl;

drivers/target/target_core_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -2598,7 +2598,7 @@ static int transport_generic_cmd_sequencer( 
		break;

	case XDWRITEREAD_10:

		if ((cmd->data_direction != DMA_TO_DEVICE) ||

		    !(cmd->t_tasks_bidi))

		    !(cmd->se_cmd_flags & SCF_BIDI))

			goto out_invalid_cdb_field;

		sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);

		if (sector_ret)

include/target/target_core_base.h

+1 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ enum se_cmd_flags_table { 
	SCF_FUA				= 0x00000200,

	SCF_SE_LUN_CMD			= 0x00000800,

	SCF_SE_ALLOW_EOO		= 0x00001000,

	SCF_BIDI			= 0x00002000,

	SCF_SENT_CHECK_CONDITION	= 0x00004000,

	SCF_OVERFLOW_BIT		= 0x00008000,

	SCF_UNDERFLOW_BIT		= 0x00010000,
@@ -459,7 +460,6 @@ struct se_cmd { 
	unsigned char		__t_task_cdb[TCM_MAX_COMMAND_SIZE];

	unsigned long long	t_task_lba;

	int			t_tasks_failed;

	bool			t_tasks_bidi;

	u32			t_tasks_sg_chained_no;

	atomic_t		t_fe_count;

	atomic_t		t_se_count;