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

module/bdev_pmem: remove spdk prefix from static/internal functions.

Browse Source 
Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: Id8d492068f73682946ab2c3e96393916eb9bb28f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2332
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Seth Howell 2020-05-10 00:55:44 -07:00 committed by Tomasz Zawadzki
parent 941f14a95f
commit f4653b8a74
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/bdev/pmem/bdev_pmem.c
View File

@ -310,7 +310,7 @@ static const struct spdk_bdev_fn_table pmem_fn_table = {
}; };
int int
spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev **bdev) create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev **bdev)
{ {
uint64_t num_blocks; uint64_t num_blocks;
uint32_t block_size; uint32_t block_size;
@ -320,7 +320,7 @@ spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev
*bdev = NULL; *bdev = NULL;
if (name == NULL) { if (name == NULL) {
SPDK_ERRLOG("Missing name parameter for spdk_create_pmem_disk()\n"); SPDK_ERRLOG("Missing name parameter for create_pmem_disk()\n");
return -EINVAL; return -EINVAL;
} }
@ -391,7 +391,7 @@ spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev
} }
void void
spdk_delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn, void *cb_arg) delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn, void *cb_arg)
{ {
if (!bdev || bdev->module != &pmem_if) { if (!bdev || bdev->module != &pmem_if) {
cb_fn(cb_arg, -ENODEV); cb_fn(cb_arg, -ENODEV);
@ -432,7 +432,7 @@ bdev_pmem_read_conf(void)
continue; continue;
} }
spdk_create_pmem_disk(pmem_file, bdev_name, &bdev); create_pmem_disk(pmem_file, bdev_name, &bdev);
} }
} }

6
module/bdev/pmem/bdev_pmem.h
View File

@ -49,7 +49,7 @@ typedef void (*spdk_delete_pmem_complete)(void *cb_arg, int bdeverrno);
* -EINVAL if input parameters check failed * -EINVAL if input parameters check failed
* -ENOMEM if buffer cannot be allocated * -ENOMEM if buffer cannot be allocated
*/ */
int spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev **bdev); int create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev **bdev);
/** /**
* Delete pmem bdev. * Delete pmem bdev.
@ -58,7 +58,7 @@ int spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_b
* \param cb_fn Function to call after deletion. * \param cb_fn Function to call after deletion.
* \param cb_arg Argument to pass to cb_fn. * \param cb_arg Argument to pass to cb_fn.
*/ */
void spdk_delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn, void delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn,
void *cb_arg); void *cb_arg);
#endif /* SPDK_BDEV_PMEM_H */ #endif /* SPDK_BDEV_PMEM_H */

36
module/bdev/pmem/bdev_pmem_rpc.c
View File

