Fix pvmove --abort <dev> return code

It prints error code even if abort operation succeeds:

pvmove --abort /dev/sdb
  Command failed with status code 5.

diff --git a/WHATS_NEW b/WHATS_NEW
index 04c362b730ab013835b9ef6fdef8b5cae9d02c2f..b7f19233bc9c7533a955383fab86f3108bd47b4f 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.74 - 
 ==================================
+  Fix return code of pvmove --abort PV.
   Fix pvmove --abort to remove even for empty pvmove LV.
   Add configure --with-default-data-alignment.
   Update heuristic used for default and detected data alignment.

diff --git a/tools/polldaemon.c b/tools/polldaemon.c
index 147d5320db9226cdfae92325df62f59e724b1b4e..2d5a8cdfddbd471d726a6cfa8d61fb67dcc9f660 100644 (file)
--- a/tools/polldaemon.c
+++ b/tools/polldaemon.c
@@ -120,8 +120,10 @@ static int _check_lv_status(struct cmd_context *cmd,
                                  "can't abort.");
                        return 0;
                }
-               parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed);
-               return 0;
+               if (!parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed))
+                       return_0;
+
+               return 1;
        }
 
        progress = parms->poll_fns->poll_progress(cmd, lv, name, parms);