diff options
| -rw-r--r-- | lib/metadata/lv.c | 13 | ||||
| -rw-r--r-- | lib/metadata/lv.h | 1 | ||||
| -rw-r--r-- | lib/report/properties.c | 2 | ||||
| -rw-r--r-- | lib/report/report.c | 10 |
4 files changed, 18 insertions, 8 deletions
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index ba2e00cc..345f958b 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -17,6 +17,19 @@ #include "metadata.h" #include "activate.h" #include "toolcontext.h" +#include "segtype.h" + +char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv) +{ + struct lv_segment *seg; + + dm_list_iterate_items(seg, &lv->segments) { + if (!seg_is_mirrored(seg) || !seg->log_lv) + continue; + return dm_pool_strdup(mem, seg->log_lv->name); + } + return NULL; +} int lv_kernel_minor(const struct logical_volume *lv) { diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 557f54ae..8d069afd 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -58,5 +58,6 @@ 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); 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); #endif diff --git a/lib/report/properties.c b/lib/report/properties.c index 5e420149..eba2b593 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -135,7 +135,7 @@ 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 -#define _mirror_log_get _not_implemented_get +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 #define _modules_set _not_implemented_set diff --git a/lib/report/report.c b/lib/report/report.c index f3e3e417..e6510c5c 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -297,14 +297,10 @@ static int _loglv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(( const void *data, void *private __attribute__((unused))) { const struct logical_volume *lv = (const struct logical_volume *) data; - struct lv_segment *seg; + const char *name; - dm_list_iterate_items(seg, &lv->segments) { - if (!seg_is_mirrored(seg) || !seg->log_lv) - continue; - return dm_report_field_string(rh, field, - (const char **) &seg->log_lv->name); - } + if ((name = lv_mirror_log_dup(mem, lv))) + return dm_report_field_string(rh, field, &name); dm_report_field_set_value(field, "", NULL); return 1; |