From db0df37d987e6dc33dff60296b3f813ea2263d88 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 01:19:57 -0700 Subject: [PATCH] module/bdev_split: remove spdk prefix from static/internal functions. Signed-off-by: Seth Howell Change-Id: I337ed5dd8ed4470645c02b4b5e519c28657c024c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2336 Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot --- module/bdev/split/vbdev_split.c | 8 ++++---- module/bdev/split/vbdev_split.h | 4 ++-- module/bdev/split/vbdev_split_rpc.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/bdev/split/vbdev_split.c b/module/bdev/split/vbdev_split.c index c2603e63d..fd175d339 100644 --- a/module/bdev/split/vbdev_split.c +++ b/module/bdev/split/vbdev_split.c @@ -105,7 +105,7 @@ vbdev_split_base_free(void *ctx) } static int -vbdev_split_destruct(void *ctx) +_vbdev_split_destruct(void *ctx) { struct spdk_bdev_part *part = ctx; @@ -217,7 +217,7 @@ vbdev_split_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx } static struct spdk_bdev_fn_table vbdev_split_fn_table = { - .destruct = vbdev_split_destruct, + .destruct = _vbdev_split_destruct, .submit_request = vbdev_split_submit_request, .dump_info_json = vbdev_split_dump_info_json, .write_config_json = vbdev_split_write_config_json @@ -541,7 +541,7 @@ create_vbdev_split(const char *base_bdev_name, unsigned split_count, uint64_t sp } int -spdk_vbdev_split_destruct(const char *base_bdev_name) +vbdev_split_destruct(const char *base_bdev_name) { struct spdk_vbdev_split_config *cfg = vbdev_split_config_find_by_base_name(base_bdev_name); @@ -555,7 +555,7 @@ spdk_vbdev_split_destruct(const char *base_bdev_name) } struct spdk_bdev_part_base * -spdk_vbdev_split_get_part_base(struct spdk_bdev *bdev) +vbdev_split_get_part_base(struct spdk_bdev *bdev) { struct spdk_vbdev_split_config *cfg; diff --git a/module/bdev/split/vbdev_split.h b/module/bdev/split/vbdev_split.h index 7542f11d6..f468f2414 100644 --- a/module/bdev/split/vbdev_split.h +++ b/module/bdev/split/vbdev_split.h @@ -54,7 +54,7 @@ int create_vbdev_split(const char *base_bdev_name, unsigned split_count, uint64_ * \param base_bdev_name base bdev name * \return 0 on success or negative errno value. */ -int spdk_vbdev_split_destruct(const char *base_bdev_name); +int vbdev_split_destruct(const char *base_bdev_name); /** * Get the spdk_bdev_part_base associated with the given split base_bdev. @@ -63,6 +63,6 @@ int spdk_vbdev_split_destruct(const char *base_bdev_name); * \return pointer to the associated spdk_bdev_part_base * \return NULL if the base_bdev is not being split by the split module */ -struct spdk_bdev_part_base *spdk_vbdev_split_get_part_base(struct spdk_bdev *base_bdev); +struct spdk_bdev_part_base *vbdev_split_get_part_base(struct spdk_bdev *base_bdev); #endif /* SPDK_VBDEV_SPLIT_H */ diff --git a/module/bdev/split/vbdev_split_rpc.c b/module/bdev/split/vbdev_split_rpc.c index 4f1a14292..a8c6f3be0 100644 --- a/module/bdev/split/vbdev_split_rpc.c +++ b/module/bdev/split/vbdev_split_rpc.c @@ -51,8 +51,8 @@ static const struct spdk_json_object_decoder rpc_construct_split_decoders[] = { }; static void -spdk_rpc_bdev_split_create(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_split_create(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_construct_split req = {}; struct spdk_json_write_ctx *w; @@ -85,7 +85,7 @@ spdk_rpc_bdev_split_create(struct spdk_jsonrpc_request *request, struct spdk_bdev_part *split_part; struct spdk_bdev *split_bdev; - split_base = spdk_vbdev_split_get_part_base(base_bdev); + split_base = vbdev_split_get_part_base(base_bdev); assert(split_base != NULL); @@ -102,7 +102,7 @@ spdk_rpc_bdev_split_create(struct spdk_jsonrpc_request *request, out: free(req.base_bdev); } -SPDK_RPC_REGISTER("bdev_split_create", spdk_rpc_bdev_split_create, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_split_create", rpc_bdev_split_create, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_create, construct_split_vbdev) struct rpc_delete_split { @@ -114,8 +114,8 @@ static const struct spdk_json_object_decoder rpc_delete_split_decoders[] = { }; static void -spdk_rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_delete_split req = {}; struct spdk_json_write_ctx *w; @@ -129,7 +129,7 @@ spdk_rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, goto out; } - rc = spdk_vbdev_split_destruct(req.base_bdev); + rc = vbdev_split_destruct(req.base_bdev); if (rc < 0) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc)); goto out; @@ -141,5 +141,5 @@ spdk_rpc_bdev_split_delete(struct spdk_jsonrpc_request *request, out: free(req.base_bdev); } -SPDK_RPC_REGISTER("bdev_split_delete", spdk_rpc_bdev_split_delete, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_split_delete", rpc_bdev_split_delete, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_delete, destruct_split_vbdev)