lvrename: move the lvmlockd LV lock

The function it was in is used for various
internal renaming of hidden LVs where a lock
from lvmlockd does not apply.

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 2582ed5563991cef255f99687b4040169d58cc2e..2f37f5b195acad1f8bc0320a6345247a315d5b95 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4247,18 +4247,6 @@ int lv_rename_update(struct cmd_context *cmd, struct logical_volume *lv,
                return 0;
        }
 
-       /*
-        * The lvmlockd LV lock is only acquired here to ensure the LV is not
-        * active on another host.  This requests a transient LV lock.
-        * If the LV is active, a persistent LV lock already exists in
-        * lvmlockd, and the transient lock request does nothing.
-        * If the LV is not active, then no LV lock exists and the transient
-        * lock request acquires the LV lock (or fails).  The transient lock
-        * is automatically released when the command exits.
-        */
-       if (!lockd_lv(cmd, lv, "ex", 0))
-               return_0;
-
        if (update_mda && !archive(vg))
                return_0;
 

diff --git a/tools/lvrename.c b/tools/lvrename.c
index 18b02d2650a8666dd2156dbd3b3ecb18baf981e2..217ebdc4047e1ba3cb978ee8ec3496694c6393f4 100644 (file)
--- a/tools/lvrename.c
+++ b/tools/lvrename.c
@@ -46,6 +46,18 @@ static int _lvrename_single(struct cmd_context *cmd, const char *vg_name,
                goto bad;
        }
 
+       /*
+        * The lvmlockd LV lock is only acquired here to ensure the LV is not
+        * active on another host.  This requests a transient LV lock.
+        * If the LV is active, a persistent LV lock already exists in
+        * lvmlockd, and the transient lock request does nothing.
+        * If the LV is not active, then no LV lock exists and the transient
+        * lock request acquires the LV lock (or fails).  The transient lock
+        * is automatically released when the command exits.
+        */
+       if (!lockd_lv(cmd, lvl->lv, "ex", 0))
+               goto_bad;
+
        if (!lv_rename(cmd, lvl->lv, lp->lv_name_new))
                goto_bad;