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

scsi: change spdk_put_task to spdk_scsi_task_put

Browse Source 
Change-Id: I2598627523b2a78b68d7e7fdadbb7d8ef44592b9
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-09-28 14:49:06 +08:00 committed by Daniel Verkamp
parent 19dff91a1b
commit 6c4a07ecbe
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk/scsi.h
View File

@ -249,7 +249,7 @@ int spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id,
void spdk_scsi_task_construct(struct spdk_scsi_task *task, uint32_t *owner_task_ctr, void spdk_scsi_task_construct(struct spdk_scsi_task *task, uint32_t *owner_task_ctr,
struct spdk_scsi_task *parent); struct spdk_scsi_task *parent);
void spdk_put_task(struct spdk_scsi_task *task); void spdk_scsi_task_put(struct spdk_scsi_task *task);
void spdk_scsi_task_alloc_data(struct spdk_scsi_task *task, uint32_t alloc_len, void spdk_scsi_task_alloc_data(struct spdk_scsi_task *task, uint32_t alloc_len,
uint8_t **data); uint8_t **data);
int spdk_scsi_task_build_sense_data(struct spdk_scsi_task *task, int sk, int asc, int spdk_scsi_task_build_sense_data(struct spdk_scsi_task *task, int sk, int asc,

2
lib/iscsi/task.h
View File

@ -80,7 +80,7 @@ struct spdk_iscsi_task {
static inline void static inline void
spdk_iscsi_task_put(struct spdk_iscsi_task *task) spdk_iscsi_task_put(struct spdk_iscsi_task *task)
{ {
spdk_put_task(&task->scsi); spdk_scsi_task_put(&task->scsi);
} }
static inline struct spdk_iscsi_pdu * static inline struct spdk_iscsi_pdu *

4
lib/scsi/task.c
View File

@ -39,7 +39,7 @@
#include <rte_malloc.h> #include <rte_malloc.h>
void void
spdk_put_task(struct spdk_scsi_task *task) spdk_scsi_task_put(struct spdk_scsi_task *task)
{ {
if (!task) { if (!task) {
return; return;
@ -51,7 +51,7 @@ spdk_put_task(struct spdk_scsi_task *task)
struct spdk_bdev_io *bdev_io = task->blockdev_io; struct spdk_bdev_io *bdev_io = task->blockdev_io;
if (task->parent) { if (task->parent) {
spdk_put_task(task->parent); spdk_scsi_task_put(task->parent);
task->parent = NULL; task->parent = NULL;
} }

2
test/lib/iscsi/common.c
View File

@ -19,7 +19,7 @@ spdk_iscsi_task_get(uint32_t *owner_task_ctr, struct spdk_iscsi_task *parent)
} }
void void
spdk_put_task(struct spdk_scsi_task *task) spdk_scsi_task_put(struct spdk_scsi_task *task)
{ {
free(task); free(task);
} }

10
test/lib/scsi/dev/dev_ut.c
View File

@ -67,7 +67,7 @@ spdk_get_task(uint32_t *owner_task_ctr)
} }
void void
spdk_put_task(struct spdk_scsi_task *task) spdk_scsi_task_put(struct spdk_scsi_task *task)
{ {
g_task_count--; g_task_count--;
@ -250,7 +250,7 @@ dev_queue_mgmt_task_success(void)
spdk_scsi_dev_queue_mgmt_task(dev, task); spdk_scsi_dev_queue_mgmt_task(dev, task);
spdk_put_task(task); spdk_scsi_task_put(task);
spdk_scsi_dev_destruct(dev); spdk_scsi_dev_destruct(dev);
} }
@ -272,7 +272,7 @@ dev_queue_task_success(void)
spdk_scsi_dev_queue_task(dev, task); spdk_scsi_dev_queue_task(dev, task);
spdk_put_task(task); spdk_scsi_task_put(task);
spdk_scsi_dev_destruct(dev); spdk_scsi_dev_destruct(dev);
} }
@ -293,8 +293,8 @@ dev_stop_success(void)
/* Enqueue the tasks into dev->task_mgmt_submit_queue*/ /* Enqueue the tasks into dev->task_mgmt_submit_queue*/
spdk_scsi_dev_queue_mgmt_task(&dev, task_mgmt); spdk_scsi_dev_queue_mgmt_task(&dev, task_mgmt);
spdk_put_task(task); spdk_scsi_task_put(task);
spdk_put_task(task_mgmt); spdk_scsi_task_put(task_mgmt);
} }
static void static void

32
test/lib/scsi/lun/lun_ut.c
View File

