From 4340de10731e3abae2e541f3ae472559261f312f Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 21 Dec 2020 23:44:40 +0000 Subject: [PATCH] test/external_code: rename public functions from module 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 Change-Id: I835c7e7ee8902f6829657ec6a3cf40cd802a1357 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5674 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- test/external_code/passthru/vbdev_passthru.c | 5 +++-- test/external_code/passthru/vbdev_passthru.h | 6 +++--- test/external_code/passthru/vbdev_passthru_rpc.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/external_code/passthru/vbdev_passthru.c b/test/external_code/passthru/vbdev_passthru.c index 63e5ed9f0..80e41162c 100644 --- a/test/external_code/passthru/vbdev_passthru.c +++ b/test/external_code/passthru/vbdev_passthru.c @@ -700,7 +700,7 @@ vbdev_passthru_register(const char *bdev_name) /* Create the passthru disk from the given bdev and vbdev name. */ 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; @@ -725,7 +725,8 @@ bdev_passthru_create_disk(const char *bdev_name, const char *vbdev_name) } 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; diff --git a/test/external_code/passthru/vbdev_passthru.h b/test/external_code/passthru/vbdev_passthru.h index 716e187c1..070aa68e8 100644 --- a/test/external_code/passthru/vbdev_passthru.h +++ b/test/external_code/passthru/vbdev_passthru.h @@ -46,7 +46,7 @@ * \param vbdev_name Name of the pass through bdev. * \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. @@ -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_arg Argument to pass to cb_fn. */ -void bdev_passthru_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, - void *cb_arg); +void bdev_passthru_external_delete_disk(struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn, + void *cb_arg); #endif /* SPDK_VBDEV_PASSTHRU_H */ diff --git a/test/external_code/passthru/vbdev_passthru_rpc.c b/test/external_code/passthru/vbdev_passthru_rpc.c index 0b0409f1a..ac9cec9dd 100644 --- a/test/external_code/passthru/vbdev_passthru_rpc.c +++ b/test/external_code/passthru/vbdev_passthru_rpc.c @@ -77,7 +77,7 @@ rpc_bdev_passthru_create(struct spdk_jsonrpc_request *request, 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) { spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc)); goto cleanup; @@ -135,7 +135,7 @@ rpc_bdev_passthru_delete(struct spdk_jsonrpc_request *request, 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: free_rpc_bdev_passthru_delete(&req);