Reverting recent commit to disallow adding/removing mirror log while

removing/adding mirror images... There was already code in there to
do the job - I just didn't find it in WHATS_NEW (or in the code right
away).

diff --git a/WHATS_NEW b/WHATS_NEW
index 04920bc6a14ddcf3d5287caf8c78931e533411c6..1a4dcc77da90bf4ea91b51276470dfe8fca2f534 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,5 @@
 Version 2.02.80 - 
 ====================================
-  Prevent adding/removing mirror log while removing/adding an image.
   Add missing tests in _setup_task().
   Fail poll daemon creation when lvmcache_init() fails.
   Return defined value for errors in _copy_percent() and _snap_percent().

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 3dab0d3f8a61a5ca9ff62d7be1b6457574ba97a6..9ae5f7a2a15daccfb92742fc95c8e704ad5706f9 100644 (file)
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -926,25 +926,6 @@ static int _lvconvert_mirrors_parse_params(struct cmd_context *cmd,
                return 0;
        }
 
-       /*
-        * Disallow adding logs while removing images or
-        *          adding images while removing logs
-        */
-       if ((*old_log_count < *new_log_count) &&
-           (*old_mimage_count > *new_mimage_count)) {
-               log_error("Mirror logs cannot be added while images are"
-                         " being removed.");
-               log_error("Try two separate commands.");
-               return 0;
-       }
-       if ((*old_log_count > *new_log_count) &&
-           (*old_mimage_count < *new_mimage_count)) {
-               log_error("Mirror images cannot be added while logs are"
-                         " being removed.");
-               log_error("Try two separate commands.");
-               return 0;
-       }
-
        /*
         * No mirrored logs for cluster mirrors until
         * log daemon is multi-threaded.
@@ -1368,8 +1349,8 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
         if (((old_mimage_count < new_mimage_count && old_log_count > new_log_count) ||
              (old_mimage_count > new_mimage_count && old_log_count < new_log_count)) &&
             lp->pv_count) {
-               log_error("Cannot both allocate and free extents when specifying physical"
-                         " volumes to use.");
+               log_error("Cannot both allocate and free extents when "
+                         "specifying physical volumes to use.");
                log_error("Please specify the operation in two steps.");
                return 0;
         }