From 0c06e1ea892cfb19cc959922f489fe59b3ced6c8 Mon Sep 17 00:00:00 2001 From: Maciej Szwed Date: Fri, 3 Nov 2017 14:09:40 +0100 Subject: [PATCH] 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: Maciej Szwed Signed-off-by: Tomasz Zawadzki Change-Id: I22a14f626816769cf2f494ae30cfd8ee63897771 Reviewed-on: https://review.gerrithub.io/385634 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- include/spdk_internal/lvolstore.h | 1 - lib/bdev/lvol/vbdev_lvol_rpc.c | 11 +++++------ lib/lvol/lvol.c | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/spdk_internal/lvolstore.h b/include/spdk_internal/lvolstore.h index d04700f206..ed207621c9 100644 --- a/include/spdk_internal/lvolstore.h +++ b/include/spdk_internal/lvolstore.h @@ -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; diff --git a/lib/bdev/lvol/vbdev_lvol_rpc.c b/lib/bdev/lvol/vbdev_lvol_rpc.c index afe3b1b056..1f05ffaeed 100644 --- a/lib/bdev/lvol/vbdev_lvol_rpc.c +++ b/lib/bdev/lvol/vbdev_lvol_rpc.c @@ -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); diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c index 2bb1981c49..85897829aa 100644 --- a/lib/lvol/lvol.c +++ b/lib/lvol/lvol.c @@ -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");