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

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>

diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 4ceb7136f75931ab9efbb4a44841ee11d69010fe..98b6f638ffe50c6dcafbabcdf88fcaa0053938b5 100644 (file)
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -18,6 +18,21 @@
 #include "activate.h"
 #include "toolcontext.h"
 
+char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+       struct lv_segment *seg;
+
+       if (lv->status & (CONVERTING|MIRRORED)) {
+               seg = first_seg(lv);
+
+               /* Temporary mirror is always area_num == 0 */
+               if (seg_type(seg, 0) == AREA_LV &&
+                   is_temporary_mirror_layer(seg_lv(seg, 0)))
+                       return dm_pool_strdup(mem, seg_lv(seg, 0)->name);
+       }
+       return NULL;
+}
+
 char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv)
 {
        struct lv_segment *seg;

diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h
index bfb38f9436c1da64c035373aa293f8dcf5242127..1ba932b8cb539a1f012e1d79b98e81ec8a25b798 100644 (file)
--- a/lib/metadata/lv.h
+++ b/lib/metadata/lv.h
@@ -55,5 +55,6 @@ char *lv_tags_dup(const struct logical_volume *lv);
 char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
 uint64_t lv_origin_size(const struct logical_volume *lv);
 char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
 
 #endif

diff --git a/lib/report/properties.c b/lib/report/properties.c
index bcec0c848362c626ebb3d1852d5e9d06bf072e5c..db026831a1777f416f88e0c263d669f546f6ef90 100644 (file)
--- a/lib/report/properties.c
+++ b/lib/report/properties.c
@@ -131,7 +131,7 @@ GET_LV_NUM_PROPERTY_FN(origin_size, lv_origin_size(lv))
 #define _copy_percent_set _not_implemented_set
 GET_LV_STR_PROPERTY_FN(move_pv, lv_move_pv_dup(lv->vg->vgmem, lv))
 #define _move_pv_set _not_implemented_set
-#define _convert_lv_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(convert_lv, lv_convert_lv_dup(lv->vg->vgmem, lv))
 #define _convert_lv_set _not_implemented_set
 GET_LV_STR_PROPERTY_FN(lv_tags, lv_tags_dup(lv))
 #define _lv_tags_set _not_implemented_set

diff --git a/lib/report/report.c b/lib/report/report.c
index 26ff879512d28dedc0ec8b92788fc9457a68a2e7..bb2d4ceedddc241086b2dd76f09bd984f9ec874f 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -392,19 +392,8 @@ static int _convertlv_disp(struct dm_report *rh, struct dm_pool *mem __attribute
 {
        const struct logical_volume *lv = (const struct logical_volume *) data;
        const char *name = NULL;
-       struct lv_segment *seg;
-
-       if (lv->status & CONVERTING) {
-               if (lv->status & MIRRORED) {
-                       seg = first_seg(lv);
-
-                       /* Temporary mirror is always area_num == 0 */
-                       if (seg_type(seg, 0) == AREA_LV &&
-                           is_temporary_mirror_layer(seg_lv(seg, 0)))
-                               name = seg_lv(seg, 0)->name;
-               }
-       }
 
+       name = lv_convert_lv_dup(mem, lv);
        if (name)
                return dm_report_field_string(rh, field, &name);