From 5b17046d11a4335a03143ec4049474c573992094 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 2 Oct 2017 10:17:13 +0200 Subject: [PATCH] lvol: disable spdk_lvol_resize Functionality of resizing logical volumes is currently a work in progress, thus it is disabled in this patch. It is no longer possible to use RPC and lib functionality. Signed-off-by: Tomasz Zawadzki Change-Id: I518e7196096f52e3ad9e91d658e1bb6c3301b688 Reviewed-on: https://review.gerrithub.io/380916 Tested-by: SPDK Automated Test System Reviewed-by: Maciej Szwed Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp --- include/spdk/lvol.h | 2 -- include/spdk_internal/lvolstore.h | 3 +++ lib/bdev/lvol/vbdev_lvol_rpc.c | 5 +++-- scripts/rpc.py | 23 ++++++++++++----------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/spdk/lvol.h b/include/spdk/lvol.h index 253e971c0..7b1cd7f65 100644 --- a/include/spdk/lvol.h +++ b/include/spdk/lvol.h @@ -61,8 +61,6 @@ int spdk_lvs_init(struct spdk_bs_dev *bs_dev, struct spdk_lvs_opts *o, int spdk_lvs_unload(struct spdk_lvol_store *lvol_store, spdk_lvs_op_complete cb_fn, void *cb_arg); int spdk_lvol_create(struct spdk_lvol_store *lvs, uint64_t sz, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg); -int spdk_lvol_resize(struct spdk_lvol *lvol, uint64_t sz, - spdk_lvol_op_complete cb_fn, void *cb_arg); void spdk_lvol_destroy(struct spdk_lvol *lvol); void spdk_lvol_close(struct spdk_lvol *lvol); struct spdk_io_channel *spdk_lvol_get_io_channel(struct spdk_lvol *lvol); diff --git a/include/spdk_internal/lvolstore.h b/include/spdk_internal/lvolstore.h index e37bc570b..150f54073 100644 --- a/include/spdk_internal/lvolstore.h +++ b/include/spdk_internal/lvolstore.h @@ -94,4 +94,7 @@ struct lvol_task { struct lvol_store_bdev *vbdev_lvol_store_first(void); struct lvol_store_bdev *vbdev_lvol_store_next(struct lvol_store_bdev *prev); +int spdk_lvol_resize(struct spdk_lvol *lvol, uint64_t sz, spdk_lvol_op_complete cb_fn, + void *cb_arg); + #endif /* SPDK_INTERNAL_LVOLSTORE_H */ diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/lib/bdev/lvol/vbdev_lvol_rpc.c index 7f1fb9c60..3b585dfc6 100644 --- a/lib/bdev/lvol/vbdev_lvol_rpc.c +++ b/lib/bdev/lvol/vbdev_lvol_rpc.c @@ -342,7 +342,7 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, buf); } -static void +static void __attribute__((unused)) spdk_rpc_resize_lvol_bdev(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { @@ -379,7 +379,8 @@ invalid: free_rpc_resize_lvol_bdev(&req); } -SPDK_RPC_REGISTER("resize_lvol_bdev", spdk_rpc_resize_lvol_bdev) +/* Logical volume resize feature is disabled, as it is currently work in progress +SPDK_RPC_REGISTER("resize_lvol_bdev", spdk_rpc_resize_lvol_bdev) */ static void spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index b02f39523..fd0656cc5 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -281,17 +281,18 @@ p.add_argument('lvol_store_uuid', help='lvol store UUID') p.add_argument('size', help='size in MiB for this bdev', type=int) p.set_defaults(func=construct_lvol_bdev) - -def resize_lvol_bdev(args): - params = { - 'name': args.name, - 'size': args.size, - } - jsonrpc_call('resize_lvol_bdev', params) -p = subparsers.add_parser('resize_lvol_bdev', help='Resize existing lvol bdev') -p.add_argument('name', help='lvol bdev name') -p.add_argument('size', help='new size in MiB for this bdev', type=int) -p.set_defaults(func=resize_lvol_bdev) +# Logical volume resize feature is disabled, as it is currently work in progress +# +# def resize_lvol_bdev(args): +# params = { +# 'name': args.name, +# 'size': args.size, +# } +# jsonrpc_call('resize_lvol_bdev', params) +# p = subparsers.add_parser('resize_lvol_bdev', help='Resize existing lvol bdev') +# p.add_argument('name', help='lvol bdev name') +# p.add_argument('size', help='new size in MiB for this bdev', type=int) +# p.set_defaults(func=resize_lvol_bdev) def destroy_lvol_store(args):