Commit 56317f62 authored by Eugene Kobyak's avatar Eugene Kobyak Committed by Konrad Sztyber
Browse files

raid: refactor to use write_named_uuid function 



Use spdk_json_write_named_uuid() in
raid_bdev_write_*_json() functions

Change-Id: I589815c4328a39d7d3da99051671a8e0a497397a
Signed-off-by: default avatarEugene Kobyak <eugene.kobyak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22880


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
parent e8b53c0d

module/bdev/raid/bdev_raid.c

+3 −8
Original line number Diff line number Diff line
@@ -1056,13 +1056,11 @@ void 
raid_bdev_write_info_json(struct raid_bdev *raid_bdev, struct spdk_json_write_ctx *w)

{

	struct raid_base_bdev_info *base_info;

	char uuid_str[SPDK_UUID_STRING_LEN];



	assert(raid_bdev != NULL);

	assert(spdk_get_thread() == spdk_thread_get_app_thread());



	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &raid_bdev->bdev.uuid);

	spdk_json_write_named_string(w, "uuid", uuid_str);

	spdk_json_write_named_uuid(w, "uuid", &raid_bdev->bdev.uuid);

	spdk_json_write_named_uint32(w, "strip_size_kb", raid_bdev->strip_size_kb);

	spdk_json_write_named_string(w, "state", raid_bdev_state_to_str(raid_bdev->state));

	spdk_json_write_named_string(w, "raid_level", raid_bdev_level_to_str(raid_bdev->level));
@@ -1095,8 +1093,7 @@ raid_bdev_write_info_json(struct raid_bdev *raid_bdev, struct spdk_json_write_ct 
		} else {

			spdk_json_write_null(w);

		}

		spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &base_info->uuid);

		spdk_json_write_named_string(w, "uuid", uuid_str);

		spdk_json_write_named_uuid(w, "uuid", &base_info->uuid);

		spdk_json_write_named_bool(w, "is_configured", base_info->is_configured);

		spdk_json_write_named_uint64(w, "data_offset", base_info->data_offset);

		spdk_json_write_named_uint64(w, "data_size", base_info->data_size);
@@ -1144,7 +1141,6 @@ raid_bdev_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx * 
{

	struct raid_bdev *raid_bdev = bdev->ctxt;

	struct raid_base_bdev_info *base_info;

	char uuid_str[SPDK_UUID_STRING_LEN];



	assert(spdk_get_thread() == spdk_thread_get_app_thread());
@@ -1159,8 +1155,7 @@ raid_bdev_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx * 


	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_string(w, "name", bdev->name);

	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &raid_bdev->bdev.uuid);

	spdk_json_write_named_string(w, "uuid", uuid_str);

	spdk_json_write_named_uuid(w, "uuid", &raid_bdev->bdev.uuid);

	spdk_json_write_named_uint32(w, "strip_size_kb", raid_bdev->strip_size_kb);

	spdk_json_write_named_string(w, "raid_level", raid_bdev_level_to_str(raid_bdev->level));

	spdk_json_write_named_bool(w, "superblock", raid_bdev->superblock_enabled);

test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ DEFINE_STUB(spdk_bdev_get_memory_domains, int, (struct spdk_bdev *bdev, 
DEFINE_STUB(spdk_bdev_get_name, const char *, (const struct spdk_bdev *bdev), "test_bdev");

DEFINE_STUB(spdk_bdev_is_dif_head_of_md, bool, (const struct spdk_bdev *bdev), false);

DEFINE_STUB(spdk_bdev_notify_blockcnt_change, int, (struct spdk_bdev *bdev, uint64_t size), 0);

DEFINE_STUB(spdk_json_write_named_uuid, int, (struct spdk_json_write_ctx *w, const char *name,

		const struct spdk_uuid *val), 0);

DEFINE_STUB_V(raid_bdev_init_superblock, (struct raid_bdev *raid_bdev));

DEFINE_STUB(raid_bdev_alloc_superblock, int, (struct raid_bdev *raid_bdev, uint32_t block_size), 0);

DEFINE_STUB_V(raid_bdev_free_superblock, (struct raid_bdev *raid_bdev));