diff --git a/lib/bdev/lvol/vbdev_lvol.c b/lib/bdev/lvol/vbdev_lvol.c index 1392e7b4d..4a21f31ef 100644 --- a/lib/bdev/lvol/vbdev_lvol.c +++ b/lib/bdev/lvol/vbdev_lvol.c @@ -702,18 +702,12 @@ end: } int -vbdev_lvol_create(uuid_t uuid, const char *name, size_t sz, +vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, size_t sz, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg) { struct spdk_lvol_with_handle_req *req; - struct spdk_lvol_store *lvs; int rc; - lvs = vbdev_get_lvol_store_by_uuid(uuid); - if (lvs == NULL) { - return -ENODEV; - } - req = calloc(1, sizeof(*req)); if (req == NULL) { return -ENOMEM; diff --git a/lib/bdev/lvol/vbdev_lvol.h b/lib/bdev/lvol/vbdev_lvol.h index 4e876e632..4cca1dd77 100644 --- a/lib/bdev/lvol/vbdev_lvol.h +++ b/lib/bdev/lvol/vbdev_lvol.h @@ -52,7 +52,7 @@ int vbdev_lvs_create(struct spdk_bdev *base_bdev, const char *name, uint32_t clu void vbdev_lvs_destruct(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void *cb_arg); void vbdev_lvs_unload(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void *cb_arg); -int vbdev_lvol_create(uuid_t uuid, const char *name, size_t sz, +int vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, size_t sz, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg); diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/lib/bdev/lvol/vbdev_lvol_rpc.c index 1f05ffaee..021db0797 100644 --- a/lib/bdev/lvol/vbdev_lvol_rpc.c +++ b/lib/bdev/lvol/vbdev_lvol_rpc.c @@ -336,7 +336,7 @@ spdk_rpc_construct_lvol_bdev(struct spdk_jsonrpc_request *request, sz = (size_t)req.size; - rc = vbdev_lvol_create(lvs->uuid, req.lvol_name, sz, _spdk_rpc_construct_lvol_bdev_cb, request); + rc = vbdev_lvol_create(lvs, req.lvol_name, sz, _spdk_rpc_construct_lvol_bdev_cb, request); if (rc < 0) { goto invalid; } diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c index 55634dce9..602605b7e 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c +++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c @@ -512,7 +512,7 @@ ut_lvs_destroy(void) /* Suuccessfully create lvol, which should be unloaded with lvs later */ g_lvolerrno = -1; - rc = vbdev_lvol_create(lvs->uuid, "lvol", sz, vbdev_lvol_create_complete, NULL); + rc = vbdev_lvol_create(lvs, "lvol", sz, vbdev_lvol_create_complete, NULL); CU_ASSERT(rc == 0); CU_ASSERT(g_lvolerrno == 0); SPDK_CU_ASSERT_FATAL(g_lvol != NULL); @@ -526,7 +526,6 @@ ut_lvs_destroy(void) static void ut_lvol_init(void) { - uuid_t wrong_uuid; int sz = 10; int rc; @@ -542,18 +541,12 @@ ut_lvol_init(void) g_lvs_bdev->bdev = g_base_bdev; uuid_generate_time(g_lvs->uuid); - uuid_generate_time(wrong_uuid); - - /* Incorrect uuid set */ - g_lvolerrno = 0; - rc = vbdev_lvol_create(wrong_uuid, "lvol", sz, vbdev_lvol_create_complete, NULL); - CU_ASSERT(rc == -ENODEV); TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores); /* Successful lvol create */ g_lvolerrno = -1; - rc = vbdev_lvol_create(g_lvs->uuid, "lvol", sz, vbdev_lvol_create_complete, NULL); + rc = vbdev_lvol_create(g_lvs, "lvol", sz, vbdev_lvol_create_complete, NULL); SPDK_CU_ASSERT_FATAL(rc == 0); CU_ASSERT(g_lvol != NULL); CU_ASSERT(g_lvolerrno == 0); @@ -703,7 +696,7 @@ ut_lvol_resize(void) /* Successful lvol create */ g_lvolerrno = -1; - rc = vbdev_lvol_create(g_lvs->uuid, "lvol", sz, vbdev_lvol_create_complete, NULL); + rc = vbdev_lvol_create(g_lvs, "lvol", sz, vbdev_lvol_create_complete, NULL); CU_ASSERT(rc == 0); CU_ASSERT(g_lvolerrno == 0); SPDK_CU_ASSERT_FATAL(g_lvol != NULL); @@ -761,7 +754,7 @@ ut_lvs_unload(void) /* Suuccessfully create lvol, which should be destroyed with lvs later */ g_lvolerrno = -1; - rc = vbdev_lvol_create(lvs->uuid, "lvol", sz, vbdev_lvol_create_complete, NULL); + rc = vbdev_lvol_create(lvs, "lvol", sz, vbdev_lvol_create_complete, NULL); CU_ASSERT(rc == 0); CU_ASSERT(g_lvolerrno == 0); SPDK_CU_ASSERT_FATAL(g_lvol != NULL);