Mask LCK_HOLD flag in cluster VG locks for compatibility reasons.

diff --git a/WHATS_NEW b/WHATS_NEW
index 7f32814ca0440af90c9df45501de307528bf6add..8b3ca2870f04eddc6eaa72a20f7bec04bddc0dcb 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.63 -  
 ================================
+  Mask LCK_HOLD flag in cluster VG locks for compatibility reasons.
   Add activation/polling_interval to lvm.conf as --interval default.
   Don't ignore error if resuming any LV fails in resume_lvs.
   Skip closing persistent filter cache file if open failed.

diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 082ebec8ba4b49a83223b0e76be2b353e5a68777..aff213a93c3e2756bd73e3ecb73897f1392b18e3 100644 (file)
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -415,6 +415,13 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)
 
                lock_scope = "VG";
                clvmd_cmd = CLVMD_CMD_LOCK_VG;
+               /*
+                * Old clvmd does not expect LCK_HOLD which was already processed
+                * in lock_vol, mask it for compatibility reasons.
+                */
+               if (flags != LCK_VG_COMMIT && flags != LCK_VG_REVERT)
+                       flags &= ~LCK_HOLD;
+
                break;
 
        case LCK_LV: