[pve-devel] [PATCH v2 lvm] fix #2184: filter lvs from guests

[Oguz Bektas]

Signed-off-by: Oguz Bektas <o.bektas at proxmox.com>
---
v1 -> v2:
* use format-patch flags --no-signature and --no-numbered


 ...01-filter-zvols-and-lvs-from-guests.patch} | 21 +++++++++----------
 ...002-enable-issue_discards-by-default.patch | 11 ++++------
 ....patch => 0003-disable-init-scripts.patch} | 14 ++++++-------
 patchdir/series                               |  5 +++--
 4 files changed, 23 insertions(+), 28 deletions(-)
 rename patchdir/{0001-filter-zvols-and-PVE-VG-by-default.patch => 0001-filter-zvols-and-lvs-from-guests.patch} (53%)
 rename patchdir/{0006-disable-init-scripts.patch => 0003-disable-init-scripts.patch} (74%)

diff --git a/patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch b/patchdir/0001-filter-zvols-and-lvs-from-guests.patch
similarity index 53%
rename from patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch
rename to patchdir/0001-filter-zvols-and-lvs-from-guests.patch
index 5ebe494..bab1f44 100644
--- a/patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch
+++ b/patchdir/0001-filter-zvols-and-lvs-from-guests.patch
@@ -1,30 +1,29 @@
-From 65e9206964c546842ccd8cc8c7885b4feb66c429 Mon Sep 17 00:00:00 2001
+From 3d331953abde0c9d70b3741bbcc38d36cd0a55b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Fri, 17 Mar 2017 11:59:25 +0100
-Subject: [PATCH 1/6] filter zvols and PVE VG by default
+Subject: [PATCH] filter zvols and lvs from guests
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
+Signed-off-by: Oguz Bektas <o.bektas at proxmox.com>
 ---
- conf/example.conf.in | 3 +++
- 1 file changed, 3 insertions(+)
+ conf/example.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 736b4bd..1a8a67b 100644
+index 0204f4b5a..cd921e10e 100644
 --- a/conf/example.conf.in
 +++ b/conf/example.conf.in
-@@ -125,6 +125,9 @@ devices {
+@@ -124,6 +124,10 @@ devices {
+ 	# as the combination might produce unexpected results (test changes.)
  	# Run vgscan after changing the filter to regenerate the cache.
- 	# See the use_lvmetad comment for a special case regarding filters.
  	# 
 +	# Do not scan ZFS zvols (to avoid problems on ZFS zvols snapshots)
-+	global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" ]
++	# Also do not scan LVM disks created by guests
++	global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" "r|/dev/mapper/.*-vm--[0-9]+--disk--[0-9]+|"]
 +
  	# Example
  	# Accept every block device:
  	# filter = [ "a|.*/|" ]
--- 
-2.14.1
-
diff --git a/patchdir/0002-enable-issue_discards-by-default.patch b/patchdir/0002-enable-issue_discards-by-default.patch
index ac66732..8f69989 100644
--- a/patchdir/0002-enable-issue_discards-by-default.patch
+++ b/patchdir/0002-enable-issue_discards-by-default.patch
@@ -1,7 +1,7 @@
-From 829981232ec0ec4e8b2cae15d3fb940907feb28f Mon Sep 17 00:00:00 2001
+From a49c621f30b9d72f0439e9cf8fe7a605af7f438e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Fri, 17 Mar 2017 11:59:54 +0100
-Subject: [PATCH 2/6] enable issue_discards by default
+Subject: [PATCH] enable issue_discards by default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 1a8a67b..56b0795 100644
+index cd921e10e..3ec9e4038 100644
 --- a/conf/example.conf.in
 +++ b/conf/example.conf.in
-@@ -301,7 +301,7 @@ devices {
+@@ -286,7 +286,7 @@ devices {
  	# benefit from discards, but SSDs and thinly provisioned LUNs
  	# generally do. If enabled, discards will only be issued if both the
  	# storage and kernel provide support.
@@ -24,6 +24,3 @@ index 1a8a67b..56b0795 100644
  
  	# Configuration option devices/allow_changes_with_duplicate_pvs.
  	# Allow VG modification while a PV appears on multiple devices.
--- 
-2.14.1
-
diff --git a/patchdir/0006-disable-init-scripts.patch b/patchdir/0003-disable-init-scripts.patch
similarity index 74%
rename from patchdir/0006-disable-init-scripts.patch
rename to patchdir/0003-disable-init-scripts.patch
index 2456578..0982680 100644
--- a/patchdir/0006-disable-init-scripts.patch
+++ b/patchdir/0003-disable-init-scripts.patch
@@ -1,21 +1,21 @@
-From 39b527272533a3138ffc7f4988235176eb889d03 Mon Sep 17 00:00:00 2001
+From 808b192f09f93acd32d91a7eec6185e38db176d6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Mon, 9 Oct 2017 13:05:31 +0200
-Subject: [PATCH 6/6] disable init scripts
+Subject: [PATCH] disable init scripts
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
 ---
- debian/rules | 3 ---
- 1 file changed, 3 deletions(-)
+ debian/rules | 4 ----
+ 1 file changed, 4 deletions(-)
 
 diff --git a/debian/rules b/debian/rules
-index eaafe6c..44a7fae 100755
+index da8bd803b..315502959 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -126,10 +126,6 @@
+@@ -126,10 +126,6 @@ override_dh_installchangelogs:
  	dh_installchangelogs -plvm2 WHATS_NEW
  	dh_installchangelogs --remaining-packages
  
@@ -26,5 +26,3 @@ index eaafe6c..44a7fae 100755
  override_dh_makeshlibs:
  	dh_makeshlibs -plibdevmapper$(DEVMAPPER_ABINAME) \
  		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
--- 
-2.14.1
diff --git a/patchdir/series b/patchdir/series
index f462706..b980b82 100644
--- a/patchdir/series
+++ b/patchdir/series
@@ -1,3 +1,4 @@
-0001-filter-zvols-and-PVE-VG-by-default.patch
+0001-filter-zvols-and-lvs-from-guests.patch
 0002-enable-issue_discards-by-default.patch
-0006-disable-init-scripts.patch
+0003-disable-init-scripts.patch
+series
-- 
2.20.1