From 347499e732c29a22e85b1b51f0cc517aefc8d40a Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 00:06:52 -0700 Subject: [PATCH] module/bdev_compress: remove spdk prefix from static functions. Signed-off-by: Seth Howell Change-Id: I7d3fd307a89592ed854e6d63852b895d44984644 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2319 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Darek Stojaczyk Reviewed-by: Aleksey Marchuk --- module/bdev/compress/vbdev_compress.c | 12 +++++----- module/bdev/compress/vbdev_compress_rpc.c | 28 +++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c index 910c0d992..336f0484c 100644 --- a/module/bdev/compress/vbdev_compress.c +++ b/module/bdev/compress/vbdev_compress.c @@ -405,7 +405,7 @@ error_create_mbuf: /* for completing rw requests on the orig IO thread. */ static void -_spdk_reduce_rw_blocks_cb(void *arg) +_reduce_rw_blocks_cb(void *arg) { struct comp_bdev_io *io_ctx = arg; @@ -419,7 +419,7 @@ _spdk_reduce_rw_blocks_cb(void *arg) /* Completion callback for r/w that were issued via reducelib. */ static void -spdk_reduce_rw_blocks_cb(void *arg, int reduce_errno) +reduce_rw_blocks_cb(void *arg, int reduce_errno) { struct spdk_bdev_io *bdev_io = arg; struct comp_bdev_io *io_ctx = (struct comp_bdev_io *)bdev_io->driver_ctx; @@ -434,9 +434,9 @@ spdk_reduce_rw_blocks_cb(void *arg, int reduce_errno) /* Send this request to the orig IO thread. */ orig_thread = spdk_io_channel_get_thread(ch); if (orig_thread != spdk_get_thread()) { - spdk_thread_send_msg(orig_thread, _spdk_reduce_rw_blocks_cb, io_ctx); + spdk_thread_send_msg(orig_thread, _reduce_rw_blocks_cb, io_ctx); } else { - _spdk_reduce_rw_blocks_cb(io_ctx); + _reduce_rw_blocks_cb(io_ctx); } } @@ -749,7 +749,7 @@ comp_read_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, b spdk_reduce_vol_readv(comp_bdev->vol, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, bdev_io->u.bdev.num_blocks, - spdk_reduce_rw_blocks_cb, bdev_io); + reduce_rw_blocks_cb, bdev_io); } /* scheduled for completion on IO thread */ @@ -784,7 +784,7 @@ _comp_bdev_io_submit(void *arg) case SPDK_BDEV_IO_TYPE_WRITE: spdk_reduce_vol_writev(comp_bdev->vol, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks, bdev_io->u.bdev.num_blocks, - spdk_reduce_rw_blocks_cb, bdev_io); + reduce_rw_blocks_cb, bdev_io); return; /* TODO in future patch in the series */ case SPDK_BDEV_IO_TYPE_RESET: diff --git a/module/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c index 94751b37e..9bdb25650 100644 --- a/module/bdev/compress/vbdev_compress_rpc.c +++ b/module/bdev/compress/vbdev_compress_rpc.c @@ -52,8 +52,8 @@ static const struct spdk_json_object_decoder rpc_bdev_compress_get_orphans_decod }; static void -spdk_rpc_bdev_compress_get_orphans(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_compress_get_orphans(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_bdev_compress_get_orphans req = {}; struct spdk_json_write_ctx *w; @@ -96,7 +96,7 @@ spdk_rpc_bdev_compress_get_orphans(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); free_rpc_bdev_compress_get_orphans(&req); } -SPDK_RPC_REGISTER("bdev_compress_get_orphans", spdk_rpc_bdev_compress_get_orphans, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_compress_get_orphans", rpc_bdev_compress_get_orphans, SPDK_RPC_RUNTIME) struct rpc_compress_set_pmd { enum compress_pmd pmd; @@ -107,8 +107,8 @@ static const struct spdk_json_object_decoder rpc_compress_pmd_decoder[] = { }; static void -spdk_rpc_compress_set_pmd(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_compress_set_pmd(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_compress_set_pmd req; struct spdk_json_write_ctx *w; @@ -141,7 +141,7 @@ spdk_rpc_compress_set_pmd(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } } -SPDK_RPC_REGISTER("compress_set_pmd", spdk_rpc_compress_set_pmd, +SPDK_RPC_REGISTER("compress_set_pmd", rpc_compress_set_pmd, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(compress_set_pmd, set_compress_pmd) @@ -169,8 +169,8 @@ static const struct spdk_json_object_decoder rpc_construct_compress_decoders[] = * device. Error status returned in the failed cases. */ static void -spdk_rpc_bdev_compress_create(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_compress_create(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_construct_compress req = {NULL}; struct spdk_json_write_ctx *w; @@ -201,7 +201,7 @@ spdk_rpc_bdev_compress_create(struct spdk_jsonrpc_request *request, cleanup: free_rpc_construct_compress(&req); } -SPDK_RPC_REGISTER("bdev_compress_create", spdk_rpc_bdev_compress_create, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_compress_create", rpc_bdev_compress_create, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_compress_create, construct_compress_bdev) struct rpc_delete_compress { @@ -219,7 +219,7 @@ static const struct spdk_json_object_decoder rpc_delete_compress_decoders[] = { }; static void -_spdk_rpc_bdev_compress_delete_cb(void *cb_arg, int bdeverrno) +_rpc_bdev_compress_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; struct spdk_json_write_ctx *w; @@ -230,8 +230,8 @@ _spdk_rpc_bdev_compress_delete_cb(void *cb_arg, int bdeverrno) } static void -spdk_rpc_bdev_compress_delete(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_compress_delete(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_delete_compress req = {NULL}; @@ -241,10 +241,10 @@ spdk_rpc_bdev_compress_delete(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "spdk_json_decode_object failed"); } else { - bdev_compress_delete(req.name, _spdk_rpc_bdev_compress_delete_cb, request); + bdev_compress_delete(req.name, _rpc_bdev_compress_delete_cb, request); } free_rpc_delete_compress(&req); } -SPDK_RPC_REGISTER("bdev_compress_delete", spdk_rpc_bdev_compress_delete, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_compress_delete", rpc_bdev_compress_delete, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_compress_delete, delete_compress_bdev)