From 88f37ac8d7e83488269b9e47b65b4846370fdd98 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Tue, 29 Oct 2024 17:48:55 +0100
Subject: [PATCH] experimental: lv section in separate function

Just to see whether it makes code more readable
if we 'extract' just parsing of lv section
to standalone function

(also could be called maybe instead from _read_lvsegs
so _read_lvnames is only radix_treeing  lvname)
---
 lib/format_text/import_vsn1.c | 74 +++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c
index 096c44369..a187dc78d 100644
--- a/lib/format_text/import_vsn1.c
+++ b/lib/format_text/import_vsn1.c
@@ -679,20 +679,16 @@ static int _read_segments(struct cmd_context *cmd,
 	return 1;
 }
 
-static int _read_lvnames(struct cmd_context *cmd,
-			 struct format_type *fmt,
-			 struct format_instance *fid __attribute__((unused)),
-			 struct dm_pool *mem,
-			 struct volume_group *vg,
-			 struct lvmcache_vgsummary *vgsummary,
-			 const struct dm_config_node *lvn,
-			 const struct dm_config_node *vgn __attribute__((unused)))
+static int _read_lv_section(struct cmd_context *cmd,
+			    struct format_type *fmt,
+			    struct dm_pool *mem,
+			    struct volume_group *vg,
+			    struct logical_volume *lv,
+			    const struct dm_config_node *lvn)
 {
-	struct logical_volume *lv;
-	const char *str;
 	const struct dm_config_value *tags_cv = NULL;
 	const char *hostname = NULL;
-	uint64_t timestamp = 0, lvstatus = 0;
+	uint64_t timestamp = 0, lvstatus = lv->status;
 	const char *alloc = NULL, *profile = NULL, *lock_args = NULL;
 	unsigned seg_count = 0;
 	uint32_t read_ahead = UINT32_C(-2);
@@ -716,25 +712,6 @@ static int _read_lvnames(struct cmd_context *cmd,
 		{ "tags",	       &tags_cv,    CONFIG_VALUE_LIST,     },
 	};
 
-	if (!(str = dm_pool_strdup(mem, lvn->key)))
-		return_0;
-
-	if (!(lvn = lvn->child)) {
-		log_error("Empty logical volume section for %s.", str);
-		return 0;
-	}
-
-	if (!(lv = alloc_lv(mem)))
-		return_0;
-
-	if (!link_lv_to_vg(vg, lv))
-		return_0;
-
-	if (!lv_set_name(lv, str))
-		return_0;
-
-	log_debug_metadata("Importing logical volume %s.", lv->name);
-
 	if (!text_import_values(lvn, values, DM_ARRAY_SIZE(values))) {
 		log_error("Could not import values for logical volume %s.",
 			  display_lvname(lv));
@@ -888,6 +865,43 @@ static int _read_lvnames(struct cmd_context *cmd,
 	return 1;
 }
 
+static int _read_lvnames(struct cmd_context *cmd,
+			 struct format_type *fmt,
+			 struct format_instance *fid __attribute__((unused)),
+			 struct dm_pool *mem,
+			 struct volume_group *vg,
+			 struct lvmcache_vgsummary *vgsummary,
+			 const struct dm_config_node *lvn,
+			 const struct dm_config_node *vgn __attribute__((unused)))
+{
+	struct logical_volume *lv;
+	const char *str;
+
+	if (!(str = dm_pool_strdup(mem, lvn->key)))
+		return_0;
+
+	if (!(lvn = lvn->child)) {
+		log_error("Empty logical volume section for %s.", str);
+		return 0;
+	}
+
+	if (!(lv = alloc_lv(mem)))
+		return_0;
+
+	if (!link_lv_to_vg(vg, lv))
+		return_0;
+
+	if (!lv_set_name(lv, str))
+		return_0;
+
+	log_debug_metadata("Importing logical volume %s.", lv->name);
+
+	if (!_read_lv_section(cmd, fmt, mem, vg, lv, lvn))
+		return_0;
+
+	return 1;
+}
+
 static int _read_historical_lvnames(struct cmd_context *cmd,
 				    struct format_type *fmt,
 				    struct format_instance *fid __attribute__((unused)),