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

test/external_code: rename public functions from module

Browse Source 
The "external" module that we link against is essentially
a copy of the passthru bdev module in the modules/bdev
directory.  But let's not use the same names for the
externally visible functions from this "external" module,
so that we don't get link errors if we happen to link
in both modules into one application.

This will help in a future patch where we use pkg-config
files to generate the list of the bdev modules.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I835c7e7ee8902f6829657ec6a3cf40cd802a1357
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5674
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jim Harris 2020-12-21 23:44:40 +00:00 committed by Tomasz Zawadzki
parent 31e91a83fa
commit 4340de1073
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/external_code/passthru/vbdev_passthru.c
View File

@ -700,7 +700,7 @@ vbdev_passthru_register(const char *bdev_name)
/* Create the passthru disk from the given bdev and vbdev name. */ /* Create the passthru disk from the given bdev and vbdev name. */
int int
bdev_passthru_create_disk(const char *bdev_name, const char *vbdev_name) bdev_passthru_external_create_disk(const char *bdev_name, const char *vbdev_name)
{ {
int rc; int rc;
@ -725,7 +725,8 @@ bdev_passthru_create_disk(const char *bdev_name, const char *vbdev_name)
} }
void void
bdev_passthru_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void *cb_arg) bdev_passthru_external_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn,
void *cb_arg)
{ {
struct bdev_names *name; struct bdev_names *name;

6
test/external_code/passthru/vbdev_passthru.h
View File

@ -46,7 +46,7 @@
* \param vbdev_name Name of the pass through bdev. * \param vbdev_name Name of the pass through bdev.
* \return 0 on success, other on failure. * \return 0 on success, other on failure.
*/ */
int bdev_passthru_create_disk(const char *bdev_name, const char *vbdev_name); int bdev_passthru_external_create_disk(const char *bdev_name, const char *vbdev_name);
/** /**
* Delete passthru bdev. * Delete passthru bdev.
@ -55,7 +55,7 @@ int bdev_passthru_create_disk(const char *bdev_name, const char *vbdev_name);
* \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 bdev_passthru_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, void bdev_passthru_external_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn,
void *cb_arg); void *cb_arg);
#endif /* SPDK_VBDEV_PASSTHRU_H */ #endif /* SPDK_VBDEV_PASSTHRU_H */

4
test/external_code/passthru/vbdev_passthru_rpc.c
View File

@ -77,7 +77,7 @@ rpc_bdev_passthru_create(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
rc = bdev_passthru_create_disk(req.base_bdev_name, req.name); rc = bdev_passthru_external_create_disk(req.base_bdev_name, req.name);
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;
@ -135,7 +135,7 @@ rpc_bdev_passthru_delete(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
bdev_passthru_delete_disk(bdev, rpc_bdev_passthru_delete_cb, request); bdev_passthru_external_delete_disk(bdev, rpc_bdev_passthru_delete_cb, request);
cleanup: cleanup:
free_rpc_bdev_passthru_delete(&req); free_rpc_bdev_passthru_delete(&req);