d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi: add parameter to simplify process_task_completion

Browse Source 
For process_read-task_completion, add a
new paramter and remove the duplicated code
since this function is the critical path

Change-Id: I6a56327def717ee965c701383f01d6745a8c6988
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-09-28 14:13:07 +08:00 committed by Ben Walker
parent 1ad2c3ea73
commit 8c00dca640
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/iscsi/conn.c
View File

@ -861,19 +861,16 @@ process_completed_read_subtask_list(struct spdk_iscsi_conn *conn,
break;
}
}
}
static void
process_read_task_completion(struct spdk_iscsi_conn *conn,
struct spdk_iscsi_task *task)
struct spdk_iscsi_task *task,
struct spdk_iscsi_task *primary)
{
struct spdk_iscsi_task *primary;
struct spdk_scsi_task *tmp;
bool flag = false;
primary = spdk_iscsi_task_get_primary(task);
if ((task != primary) &&
(task->scsi.offset != primary->scsi.bytes_completed)) {
TAILQ_FOREACH(tmp, &primary->scsi.subtask_list, scsi_link) {
@ -912,11 +909,11 @@ void process_task_completion(spdk_event_t event)
primary = spdk_iscsi_task_get_primary(task);
if (spdk_iscsi_task_is_read(primary)) {
process_read_task_completion(conn, task);
return;
process_read_task_completion(conn, task, primary);
} else {
primary->scsi.bytes_completed += task->scsi.length;
if (task->scsi.parent != NULL && task->scsi.status != SPDK_SCSI_STATUS_GOOD) {
if ((task != primary) &&
(task->scsi.status != SPDK_SCSI_STATUS_GOOD)) {
memcpy(primary->scsi.sense_data, task->scsi.sense_data,
task->scsi.sense_data_len);
primary->scsi.status = task->scsi.status;
@ -925,7 +922,7 @@ void process_task_completion(spdk_event_t event)
if (primary->scsi.bytes_completed == primary->scsi.transfer_len) {
spdk_del_transfer_task(conn, primary->scsi.id);
spdk_iscsi_task_response(conn, primary);
if (task->scsi.parent) {
if (task != primary) {
TAILQ_REMOVE(&conn->active_r2t_tasks, primary, link);
spdk_iscsi_task_put(primary);
}