summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WHATS_NEW1
-rw-r--r--daemons/clvmd/clvmd-command.c4
-rw-r--r--lib/locking/cluster_locking.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index b1765d9c..23481fb8 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.35 -
=================================
+ Rename P_global to P_#global.
Don't attempt remote metadata backups of non-clustered VGs. (2.02.29)
Don't store fid in VG metadata cache to avoid clvmd segfault. (2.02.34)
Update vgsplit tests to verify loosening of active LV restriction.
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 717a73f7..2d9e21a1 100644
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -118,8 +118,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
lockname = &args[2];
/* Check to see if the VG is in use by LVM1 */
status = do_check_lvm1(lockname);
- /* P_global causes a cache refresh */
- if (strcmp(lockname, "P_global") == 0)
+ /* P_#global causes a cache refresh */
+ if (strcmp(lockname, "P_#global") == 0)
do_refresh_cache();
break;
diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 08003314..bedc38a2 100644
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -390,7 +390,7 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)
if (!*resource) /* FIXME Deprecated */
dm_snprintf(lockname, sizeof(lockname), "P_orphans");
else if (*resource == '#')
- dm_snprintf(lockname, sizeof(lockname), "P_%s", resource + 1);
+ dm_snprintf(lockname, sizeof(lockname), "P_%s", resource);
else
dm_snprintf(lockname, sizeof(lockname), "V_%s",
resource);