Refactor and add code for (lv) 'modules' get function.

diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 345f958bf3e83cdc1d8528cdc16c20e29b3b47f0..634e21d052212cefc79204132b81c780268e0611 100644 (file)
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -18,6 +18,21 @@
 #include "activate.h"
 #include "toolcontext.h"
 #include "segtype.h"
+#include "str_list.h"
+
+char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+       struct dm_list *modules;
+
+       if (!(modules = str_list_create(mem))) {
+               log_error("modules str_list allocation failed");
+               return NULL;
+       }
+
+       if (!list_lv_modules(mem, lv, modules))
+               return_NULL;
+       return tags_format_and_copy(lv->vg->vgmem, modules);
+}
 
 char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv)
 {

diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h
index 8d069afd36ae02906ccd8b8577534d4cbf160ec9..2f0ebeeb64c5a1611395b5949e6f007d1fba6338 100644 (file)
--- a/lib/metadata/lv.h
+++ b/lib/metadata/lv.h
@@ -59,5 +59,6 @@ char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
 int lv_kernel_major(const struct logical_volume *lv);
 int lv_kernel_minor(const struct logical_volume *lv);
 char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
 
 #endif

diff --git a/lib/report/properties.c b/lib/report/properties.c
index eba2b59377fb14856fd8143e5f2cfb933da5dcab..ce1d2f7a3ea00dee714caff3669459949f460059 100644 (file)
--- a/lib/report/properties.c
+++ b/lib/report/properties.c
@@ -137,7 +137,7 @@ GET_LV_STR_PROPERTY_FN(lv_tags, lv_tags_dup(lv))
 #define _lv_tags_set _not_implemented_set
 GET_LV_STR_PROPERTY_FN(mirror_log, lv_mirror_log_dup(lv->vg->vgmem, lv))
 #define _mirror_log_set _not_implemented_set
-#define _modules_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(modules, lv_modules_dup(lv->vg->vgmem, lv))
 #define _modules_set _not_implemented_set
 
 /* VG */

diff --git a/lib/report/report.c b/lib/report/report.c
index e6510c5cc45ab2f06658868d74e77f5c35903773..d1553729e525d601ee65f8cc64a3f21309312793 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -165,17 +165,13 @@ static int _modules_disp(struct dm_report *rh, struct dm_pool *mem,
                         const void *data, void *private)
 {
        const struct logical_volume *lv = (const struct logical_volume *) data;
-       struct dm_list *modules;
+       char *modules_str;
 
-       if (!(modules = str_list_create(mem))) {
-               log_error("modules str_list allocation failed");
+       if (!(modules_str = lv_modules_dup(mem, lv)))
                return 0;
-       }
-
-       if (!list_lv_modules(mem, lv, modules))
-               return_0;
 
-       return _tags_disp(rh, mem, field, modules, private);
+       dm_report_field_set_value(field, modules_str, NULL);
+       return 1;
 }
 
 static int _vgfmt_disp(struct dm_report *rh, struct dm_pool *mem,