RPC: rename rpc destroy_lvol_bdev to bdev_lvol_delete (b5fdf4ec) · Commits · Public Repositories / spdk

doc/jsonrpc.md

+3 −3

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ Example response:
		"delete_ftl_bdev",
		"construct_ftl_bdev",
		"bdev_lvol_get_lvstores",
		"destroy_lvol_bdev",
		"bdev_lvol_delete",
		"bdev_lvol_resize",
		"bdev_lvol_set_read_only",
		"bdev_lvol_decouple_parent",
		@@ -5180,7 +5180,7 @@ Example response:
		}
		~~~

		## destroy_lvol_bdev {#rpc_destroy_lvol_bdev}
		## bdev_lvol_delete {#rpc_bdev_lvol_delete}

		Destroy a logical volume.

		@@ -5197,7 +5197,7 @@ Example request:
		~~~
		{
		"jsonrpc": "2.0",
		"method": "destroy_lvol_bdev",
		"method": "bdev_lvol_delete",
		"id": 1,
		"params": {
		"name": "51638754-ca16-43a7-9f8f-294a0805ab0a"

doc/lvol.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ destroy_lvol_store [-h] [-u UUID] [-l LVS_NAME]
		Destroy lvolstore on specified bdev. Removes lvolstore along with lvols on
		it. User can identify lvol store by UUID or its name. Note that destroying
		lvolstore requires using this call, while deleting single lvol requires
		using destroy_lvol_bdev rpc call.
		using bdev_lvol_delete rpc call.
		optional arguments:
		-h, --help show help
		bdev_lvol_get_lvstores [-h] [-u UUID] [-l LVS_NAME]
		@@ -125,7 +125,7 @@ get_bdevs [-h] [-b NAME]
		optional arguments:
		-h, --help show help
		-b NAME, --name NAME Name of the block device. Example: Nvme0n1
		destroy_lvol_bdev [-h] bdev_name
		bdev_lvol_delete [-h] bdev_name
		Deletes a logical volume previously created by construct_lvol_bdev.
		optional arguments:
		-h, --help show help

module/bdev/lvol/vbdev_lvol_rpc.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -918,22 +918,22 @@ cleanup:
		SPDK_RPC_REGISTER("bdev_lvol_set_read_only", spdk_rpc_bdev_lvol_set_read_only, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_set_read_only, set_read_only_lvol_bdev)

		struct rpc_destroy_lvol_bdev {
		struct rpc_bdev_lvol_delete {
		char *name;
		};

		static void
		free_rpc_destroy_lvol_bdev(struct rpc_destroy_lvol_bdev *req)
		free_rpc_bdev_lvol_delete(struct rpc_bdev_lvol_delete *req)
		{
		free(req->name);
		}

		static const struct spdk_json_object_decoder rpc_destroy_lvol_bdev_decoders[] = {
		{"name", offsetof(struct rpc_destroy_lvol_bdev, name), spdk_json_decode_string},
		static const struct spdk_json_object_decoder rpc_bdev_lvol_delete_decoders[] = {
		{"name", offsetof(struct rpc_bdev_lvol_delete, name), spdk_json_decode_string},
		};

		static void
		_spdk_rpc_destroy_lvol_bdev_cb(void *cb_arg, int lvolerrno)
		_spdk_rpc_bdev_lvol_delete_cb(void *cb_arg, int lvolerrno)
		{
		struct spdk_json_write_ctx *w;
		struct spdk_jsonrpc_request *request = cb_arg;
		@@ -953,15 +953,15 @@ invalid:
		}

		static void
		spdk_rpc_destroy_lvol_bdev(struct spdk_jsonrpc_request *request,
		spdk_rpc_bdev_lvol_delete(struct spdk_jsonrpc_request *request,
		const struct spdk_json_val *params)
		{
		struct rpc_destroy_lvol_bdev req = {};
		struct rpc_bdev_lvol_delete req = {};
		struct spdk_bdev *bdev;
		struct spdk_lvol *lvol;

		if (spdk_json_decode_object(params, rpc_destroy_lvol_bdev_decoders,
		SPDK_COUNTOF(rpc_destroy_lvol_bdev_decoders),
		if (spdk_json_decode_object(params, rpc_bdev_lvol_delete_decoders,
		SPDK_COUNTOF(rpc_bdev_lvol_delete_decoders),
		&req)) {
		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "spdk_json_decode_object failed\n");
		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
		@@ -982,13 +982,14 @@ spdk_rpc_destroy_lvol_bdev(struct spdk_jsonrpc_request *request,
		goto cleanup;
		}

		vbdev_lvol_destroy(lvol, _spdk_rpc_destroy_lvol_bdev_cb, request);
		vbdev_lvol_destroy(lvol, _spdk_rpc_bdev_lvol_delete_cb, request);

		cleanup:
		free_rpc_destroy_lvol_bdev(&req);
		free_rpc_bdev_lvol_delete(&req);
		}

		SPDK_RPC_REGISTER("destroy_lvol_bdev", spdk_rpc_destroy_lvol_bdev, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER("bdev_lvol_delete", spdk_rpc_bdev_lvol_delete, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_delete, destroy_lvol_bdev)

		struct rpc_bdev_lvol_get_lvstores {
		char *uuid;

scripts/rpc.py

+6 −5

Original line number	Diff line number	Diff line
		@@ -1267,13 +1267,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
		p.add_argument('name', help='lvol bdev name')
		p.set_defaults(func=bdev_lvol_set_read_only)

		def destroy_lvol_bdev(args):
		rpc.lvol.destroy_lvol_bdev(args.client,
		def bdev_lvol_delete(args):
		rpc.lvol.bdev_lvol_delete(args.client,
		name=args.name)

		p = subparsers.add_parser('destroy_lvol_bdev', help='Destroy a logical volume')
		p = subparsers.add_parser('bdev_lvol_delete', aliases=['destroy_lvol_bdev'],
		help='Destroy a logical volume')
		p.add_argument('name', help='lvol bdev name')
		p.set_defaults(func=destroy_lvol_bdev)
		p.set_defaults(func=bdev_lvol_delete)

		def destroy_lvol_store(args):
		rpc.lvol.destroy_lvol_store(args.client,

scripts/rpc/lvol.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -144,7 +144,8 @@ def bdev_lvol_set_read_only(client, name):
		return client.call('bdev_lvol_set_read_only', params)


		def destroy_lvol_bdev(client, name):
		@deprecated_alias('destroy_lvol_bdev')
		def bdev_lvol_delete(client, name):
		"""Destroy a logical volume.

		Args:
		@@ -153,7 +154,7 @@ def destroy_lvol_bdev(client, name):
		params = {
		'name': name,
		}
		return client.call('destroy_lvol_bdev', params)
		return client.call('bdev_lvol_delete', params)


		@deprecated_alias('inflate_lvol_bdev')