From: Heinz Mauelshagen <heinzm@redhat.com>
Date: Mon, 24 Apr 2017 15:44:54 +0000 (+0200)
Subject: lvconvert: fix inactive mirror up converting regression
X-Git-Tag: v2_02_171~28
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=aa1d5d5c89873c0002628142fd9b2c7c4cc1da55;p=lvm2.git

lvconvert: fix inactive mirror up converting regression

Up converting an inactive mirror with insufficient
devs results in an over concerned warning.

Resolves: rhbz1437653
---

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index d5ca6d75d..22967e8f3 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -919,7 +919,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
 				    MIRROR_BY_LV)) {
 			layer_lv = seg_lv(first_seg(lv), 0);
 			if (!remove_layer_from_lv(lv, layer_lv) ||
-			    !deactivate_lv(cmd, layer_lv) ||
+			    (lv_is_active(lv) && !deactivate_lv(cmd, layer_lv)) ||
 			    !lv_remove(layer_lv) ||
 			    !vg_write(lv->vg) || !vg_commit(lv->vg)) {
 				log_error("ABORTING: Failed to remove "