Commit 0c06e1ea authored by Maciej Szwed's avatar Maciej Szwed Committed by Jim Harris
Browse files

lvol: show total accessible clusters in lvol store 



Show total accessible clusters when listing lvol stores
instead of total blocks. This is more readable for user.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I22a14f626816769cf2f494ae30cfd8ee63897771
Reviewed-on: https://review.gerrithub.io/385634


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5eb52b95

include/spdk_internal/lvolstore.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct spdk_lvol_store { 
	spdk_blob_id			super_blob_id;

	uuid_t				uuid;

	struct spdk_lvs_req		*destruct_req;

	uint64_t			total_blocks;

	int				lvol_count;

	int				lvols_opened;

	bool				destruct;

lib/bdev/lvol/vbdev_lvol_rpc.c

+5 −6
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, 
	struct spdk_json_write_ctx *w;

	struct lvol_store_bdev *lvs_bdev;

	struct spdk_blob_store *bs;

	uint64_t free_blocks, cluster_size, block_size;

	uint64_t cluster_size, block_size;

	char uuid[UUID_STRING_LEN];



	if (params != NULL) {
@@ -464,7 +464,6 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, 
		cluster_size = spdk_bs_get_cluster_size(bs);

		/* Block size of lvols is always size of blob store page */

		block_size = spdk_bs_get_page_size(bs);

		free_blocks = (cluster_size * spdk_bs_free_cluster_count(bs)) / block_size;



		spdk_json_write_object_begin(w);
@@ -478,11 +477,11 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, 
		spdk_json_write_name(w, "base_bdev");

		spdk_json_write_string(w, spdk_bdev_get_name(lvs_bdev->bdev));



		spdk_json_write_name(w, "total_blocks");

		spdk_json_write_uint64(w, lvs_bdev->lvs->total_blocks);

		spdk_json_write_name(w, "total_data_clusters");

		spdk_json_write_uint64(w, spdk_bs_total_data_cluster_count(bs));



		spdk_json_write_name(w, "free_blocks");

		spdk_json_write_uint64(w, free_blocks);

		spdk_json_write_name(w, "free_clusters");

		spdk_json_write_uint64(w, spdk_bs_free_cluster_count(bs));



		spdk_json_write_name(w, "block_size");

		spdk_json_write_uint64(w, block_size);

lib/lvol/lvol.c

+0 −2
Original line number Diff line number Diff line
@@ -511,8 +511,6 @@ _spdk_lvs_init_cb(void *cb_arg, struct spdk_blob_store *bs, int lvserrno) 
	assert(bs != NULL);

	lvs->blobstore = bs;

	TAILQ_INIT(&lvs->lvols);

	lvs->total_blocks = (spdk_bs_get_cluster_size(bs) * spdk_bs_free_cluster_count(

				     bs)) / spdk_bs_get_page_size(bs);



	SPDK_INFOLOG(SPDK_TRACE_LVOL, "Lvol store initialized\n");