Add all exclusive locks to clvmd restart option args

Fix bug when only every even lock has been passed.

Warning: currently -E causes clvmd to exit with usage text being printed.

diff --git a/WHATS_NEW b/WHATS_NEW
index e644845e5f97838981f266cf545caec808272f40..a1ee27a0ab30162eba0234a8185105345f9e8df0 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Add all exclusive locks to clvmd restart option args.
   Always send the whole clvmd packet header in refresh commands.
   Add missing error checks for some system calls in cmirrord.
   Add missing log_error() to lvresize command when fsadm tool fails.

diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 75f1367435ad8eb0136037a5b25cc5b71b0fe0a0..c83e2cfdfdad23b34a4a6b71761af015b2870de2 100644 (file)
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -369,7 +369,6 @@ static int restart_clvmd(void)
        DEBUGLOG("clvmd restart requested\n");
 
        /* Count exclusively-open LVs */
-       hn = NULL;
        do {
                hn = get_next_excl_lock(hn, &lv_name);
                if (lv_name)
@@ -403,6 +402,7 @@ static int restart_clvmd(void)
         */
 
        /* Now add the exclusively-open LVs */
+       hn = NULL;
        do {
                hn = get_next_excl_lock(hn, &lv_name);
                if (lv_name) {
@@ -414,7 +414,6 @@ static int restart_clvmd(void)
                                goto_out;
 
                        DEBUGLOG("excl lock: %s\n", lv_name);
-                       hn = get_next_excl_lock(hn, &lv_name);
                }
        } while (hn && *lv_name);
        argv[argc++] = NULL;