lv: add common lv_convert_lv fn for use in report and dup, use brackets for invisible...

The common lv_convert_lv fn avoids code duplication and also
the reporting part now uses _lvname_disp and _uuid_disp to display
name and uuid respectively, including brackets for the name if the
dev is invisible.

diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 0310e70ade32ab4c8beec04cd0e689a1ccead931..e1cf5cd2bb0bdbf3d0ad1c653ad3a35760a0e8ef 100644 (file)
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -462,8 +462,7 @@ int lv_kernel_major(const struct logical_volume *lv)
        return -1;
 }
 
-static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
-                                  int uuid)
+struct logical_volume *lv_convert_lv(const struct logical_volume *lv)
 {
        struct lv_segment *seg;
 
@@ -472,13 +471,25 @@ static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_vol
 
                /* Temporary mirror is always area_num == 0 */
                if (seg_type(seg, 0) == AREA_LV &&
-                   is_temporary_mirror_layer(seg_lv(seg, 0))) {
-                       if (uuid)
-                               return lv_uuid_dup(mem, seg_lv(seg, 0));
-                       else
-                               return lv_name_dup(mem, seg_lv(seg, 0));
-               }
+                   is_temporary_mirror_layer(seg_lv(seg, 0)))
+                       return seg_lv(seg, 0);
        }
+
+       return NULL;
+}
+
+static char *_do_lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv,
+                                  int uuid)
+{
+       struct logical_volume *convert_lv = lv_convert_lv(lv);
+
+       if (convert_lv) {
+               if (uuid)
+                       return lv_uuid_dup(mem, convert_lv);
+               else
+                       return lv_name_dup(mem, convert_lv);
+       }
+
        return NULL;
 }
 

diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h
index 2f1e4f95c5b553eaa6c5f57346d6215fd78537c5..afecd0a18d789d5bf592d084d4d608006149267e 100644 (file)
--- a/lib/metadata/lv.h
+++ b/lib/metadata/lv.h
@@ -86,6 +86,7 @@ char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
 char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
 char *lv_fullname_dup(struct dm_pool *mem, const struct logical_volume *lv);
 struct logical_volume *lv_parent(const struct logical_volume *lv);
+struct logical_volume *lv_convert_lv(const struct logical_volume *lv);
 char *lv_parent_dup(struct dm_pool *mem, const struct logical_volume *lv);
 char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv);
 char *lv_origin_uuid_dup(struct dm_pool *mem, const struct logical_volume *lv);

diff --git a/lib/report/report.c b/lib/report/report.c
index 9f442120143ce36a46cb1004a1e74c237affc70d..dad163bee01cedd291d4eb1a60e6fc41c2dac067 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -1271,9 +1271,9 @@ static int _chars_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((
        return dm_report_field_string(rh, field, (const char * const *) &data);
 }
 
-static int _uuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem,
+static int _uuid_disp(struct dm_report *rh, struct dm_pool *mem,
                      struct dm_report_field *field,
-                     const void *data, void *private __attribute__((unused)))
+                     const void *data, void *private)
 {
        char *repstr;
 
@@ -1968,17 +1968,15 @@ static int _do_convertlv_disp(struct dm_report *rh, struct dm_pool *mem,
                              int uuid)
 {
        const struct logical_volume *lv = (const struct logical_volume *) data;
-       const char *repstr;
+       const struct logical_volume *convert_lv = lv_convert_lv(lv);
+
+       if (!convert_lv)
+               return _field_set_value(field, "", NULL);
 
        if (uuid)
-               repstr = lv_convert_lv_uuid_dup(mem, lv);
+               return _uuid_disp(rh, mem, field, &convert_lv->lvid.id[1], private);
        else
-               repstr = lv_convert_lv_dup(mem, lv);
-
-       if (repstr)
-               return _string_disp(rh, mem, field, &repstr, private);
-
-       return _field_set_value(field, "", NULL);
+               return _lvname_disp(rh, mem, field, convert_lv, private);
 }
 
 static int _convertlv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),