From ff112eee181748dbf827d91a7ebf0c0f1d7878a0 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 29 Nov 2013 15:54:51 +0100 Subject: [PATCH] thin: merge display --- lib/display/display.c | 6 ++++++ lib/metadata/lv.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/display/display.c b/lib/display/display.c index 2fd37a216..1babffc65 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -607,8 +607,14 @@ int lvdisplay_full(struct cmd_context *cmd, if (seg->external_lv) log_print("LV External origin name %s", seg->external_lv->name); + if (seg->merge_lv) + log_print("LV merging to %s", + seg->merge_lv->name); if (inkernel) thin_active = lv_thin_percent(lv, 0, &thin_percent); + if (lv_is_merging_origin(lv)) + log_print("LV merged with %s", + find_snapshot(lv)->lv->name); } else if (lv_is_thin_pool(lv)) { if (inkernel) { thin_data_active = lv_thin_pool_percent(lv, 0, &thin_data_percent); diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index c1f6271e0..3e1458cca 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -555,7 +555,8 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv) else if (lv->status & MIRRORED) repstr[0] = (lv->status & LV_NOTSYNCED) ? 'M' : 'm'; else if (lv_is_thin_volume(lv)) - repstr[0] = 'V'; + repstr[0] = lv_is_merging_origin(lv) ? + 'O' : (lv_is_merging_thin_snapshot(lv) ? 'S' : 'V'); else if (lv->status & VIRTUAL) repstr[0] = 'v'; else if (lv_is_thin_pool(lv))