]> sourceware.org Git - lvm2.git/commitdiff
cleanup: deactivate has builtin check for active lv
authorZdenek Kabelac <zkabelac@redhat.com>
Wed, 23 Nov 2016 09:29:42 +0000 (10:29 +0100)
committerZdenek Kabelac <zkabelac@redhat.com>
Wed, 23 Nov 2016 16:55:03 +0000 (17:55 +0100)
tools/lvconvert.c

index 6165320a98bd0fe61a78d845e62f36455c68e16d..f50a551f13024a19841d6dd0ef55001369404b3a 100644 (file)
@@ -1523,10 +1523,9 @@ 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) ||
-                           (lv_is_active(layer_lv) &&
-                            !deactivate_lv(cmd, layer_lv)) ||
-                           !lv_remove(layer_lv) || !vg_write(lv->vg) ||
-                           !vg_commit(lv->vg)) {
+                           !deactivate_lv(cmd, layer_lv) ||
+                           !lv_remove(layer_lv) ||
+                           !vg_write(lv->vg) || !vg_commit(lv->vg)) {
                                log_error("ABORTING: Failed to remove "
                                          "temporary mirror layer %s.",
                                          display_lvname(layer_lv));
This page took 0.039847 seconds and 5 git commands to generate.