From e4594d9c2340b58c0ff35dc8e96fab3be76f1aba Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 13 Apr 2010 14:36:24 +0000 Subject: [PATCH] Mask LCK_HOLD flag in cluster VG locks for compatibility reasons. --- WHATS_NEW | 1 + lib/locking/cluster_locking.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/WHATS_NEW b/WHATS_NEW index 7f32814ca..8b3ca2870 100644 --- 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 082ebec8b..aff213a93 100644 --- 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: -- 2.43.5