From b60923191de59f001c249d34cade0107e895e005 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 26 Nov 2018 11:05:21 +0900 Subject: [PATCH] scsi: Remove the TMF code parameter because it is already set in task struct This is a preparation to the next patch. Change-Id: Ia7af66ba129a4666730f94be64d3699cded65e09 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/434762 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/scsi/dev.c | 2 +- lib/scsi/lun.c | 5 ++--- lib/scsi/scsi_internal.h | 2 +- test/unit/lib/scsi/dev.c/dev_ut.c | 2 +- test/unit/lib/scsi/lun.c/lun_ut.c | 24 ++++++++++++++++-------- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/lib/scsi/dev.c b/lib/scsi/dev.c index 335ffacba..cdac1b74d 100644 --- a/lib/scsi/dev.c +++ b/lib/scsi/dev.c @@ -252,7 +252,7 @@ spdk_scsi_dev_queue_mgmt_task(struct spdk_scsi_dev *dev, assert(task != NULL); task->function = func; - spdk_scsi_lun_task_mgmt_execute(task, func); + spdk_scsi_lun_task_mgmt_execute(task); } void diff --git a/lib/scsi/lun.c b/lib/scsi/lun.c index ea44d86e3..03ecd6fab 100644 --- a/lib/scsi/lun.c +++ b/lib/scsi/lun.c @@ -68,8 +68,7 @@ spdk_scsi_lun_complete_mgmt_task(struct spdk_scsi_lun *lun, struct spdk_scsi_tas } int -spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task, - enum spdk_scsi_task_func func) +spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task) { if (!task) { return -1; @@ -82,7 +81,7 @@ spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task, return -1; } - switch (func) { + switch (task->function) { case SPDK_SCSI_TASK_FUNC_ABORT_TASK: task->response = SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED; SPDK_ERRLOG("ABORT_TASK failed\n"); diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h index 9f5e6d73b..ac57f65a0 100644 --- a/lib/scsi/scsi_internal.h +++ b/lib/scsi/scsi_internal.h @@ -137,7 +137,7 @@ _spdk_scsi_lun *spdk_scsi_lun_construct(struct spdk_bdev *bdev, void spdk_scsi_lun_destruct(struct spdk_scsi_lun *lun); void spdk_scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task); -int spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task, enum spdk_scsi_task_func func); +int spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task); void spdk_scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task); void spdk_scsi_lun_complete_mgmt_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task); bool spdk_scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun); diff --git a/test/unit/lib/scsi/dev.c/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c index c10a7f0ab..83a453361 100644 --- a/test/unit/lib/scsi/dev.c/dev_ut.c +++ b/test/unit/lib/scsi/dev.c/dev_ut.c @@ -112,7 +112,7 @@ spdk_bdev_get_by_name(const char *bdev_name) } int -spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task, enum spdk_scsi_task_func func) +spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task) { return 0; } diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c index 2237e8ed7..dcd81ac0f 100644 --- a/test/unit/lib/scsi/lun.c/lun_ut.c +++ b/test/unit/lib/scsi/lun.c/lun_ut.c @@ -224,7 +224,7 @@ lun_task_mgmt_execute_null_task(void) { int rc; - rc = spdk_scsi_lun_task_mgmt_execute(NULL, SPDK_SCSI_TASK_FUNC_ABORT_TASK); + rc = spdk_scsi_lun_task_mgmt_execute(NULL); /* returns -1 since we passed NULL for the task */ CU_ASSERT_TRUE(rc < 0); @@ -241,8 +241,9 @@ lun_task_mgmt_execute_abort_task_null_lun_failure(void) ut_init_task(&mgmt_task); mgmt_task.lun = NULL; mgmt_task.initiator_port = &initiator_port; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_ABORT_TASK; - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_ABORT_TASK); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* returns -1 since we passed NULL for LUN */ CU_ASSERT_TRUE(rc < 0); @@ -266,6 +267,7 @@ lun_task_mgmt_execute_abort_task_not_supported(void) ut_init_task(&mgmt_task); mgmt_task.lun = lun; mgmt_task.initiator_port = &initiator_port; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_ABORT_TASK; /* Params to add regular task to the lun->tasks */ ut_init_task(&task); @@ -277,7 +279,7 @@ lun_task_mgmt_execute_abort_task_not_supported(void) /* task should now be on the tasks list */ CU_ASSERT(!TAILQ_EMPTY(&lun->tasks)); - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_ABORT_TASK); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* returns -1 since task abort is not supported */ CU_ASSERT_TRUE(rc < 0); @@ -302,8 +304,9 @@ lun_task_mgmt_execute_abort_task_all_null_lun_failure(void) ut_init_task(&mgmt_task); mgmt_task.lun = NULL; mgmt_task.initiator_port = &initiator_port; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_ABORT_TASK_SET; - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_ABORT_TASK_SET); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* Returns -1 since we passed NULL for lun */ CU_ASSERT_TRUE(rc < 0); @@ -328,6 +331,7 @@ lun_task_mgmt_execute_abort_task_all_not_supported(void) ut_init_task(&mgmt_task); mgmt_task.lun = lun; mgmt_task.initiator_port = &initiator_port; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_ABORT_TASK_SET; /* Params to add regular task to the lun->tasks */ ut_init_task(&task); @@ -340,7 +344,7 @@ lun_task_mgmt_execute_abort_task_all_not_supported(void) /* task should now be on the tasks list */ CU_ASSERT(!TAILQ_EMPTY(&lun->tasks)); - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_ABORT_TASK_SET); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* returns -1 since task abort is not supported */ CU_ASSERT_TRUE(rc < 0); @@ -364,8 +368,9 @@ lun_task_mgmt_execute_lun_reset_failure(void) ut_init_task(&mgmt_task); mgmt_task.lun = NULL; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_LUN_RESET; - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_LUN_RESET); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* Returns -1 since we passed NULL for lun */ CU_ASSERT_TRUE(rc < 0); @@ -386,8 +391,9 @@ lun_task_mgmt_execute_lun_reset(void) ut_init_task(&mgmt_task); mgmt_task.lun = lun; + mgmt_task.function = SPDK_SCSI_TASK_FUNC_LUN_RESET; - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, SPDK_SCSI_TASK_FUNC_LUN_RESET); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* Returns success */ CU_ASSERT_EQUAL(rc, 0); @@ -411,8 +417,10 @@ lun_task_mgmt_execute_invalid_case(void) lun->dev = &dev; ut_init_task(&mgmt_task); + mgmt_task.function = 5; + /* Pass an invalid value to the switch statement */ - rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task, 5); + rc = spdk_scsi_lun_task_mgmt_execute(&mgmt_task); /* Returns -1 on passing an invalid value to the switch case */ CU_ASSERT_TRUE(rc < 0);