@ -73,7 +73,7 @@ spdk_get_task(uint32_t *owner_task_ctr)
} }
void void
spdk_put_task(struct spdk_scsi_task *task) spdk_scsi_task_put(struct spdk_scsi_task *task)
{ {
g_task_count--; g_task_count--;
@ -205,7 +205,7 @@ lun_task_mgmt_execute_abort_task_null_lun_failure(void)
rc = spdk_scsi_lun_task_mgmt_execute(mgmt_task); rc = spdk_scsi_lun_task_mgmt_execute(mgmt_task);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
/* returns -1 since we passed NULL for LUN */ /* returns -1 since we passed NULL for LUN */
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
@ -255,8 +255,8 @@ lun_task_mgmt_execute_abort_task_not_supported(void)
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED); CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
spdk_put_task(task); spdk_scsi_task_put(task);
lun_destruct(lun); lun_destruct(lun);
@ -280,7 +280,7 @@ lun_task_mgmt_execute_abort_task_all_null_lun_failure(void)
/* Returns -1 since we passed NULL for lun */ /* Returns -1 since we passed NULL for lun */
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
@ -326,8 +326,8 @@ lun_task_mgmt_execute_abort_task_all_not_supported(void)
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED); CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
spdk_put_task(task); spdk_scsi_task_put(task);
lun_destruct(lun); lun_destruct(lun);
@ -349,7 +349,7 @@ lun_task_mgmt_execute_lun_reset_failure(void)
/* Returns -1 since we passed NULL for lun */ /* Returns -1 since we passed NULL for lun */
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
@ -374,7 +374,7 @@ lun_task_mgmt_execute_lun_reset(void)
/* Returns success */ /* Returns success */
CU_ASSERT_EQUAL(rc, 0); CU_ASSERT_EQUAL(rc, 0);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
lun_destruct(lun); lun_destruct(lun);
@ -401,7 +401,7 @@ lun_task_mgmt_execute_invalid_case(void)
/* Returns -1 on passing an invalid value to the switch case */ /* Returns -1 on passing an invalid value to the switch case */
CU_ASSERT_TRUE(rc < 0); CU_ASSERT_TRUE(rc < 0);
spdk_put_task(mgmt_task); spdk_scsi_task_put(mgmt_task);
lun_destruct(lun); lun_destruct(lun);
@ -427,7 +427,7 @@ lun_append_task_null_lun_task_cdb_spc_inquiry(void)
CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD); CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD);
spdk_put_task(task); spdk_scsi_task_put(task);
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
@ -452,7 +452,7 @@ lun_append_task_null_lun_alloc_len_lt_4096(void)
CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD); CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD);
spdk_put_task(task); spdk_scsi_task_put(task);
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
@ -473,7 +473,7 @@ lun_append_task_null_lun_not_supported(void)
/* LUN not supported; task's data transferred should be 0 */ /* LUN not supported; task's data transferred should be 0 */
CU_ASSERT_EQUAL(task->data_transferred, 0); CU_ASSERT_EQUAL(task->data_transferred, 0);
spdk_put_task(task); spdk_scsi_task_put(task);
CU_ASSERT_EQUAL(g_task_count, 0); CU_ASSERT_EQUAL(g_task_count, 0);
} }
@ -511,7 +511,7 @@ lun_execute_task_set_full(void)
CU_ASSERT(TAILQ_EMPTY(&lun->tasks)); CU_ASSERT(TAILQ_EMPTY(&lun->tasks));
CU_ASSERT(task->status == SPDK_SCSI_STATUS_TASK_SET_FULL); CU_ASSERT(task->status == SPDK_SCSI_STATUS_TASK_SET_FULL);
spdk_put_task(task); spdk_scsi_task_put(task);
lun_destruct(lun); lun_destruct(lun);
@ -550,7 +550,7 @@ lun_execute_scsi_task_pending(void)
/* Assert the task has been successfully added to the tasks queue */ /* Assert the task has been successfully added to the tasks queue */
CU_ASSERT(!TAILQ_EMPTY(&lun->tasks)); CU_ASSERT(!TAILQ_EMPTY(&lun->tasks));
spdk_put_task(task); spdk_scsi_task_put(task);
lun_destruct(lun); lun_destruct(lun);
@ -589,7 +589,7 @@ lun_execute_scsi_task_complete(void)
/* Assert the task has not been added to the tasks queue */ /* Assert the task has not been added to the tasks queue */
CU_ASSERT(TAILQ_EMPTY(&lun->tasks)); CU_ASSERT(TAILQ_EMPTY(&lun->tasks));
spdk_put_task(task); spdk_scsi_task_put(task);
lun_destruct(lun); lun_destruct(lun);