@ -57,8 +57,8 @@ static const struct spdk_json_object_decoder rpc_construct_pmem_decoders[] = {
}; };
static void static void
spdk_rpc_bdev_pmem_create(struct spdk_jsonrpc_request *request, rpc_bdev_pmem_create(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_construct_pmem req = {}; struct rpc_construct_pmem req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -73,7 +73,7 @@ spdk_rpc_bdev_pmem_create(struct spdk_jsonrpc_request *request,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
goto cleanup; goto cleanup;
} }
rc = spdk_create_pmem_disk(req.pmem_file, req.name, &bdev); rc = create_pmem_disk(req.pmem_file, req.name, &bdev);
if (rc != 0) { if (rc != 0) {
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc)); spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup; goto cleanup;
@ -86,7 +86,7 @@ spdk_rpc_bdev_pmem_create(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_bdev_pmem_create(&req); free_rpc_bdev_pmem_create(&req);
} }
SPDK_RPC_REGISTER("bdev_pmem_create", spdk_rpc_bdev_pmem_create, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_pmem_create", rpc_bdev_pmem_create, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create, construct_pmem_bdev) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create, construct_pmem_bdev)
struct rpc_delete_pmem { struct rpc_delete_pmem {
@ -104,7 +104,7 @@ static const struct spdk_json_object_decoder rpc_delete_pmem_decoders[] = {
}; };
static void static void
_spdk_rpc_bdev_pmem_delete_cb(void *cb_arg, int bdeverrno) _rpc_bdev_pmem_delete_cb(void *cb_arg, int bdeverrno)
{ {
struct spdk_jsonrpc_request *request = cb_arg; struct spdk_jsonrpc_request *request = cb_arg;
struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@ -114,8 +114,8 @@ _spdk_rpc_bdev_pmem_delete_cb(void *cb_arg, int bdeverrno)
} }
static void static void
spdk_rpc_bdev_pmem_delete(struct spdk_jsonrpc_request *request, rpc_bdev_pmem_delete(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_pmem req = {NULL}; struct rpc_delete_pmem req = {NULL};
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
@ -135,12 +135,12 @@ spdk_rpc_bdev_pmem_delete(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
spdk_delete_pmem_disk(bdev, _spdk_rpc_bdev_pmem_delete_cb, request); delete_pmem_disk(bdev, _rpc_bdev_pmem_delete_cb, request);
cleanup: cleanup:
free_rpc_delete_pmem(&req); free_rpc_delete_pmem(&req);
} }
SPDK_RPC_REGISTER("bdev_pmem_delete", spdk_rpc_bdev_pmem_delete, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_pmem_delete", rpc_bdev_pmem_delete, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete, delete_pmem_bdev) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete, delete_pmem_bdev)
struct rpc_bdev_pmem_create_pool { struct rpc_bdev_pmem_create_pool {
@ -162,8 +162,8 @@ free_rpc_bdev_pmem_create_pool(struct rpc_bdev_pmem_create_pool *req)
} }
static void static void
spdk_rpc_bdev_pmem_create_pool(struct spdk_jsonrpc_request *request, rpc_bdev_pmem_create_pool(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_bdev_pmem_create_pool req = {}; struct rpc_bdev_pmem_create_pool req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -212,7 +212,7 @@ spdk_rpc_bdev_pmem_create_pool(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_bdev_pmem_create_pool(&req); free_rpc_bdev_pmem_create_pool(&req);
} }
SPDK_RPC_REGISTER("bdev_pmem_create_pool", spdk_rpc_bdev_pmem_create_pool, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_pmem_create_pool", rpc_bdev_pmem_create_pool, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create_pool, create_pmem_pool) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create_pool, create_pmem_pool)
struct rpc_bdev_pmem_get_pool_info { struct rpc_bdev_pmem_get_pool_info {
@ -230,8 +230,8 @@ free_rpc_bdev_pmem_get_pool_info(struct rpc_bdev_pmem_get_pool_info *req)
} }
static void static void
spdk_rpc_bdev_pmem_get_pool_info(struct spdk_jsonrpc_request *request, rpc_bdev_pmem_get_pool_info(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_bdev_pmem_get_pool_info req = {}; struct rpc_bdev_pmem_get_pool_info req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -281,7 +281,7 @@ spdk_rpc_bdev_pmem_get_pool_info(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_bdev_pmem_get_pool_info(&req); free_rpc_bdev_pmem_get_pool_info(&req);
} }
SPDK_RPC_REGISTER("bdev_pmem_get_pool_info", spdk_rpc_bdev_pmem_get_pool_info, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_pmem_get_pool_info", rpc_bdev_pmem_get_pool_info, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_get_pool_info, pmem_pool_info) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_get_pool_info, pmem_pool_info)
struct rpc_bdev_pmem_delete_pool { struct rpc_bdev_pmem_delete_pool {
@ -299,8 +299,8 @@ free_rpc_bdev_pmem_delete_pool(struct rpc_bdev_pmem_delete_pool *req)
} }
static void static void
spdk_rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request, rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_bdev_pmem_delete_pool req = {}; struct rpc_bdev_pmem_delete_pool req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -333,5 +333,5 @@ spdk_rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request,
cleanup: cleanup:
free_rpc_bdev_pmem_delete_pool(&req); free_rpc_bdev_pmem_delete_pool(&req);
} }
SPDK_RPC_REGISTER("bdev_pmem_delete_pool", spdk_rpc_bdev_pmem_delete_pool, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_pmem_delete_pool", rpc_bdev_pmem_delete_pool, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete_pool, delete_pmem_pool) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete_pool, delete_pmem_pool)

22
test/unit/lib/bdev/pmem/bdev_pmem_ut.c
View File

@ -413,51 +413,51 @@ ut_pmem_open_close(void)
pools_cnt = g_opened_pools; pools_cnt = g_opened_pools;
/* Try opening with NULL name */ /* Try opening with NULL name */
rc = spdk_create_pmem_disk(NULL, NULL, &bdev); rc = create_pmem_disk(NULL, NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open non-existent pool */ /* Open non-existent pool */
rc = spdk_create_pmem_disk("non existent pool", NULL, &bdev); rc = create_pmem_disk("non existent pool", NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open inconsistent pool */ /* Open inconsistent pool */
rc = spdk_create_pmem_disk(g_pool_inconsistent.name, NULL, &bdev); rc = create_pmem_disk(g_pool_inconsistent.name, NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open consistent pool fail the open from unknown reason. */ /* Open consistent pool fail the open from unknown reason. */
g_pmemblk_open_allow_open = false; g_pmemblk_open_allow_open = false;
rc = spdk_create_pmem_disk(g_pool_inconsistent.name, NULL, &bdev); rc = create_pmem_disk(g_pool_inconsistent.name, NULL, &bdev);
g_pmemblk_open_allow_open = true; g_pmemblk_open_allow_open = true;
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open pool with nblocks = 0 */ /* Open pool with nblocks = 0 */
rc = spdk_create_pmem_disk(g_pool_nblock_0.name, NULL, &bdev); rc = create_pmem_disk(g_pool_nblock_0.name, NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open pool with bsize = 0 */ /* Open pool with bsize = 0 */
rc = spdk_create_pmem_disk(g_pool_bsize_0.name, NULL, &bdev); rc = create_pmem_disk(g_pool_bsize_0.name, NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open pool with NULL name */ /* Open pool with NULL name */
rc = spdk_create_pmem_disk(g_pool_ok.name, NULL, &bdev); rc = create_pmem_disk(g_pool_ok.name, NULL, &bdev);
CU_ASSERT_PTR_NULL(bdev); CU_ASSERT_PTR_NULL(bdev);
CU_ASSERT_EQUAL(pools_cnt, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt, g_opened_pools);
CU_ASSERT_NOT_EQUAL(rc, 0); CU_ASSERT_NOT_EQUAL(rc, 0);
/* Open good pool */ /* Open good pool */
rc = spdk_create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev); rc = create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev);
SPDK_CU_ASSERT_FATAL(bdev != NULL); SPDK_CU_ASSERT_FATAL(bdev != NULL);
CU_ASSERT_TRUE(g_pool_ok.is_open); CU_ASSERT_TRUE(g_pool_ok.is_open);
CU_ASSERT_EQUAL(pools_cnt + 1, g_opened_pools); CU_ASSERT_EQUAL(pools_cnt + 1, g_opened_pools);
@ -489,7 +489,7 @@ ut_pmem_write_read(void)
{ 0, 4 * bsize }, { 0, 4 * bsize },
}; };
rc = spdk_create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev); rc = create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev);
CU_ASSERT_EQUAL(rc, 0); CU_ASSERT_EQUAL(rc, 0);
SPDK_CU_ASSERT_FATAL(g_pool_ok.nblock > 40); SPDK_CU_ASSERT_FATAL(g_pool_ok.nblock > 40);
@ -663,7 +663,7 @@ ut_pmem_reset(void)
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
int rc; int rc;
rc = spdk_create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev); rc = create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev);
CU_ASSERT_EQUAL(rc, 0); CU_ASSERT_EQUAL(rc, 0);
SPDK_CU_ASSERT_FATAL(bdev != NULL); SPDK_CU_ASSERT_FATAL(bdev != NULL);
@ -683,7 +683,7 @@ ut_pmem_unmap_write_zero(int16_t io_type)
int rc; int rc;
CU_ASSERT(io_type == SPDK_BDEV_IO_TYPE_UNMAP || io_type == SPDK_BDEV_IO_TYPE_WRITE_ZEROES); CU_ASSERT(io_type == SPDK_BDEV_IO_TYPE_UNMAP || io_type == SPDK_BDEV_IO_TYPE_WRITE_ZEROES);
rc = spdk_create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev); rc = create_pmem_disk(g_pool_ok.name, g_bdev_name, &bdev);
CU_ASSERT_EQUAL(rc, 0); CU_ASSERT_EQUAL(rc, 0);
SPDK_CU_ASSERT_FATAL(bdev != NULL); SPDK_CU_ASSERT_FATAL(bdev != NULL);
SPDK_CU_ASSERT_FATAL(g_pool_ok.nblock > 40); SPDK_CU_ASSERT_FATAL(g_pool_ok.nblock > 40);