Commit 3176d5ab authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/iscsi: Change iscsi_queue_task() from private to public 



Subsequent patches will move a few functions which call
iscsi_queue_task() from iscsi.c to conn.c.  This patch is a
preparation to it.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Id136b5d3bf76a9894162115dd0d57d997178c869
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477415


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ff7e7c83

lib/iscsi/iscsi.c

+7 −7
Original line number Diff line number Diff line
@@ -3202,8 +3202,8 @@ iscsi_compare_pdu_bhs_within_existed_r2t_tasks(struct spdk_iscsi_conn *conn, 
	return false;

}



static void

iscsi_queue_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task)

void

spdk_iscsi_queue_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task)

{

	spdk_trace_record(TRACE_ISCSI_TASK_QUEUE, conn->id, task->scsi.length,

			  (uintptr_t)task, (uintptr_t)task->pdu);
@@ -3242,7 +3242,7 @@ int spdk_iscsi_conn_handle_queued_datain_tasks(struct spdk_iscsi_conn *conn) 


			subtask->scsi.length = spdk_min(SPDK_BDEV_LARGE_BUF_MAX_SIZE, remaining_size);

			task->current_datain_offset += subtask->scsi.length;

			iscsi_queue_task(conn, subtask);

			spdk_iscsi_queue_task(conn, subtask);

		}

		if (task->current_datain_offset == task->scsi.transfer_len) {

			TAILQ_REMOVE(&conn->queued_datain_tasks, task, link);
@@ -3260,7 +3260,7 @@ iscsi_pdu_payload_op_scsi_read(struct spdk_iscsi_conn *conn, struct spdk_iscsi_t 
		task->scsi.length = task->scsi.transfer_len;

		spdk_scsi_task_set_data(&task->scsi, NULL, 0);



		iscsi_queue_task(conn, task);

		spdk_iscsi_queue_task(conn, task);

		return 0;

	} else {

		TAILQ_INIT(&task->subtask_list);
@@ -3318,7 +3318,7 @@ iscsi_pdu_payload_op_scsi_write(struct spdk_iscsi_conn *conn, struct spdk_iscsi_ 
		task->scsi.length = transfer_len;

	}



	iscsi_queue_task(conn, task);

	spdk_iscsi_queue_task(conn, task);

	return 0;

}
@@ -3457,7 +3457,7 @@ iscsi_pdu_payload_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p 
	case SPDK_SCSI_DIR_TO_DEV:

		return iscsi_pdu_payload_op_scsi_write(conn, task);

	case SPDK_SCSI_DIR_NONE:

		iscsi_queue_task(conn, task);

		spdk_iscsi_queue_task(conn, task);

		return 0;

	default:

		assert(false);
@@ -4450,7 +4450,7 @@ iscsi_pdu_payload_op_data(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p 
		return 0;

	}



	iscsi_queue_task(conn, subtask);

	spdk_iscsi_queue_task(conn, subtask);

	return 0;

}

lib/iscsi/iscsi.h

+1 −0
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ struct spdk_iscsi_pdu *spdk_get_pdu(void); 
int spdk_iscsi_conn_handle_queued_datain_tasks(struct spdk_iscsi_conn *conn);

void spdk_iscsi_op_abort_task_set(struct spdk_iscsi_task *task,

				  uint8_t function);

void spdk_iscsi_queue_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task);



static inline uint32_t

spdk_get_max_immediate_data_size(void)