[arch-commits] Commit in lvm2/trunk (2 files)

[Christian Hesse]

    Date: Thursday, June 16, 2016 @ 11:14:16
  Author: eworm
Revision: 270009

upgpkg: lvm2 2.02.156-2

pvscan: fix lvmlockd global lock (fix FS#49530 ?)

Added:
  lvm2/trunk/02-pvscan-fix-lvmlockd-global-lock.patch
Modified:
  lvm2/trunk/PKGBUILD

------------------------------------------+
 02-pvscan-fix-lvmlockd-global-lock.patch |   27 +++++++++++++++++++++++++++
 PKGBUILD                                 |   11 ++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 02-pvscan-fix-lvmlockd-global-lock.patch
===================================================================
--- 02-pvscan-fix-lvmlockd-global-lock.patch	                        (rev 0)
+++ 02-pvscan-fix-lvmlockd-global-lock.patch	2016-06-16 11:14:16 UTC (rev 270009)
@@ -0,0 +1,27 @@
+From 944ae4d2df0f15afb29ac0a68d0dd012d9df9acf Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland at redhat.com>
+Date: Wed, 15 Jun 2016 16:51:36 -0500
+Subject: pvscan: fix lvmlockd global lock
+
+This should have been removed when pvscan was
+recently converted to use process_each_pv which
+does the lvmlockd locking.
+---
+ tools/pvscan.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tools/pvscan.c b/tools/pvscan.c
+index 5987e8b..78dad82 100644
+--- a/tools/pvscan.c
++++ b/tools/pvscan.c
+@@ -624,10 +624,6 @@ int pvscan(struct cmd_context *cmd, int argc, char **argv)
+ 		return ECMD_FAILED;
+ 	}
+ 
+-	/* Needed for a current listing of the global VG namespace. */
+-	if (!lockd_gl(cmd, "sh", 0))
+-		return_ECMD_FAILED;
+-
+ 	if (!(handle = init_processing_handle(cmd))) {
+ 		log_error("Failed to initialize processing handle.");
+ 		ret = ECMD_FAILED;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-16 10:36:28 UTC (rev 270008)
+++ PKGBUILD	2016-06-16 11:14:16 UTC (rev 270009)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.156
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,7 +16,8 @@
         lvm2_hook
         sd-lvm2_install
         11-dm-initramfs.rules
-        01-lvm2-make-sockets-static.patch)
+        01-lvm2-make-sockets-static.patch
+        02-pvscan-fix-lvmlockd-global-lock.patch)
 sha1sums=('35756b700c33e5a19a864656493aace33da79661'
           'SKIP'
           '056bb0227d07e35a3d365db02f439585314cfc76'
@@ -23,7 +24,8 @@
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           'f6ac78163ab3aba5b51a71655d6e53d05014bfa4'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
+          'df8b2110203464f2bb55fb728cdd07e6d71f1a10')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
@@ -34,6 +36,9 @@
 
   # make systemd sockets static
   patch -p1 -i "${srcdir}/01-lvm2-make-sockets-static.patch"
+
+  # pvscan: fix lvmlockd global lock
+  patch -p1 -i "${srcdir}/02-pvscan-fix-lvmlockd-global-lock.patch"
 }
 
 build() {