From 2b29a2b16ca575b342e12bcc56f0b706029d5525 Mon Sep 17 00:00:00 2001 From: paul luse Date: Wed, 9 Sep 2020 19:20:44 -0400 Subject: [PATCH] bdev/compress: rename RPC to match standard naming Not sure how this one was missed back during the big rename party. Signed-off-by: paul luse Change-Id: Ia00819a2c2e8c81ad0499f4081667dde04fa726e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4140 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: John Kariuki Reviewed-by: Ben Walker --- module/bdev/compress/vbdev_compress_rpc.c | 9 +++++---- scripts/rpc.py | 10 +++++----- scripts/rpc/bdev.py | 5 +++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/module/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c index 9eedae066..bd18d4572 100644 --- a/module/bdev/compress/vbdev_compress_rpc.c +++ b/module/bdev/compress/vbdev_compress_rpc.c @@ -107,8 +107,8 @@ static const struct spdk_json_object_decoder rpc_compress_pmd_decoder[] = { }; static void -rpc_compress_set_pmd(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +rpc_bdev_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,9 +141,10 @@ rpc_compress_set_pmd(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } } -SPDK_RPC_REGISTER("compress_set_pmd", rpc_compress_set_pmd, +SPDK_RPC_REGISTER("bdev_compress_set_pmd", rpc_bdev_compress_set_pmd, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(compress_set_pmd, set_compress_pmd) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_compress_set_pmd, set_compress_pmd) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_compress_set_pmd, compress_set_pmd) /* Structure to hold the parameters for this RPC method. */ struct rpc_construct_compress { diff --git a/scripts/rpc.py b/scripts/rpc.py index 555ad7bb7..932d283f1 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -205,13 +205,13 @@ if __name__ == "__main__": p.add_argument('name', help='compress bdev name') p.set_defaults(func=bdev_compress_delete) - def compress_set_pmd(args): - rpc.bdev.compress_set_pmd(args.client, - pmd=args.pmd) - p = subparsers.add_parser('compress_set_pmd', aliases=['set_compress_pmd'], + def bdev_compress_set_pmd(args): + rpc.bdev.bdev_compress_set_pmd(args.client, + pmd=args.pmd) + p = subparsers.add_parser('bdev_compress_set_pmd', aliases=['set_compress_pmd', 'compress_set_pmd'], help='Set pmd option for a compress disk') p.add_argument('-p', '--pmd', type=int, help='0 = auto-select, 1= QAT only, 2 = ISAL only') - p.set_defaults(func=compress_set_pmd) + p.set_defaults(func=bdev_compress_set_pmd) def bdev_compress_get_orphans(args): print_dict(rpc.bdev.bdev_compress_get_orphans(args.client, diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index 3b706a4a4..ea90f7d83 100644 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -64,7 +64,8 @@ def bdev_compress_delete(client, name): @deprecated_alias('set_compress_pmd') -def compress_set_pmd(client, pmd): +@deprecated_alias('compress_set_pmd') +def bdev_compress_set_pmd(client, pmd): """Set pmd options for the bdev compress. Args: @@ -72,7 +73,7 @@ def compress_set_pmd(client, pmd): """ params = {'pmd': pmd} - return client.call('compress_set_pmd', params) + return client.call('bdev_compress_set_pmd', params) def bdev_compress_get_orphans(client, name=None):