ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Id136b5d3bf76a9894162115dd0d57d997178c869
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477415
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-12-09 17:58:47 -05:00 committed by Tomasz Zawadzki
parent ff7e7c83e6
commit 3176d5ab14
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/iscsi/iscsi.c
View File

@ -3202,8 +3202,8 @@ iscsi_compare_pdu_bhs_within_existed_r2t_tasks(struct spdk_iscsi_conn *conn,
return false; return false;
} }
static void void
iscsi_queue_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task) 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, spdk_trace_record(TRACE_ISCSI_TASK_QUEUE, conn->id, task->scsi.length,
(uintptr_t)task, (uintptr_t)task->pdu); (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); subtask->scsi.length = spdk_min(SPDK_BDEV_LARGE_BUF_MAX_SIZE, remaining_size);
task->current_datain_offset += subtask->scsi.length; 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) { if (task->current_datain_offset == task->scsi.transfer_len) {
TAILQ_REMOVE(&conn->queued_datain_tasks, task, link); 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; task->scsi.length = task->scsi.transfer_len;
spdk_scsi_task_set_data(&task->scsi, NULL, 0); spdk_scsi_task_set_data(&task->scsi, NULL, 0);
iscsi_queue_task(conn, task); spdk_iscsi_queue_task(conn, task);
return 0; return 0;
} else { } else {
TAILQ_INIT(&task->subtask_list); 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; task->scsi.length = transfer_len;
} }
iscsi_queue_task(conn, task); spdk_iscsi_queue_task(conn, task);
return 0; 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: case SPDK_SCSI_DIR_TO_DEV:
return iscsi_pdu_payload_op_scsi_write(conn, task); return iscsi_pdu_payload_op_scsi_write(conn, task);
case SPDK_SCSI_DIR_NONE: case SPDK_SCSI_DIR_NONE:
iscsi_queue_task(conn, task); spdk_iscsi_queue_task(conn, task);
return 0; return 0;
default: default:
assert(false); assert(false);
@ -4450,7 +4450,7 @@ iscsi_pdu_payload_op_data(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p
return 0; return 0;
} }
iscsi_queue_task(conn, subtask); spdk_iscsi_queue_task(conn, subtask);
return 0; return 0;
} }

1
lib/iscsi/iscsi.h
View File

@ -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); 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, void spdk_iscsi_op_abort_task_set(struct spdk_iscsi_task *task,
uint8_t function); uint8_t function);
void spdk_iscsi_queue_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task);
static inline uint32_t static inline uint32_t
spdk_get_max_immediate_data_size(void) spdk_get_max_immediate_data_size(void)