Fix interrupt unblocking after vgcreate, for example: drop_cached_metadata()

previously left _vg_lock_count incremented.
Other locks are always held during drop_cached_metadata() so there's no
need to increment+decrement it.

diff --git a/WHATS_NEW b/WHATS_NEW
index 8b13c533b610e6b665d5216933891139b44d8e55..1085c29d503ca4eee46d58037dfd380c7ab899b7 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.45 - 
 ===================================
+  Exclude LCK_CACHE locks from _vg_lock_count, fixing interrupt unblocking.
   Provide da and mda locations in debug message when writing text format label.
   Mention the restriction on file descriptors at invocation on the lvm man page.
   Index cached vgmetadata by vgid not vgname to cope with duplicate vgnames.

diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index bf28d9a912e881320ee6f653617413e706265322..ad93dddb8a7e838fc9fa04765032a92f5d9fcff3 100644 (file)
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -191,7 +191,8 @@ void reset_locking(void)
 
 static void _update_vg_lock_count(uint32_t flags)
 {
-       if ((flags & LCK_SCOPE_MASK) != LCK_VG)
+       if ((flags & LCK_SCOPE_MASK) != LCK_VG ||
+           (flags & LCK_CACHE))
                return;
 
        if ((flags & LCK_TYPE_MASK) == LCK_UNLOCK)