diff --git a/.gitignore b/.gitignore
index 4b88233..a241ccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/LVM2.2.03.05.tgz
+SOURCES/LVM2.2.03.08.tgz
diff --git a/.lvm2.metadata b/.lvm2.metadata
index a20d07d..6126a43 100644
--- a/.lvm2.metadata
+++ b/.lvm2.metadata
@@ -1 +1 @@
-edfa340a4bbdb3e995521bebbe5307fd7687ac3b SOURCES/LVM2.2.03.05.tgz
+ed5cd9f81b22ad5d76b927711c977463879d8afd SOURCES/LVM2.2.03.08.tgz
diff --git a/SOURCES/lvm2-2_03_06-Fix-rounding-writes-up-to-sector-size.patch b/SOURCES/lvm2-2_03_06-Fix-rounding-writes-up-to-sector-size.patch
deleted file mode 100644
index b07c896..0000000
--- a/SOURCES/lvm2-2_03_06-Fix-rounding-writes-up-to-sector-size.patch
+++ /dev/null
@@ -1,281 +0,0 @@
- lib/device/bcache.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++--
- lib/device/dev-io.c | 52 +++++++++++++++++++++++++++++++
- lib/device/device.h |  8 +++--
- lib/label/label.c   | 30 ++++++++++++++----
- 4 files changed, 169 insertions(+), 10 deletions(-)
-
-diff --git a/lib/device/bcache.c b/lib/device/bcache.c
-index 7b09353..04fbf35 100644
---- a/lib/device/bcache.c
-+++ b/lib/device/bcache.c
-@@ -169,6 +169,7 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
- 	sector_t offset;
- 	sector_t nbytes;
- 	sector_t limit_nbytes;
-+	sector_t orig_nbytes;
- 	sector_t extra_nbytes = 0;
- 
- 	if (((uintptr_t) data) & e->page_mask) {
-@@ -191,11 +192,41 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
- 			return false;
- 		}
- 
-+		/*
-+		 * If the bcache block offset+len goes beyond where lvm is
-+		 * intending to write, then reduce the len being written
-+		 * (which is the bcache block size) so we don't write past
-+		 * the limit set by lvm.  If after applying the limit, the
-+		 * resulting size is not a multiple of the sector size (512
-+		 * or 4096) then extend the reduced size to be a multiple of
-+		 * the sector size (we don't want to write partial sectors.)
-+		 */
- 		if (offset + nbytes > _last_byte_offset) {
- 			limit_nbytes = _last_byte_offset - offset;
--			if (limit_nbytes % _last_byte_sector_size)
-+
-+			if (limit_nbytes % _last_byte_sector_size) {
- 				extra_nbytes = _last_byte_sector_size - (limit_nbytes % _last_byte_sector_size);
- 
-+				/*
-+				 * adding extra_nbytes to the reduced nbytes (limit_nbytes)
-+				 * should make the final write size a multiple of the
-+				 * sector size.  This should never result in a final size
-+				 * larger than the bcache block size (as long as the bcache
-+				 * block size is a multiple of the sector size).
-+				 */
-+				if (limit_nbytes + extra_nbytes > nbytes) {
-+					log_warn("Skip extending write at %llu len %llu limit %llu extra %llu sector_size %llu",
-+						 (unsigned long long)offset,
-+						 (unsigned long long)nbytes,
-+						 (unsigned long long)limit_nbytes,
-+						 (unsigned long long)extra_nbytes,
-+						 (unsigned long long)_last_byte_sector_size);
-+					extra_nbytes = 0;
-+				}
-+			}
-+
-+			orig_nbytes = nbytes;
-+
- 			if (extra_nbytes) {
- 				log_debug("Limit write at %llu len %llu to len %llu rounded to %llu",
- 					  (unsigned long long)offset,
-@@ -210,6 +241,22 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
- 					  (unsigned long long)limit_nbytes);
- 				nbytes = limit_nbytes;
- 			}
-+
-+			/*
-+			 * This shouldn't happen, the reduced+extended
-+			 * nbytes value should never be larger than the
-+			 * bcache block size.
-+			 */
-+			if (nbytes > orig_nbytes) {
-+				log_error("Invalid adjusted write at %llu len %llu adjusted %llu limit %llu extra %llu sector_size %llu",
-+					  (unsigned long long)offset,
-+					  (unsigned long long)orig_nbytes,
-+					  (unsigned long long)nbytes,
-+					  (unsigned long long)limit_nbytes,
-+					  (unsigned long long)extra_nbytes,
-+					  (unsigned long long)_last_byte_sector_size);
-+				return false;
-+			}
- 		}
- 	}
- 
-@@ -403,6 +450,7 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int fd,
- 		uint64_t nbytes = len;
- 		sector_t limit_nbytes = 0;
- 		sector_t extra_nbytes = 0;
-+		sector_t orig_nbytes = 0;
- 
- 		if (offset > _last_byte_offset) {
- 			log_error("Limit write at %llu len %llu beyond last byte %llu",
-@@ -415,9 +463,30 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int fd,
- 
- 		if (offset + nbytes > _last_byte_offset) {
- 			limit_nbytes = _last_byte_offset - offset;
--			if (limit_nbytes % _last_byte_sector_size)
-+
-+			if (limit_nbytes % _last_byte_sector_size) {
- 				extra_nbytes = _last_byte_sector_size - (limit_nbytes % _last_byte_sector_size);
- 
-+				/*
-+				 * adding extra_nbytes to the reduced nbytes (limit_nbytes)
-+				 * should make the final write size a multiple of the
-+				 * sector size.  This should never result in a final size
-+				 * larger than the bcache block size (as long as the bcache
-+				 * block size is a multiple of the sector size).
-+				 */
-+				if (limit_nbytes + extra_nbytes > nbytes) {
-+					log_warn("Skip extending write at %llu len %llu limit %llu extra %llu sector_size %llu",
-+						 (unsigned long long)offset,
-+						 (unsigned long long)nbytes,
-+						 (unsigned long long)limit_nbytes,
-+						 (unsigned long long)extra_nbytes,
-+						 (unsigned long long)_last_byte_sector_size);
-+					extra_nbytes = 0;
-+				}
-+			}
-+
-+			orig_nbytes = nbytes;
-+
- 			if (extra_nbytes) {
- 				log_debug("Limit write at %llu len %llu to len %llu rounded to %llu",
- 					  (unsigned long long)offset,
-@@ -432,6 +501,22 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int fd,
- 					  (unsigned long long)limit_nbytes);
- 				nbytes = limit_nbytes;
- 			}
-+
-+			/*
-+			 * This shouldn't happen, the reduced+extended
-+			 * nbytes value should never be larger than the
-+			 * bcache block size.
-+			 */
-+			if (nbytes > orig_nbytes) {
-+				log_error("Invalid adjusted write at %llu len %llu adjusted %llu limit %llu extra %llu sector_size %llu",
-+					  (unsigned long long)offset,
-+					  (unsigned long long)orig_nbytes,
-+					  (unsigned long long)nbytes,
-+					  (unsigned long long)limit_nbytes,
-+					  (unsigned long long)extra_nbytes,
-+					  (unsigned long long)_last_byte_sector_size);
-+				return false;
-+			}
- 		}
- 
- 		where = offset;
-diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
-index 3fe2647..5fa0b7a 100644
---- a/lib/device/dev-io.c
-+++ b/lib/device/dev-io.c
-@@ -250,6 +250,58 @@ static int _dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64
- 	return 1;
- }
- 
-+int dev_get_direct_block_sizes(struct device *dev, unsigned int *physical_block_size,
-+				unsigned int *logical_block_size)
-+{
-+	int fd = dev->bcache_fd;
-+	int do_close = 0;
-+	unsigned int pbs = 0;
-+	unsigned int lbs = 0;
-+
-+	if (dev->physical_block_size || dev->logical_block_size) {
-+		*physical_block_size = dev->physical_block_size;
-+		*logical_block_size = dev->logical_block_size;
-+		return 1;
-+	}
-+
-+	if (fd <= 0) {
-+		if (!dev_open_readonly(dev))
-+			return 0;
-+		fd = dev_fd(dev);
-+		do_close = 1;
-+	}
-+
-+	/*
-+	 * BLKPBSZGET from kernel comment for blk_queue_physical_block_size:
-+	 * "the lowest possible sector size that the hardware can operate on
-+	 * without reverting to read-modify-write operations"
-+	 */
-+	if (ioctl(fd, BLKPBSZGET, &pbs)) {
-+		stack;
-+		pbs = 0;
-+	}
-+
-+	/*
-+	 * BLKSSZGET from kernel comment for blk_queue_logical_block_size:
-+	 * "the lowest possible block size that the storage device can address."
-+	 */
-+	if (ioctl(fd, BLKSSZGET, &lbs)) {
-+		stack;
-+		lbs = 0;
-+	}
-+
-+	dev->physical_block_size = pbs;
-+	dev->logical_block_size = lbs;
-+
-+	*physical_block_size = pbs;
-+	*logical_block_size = lbs;
-+
-+	if (do_close && !dev_close_immediate(dev))
-+		stack;
-+
-+	return 1;
-+}
-+
- /*-----------------------------------------------------------------
-  * Public functions
-  *---------------------------------------------------------------*/
-diff --git a/lib/device/device.h b/lib/device/device.h
-index 30e1e79..bb65f84 100644
---- a/lib/device/device.h
-+++ b/lib/device/device.h
-@@ -67,8 +67,10 @@ struct device {
- 	/* private */
- 	int fd;
- 	int open_count;
--	int phys_block_size;
--	int block_size;
-+	int phys_block_size;     /* From either BLKPBSZGET or BLKSSZGET, don't use */
-+	int block_size;	         /* From BLKBSZGET, returns bdev->bd_block_size, likely set by fs, probably don't use */
-+	int physical_block_size; /* From BLKPBSZGET: lowest possible sector size that the hardware can operate on without reverting to read-modify-write operations */
-+	int logical_block_size;  /* From BLKSSZGET: lowest possible block size that the storage device can address */
- 	int read_ahead;
- 	int bcache_fd;
- 	uint32_t flags;
-@@ -132,6 +134,8 @@ void dev_size_seqno_inc(void);
-  * All io should use these routines.
-  */
- int dev_get_block_size(struct device *dev, unsigned int *phys_block_size, unsigned int *block_size);
-+int dev_get_direct_block_sizes(struct device *dev, unsigned int *physical_block_size,
-+                               unsigned int *logical_block_size);
- int dev_get_size(struct device *dev, uint64_t *size);
- int dev_get_read_ahead(struct device *dev, uint32_t *read_ahead);
- int dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_bytes);
-diff --git a/lib/label/label.c b/lib/label/label.c
-index 4c21d97..72be5ec 100644
---- a/lib/label/label.c
-+++ b/lib/label/label.c
-@@ -1472,16 +1472,34 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
- 
- void dev_set_last_byte(struct device *dev, uint64_t offset)
- {
--	unsigned int phys_block_size = 0;
--	unsigned int block_size = 0;
-+	unsigned int physical_block_size = 0;
-+	unsigned int logical_block_size = 0;
-+	unsigned int bs;
- 
--	if (!dev_get_block_size(dev, &phys_block_size, &block_size)) {
-+	if (!dev_get_direct_block_sizes(dev, &physical_block_size, &logical_block_size)) {
- 		stack;
--		/* FIXME  ASSERT or regular error testing is missing */
--		return;
-+		return; /* FIXME: error path ? */
-+	}
-+
-+	if ((physical_block_size == 512) && (logical_block_size == 512))
-+		bs = 512;
-+	else if ((physical_block_size == 4096) && (logical_block_size == 4096))
-+		bs = 4096;
-+	else if ((physical_block_size == 512) || (logical_block_size == 512)) {
-+		log_debug("Set last byte mixed block sizes physical %u logical %u using 512",
-+			  physical_block_size, logical_block_size);
-+		bs = 512;
-+	} else if ((physical_block_size == 4096) || (logical_block_size == 4096)) {
-+		log_debug("Set last byte mixed block sizes physical %u logical %u using 4096",
-+			  physical_block_size, logical_block_size);
-+		bs = 4096;
-+	} else {
-+		log_debug("Set last byte mixed block sizes physical %u logical %u using 512",
-+			  physical_block_size, logical_block_size);
-+		bs = 512;
- 	}
- 
--	bcache_set_last_byte(scan_bcache, dev->bcache_fd, offset, phys_block_size);
-+	bcache_set_last_byte(scan_bcache, dev->bcache_fd, offset, bs);
- }
- 
- void dev_unset_last_byte(struct device *dev)
diff --git a/SOURCES/lvm2-2_03_06-Revert-lvmlockd-use-commonly-used-define-NOTIFYDBUS_.patch b/SOURCES/lvm2-2_03_06-Revert-lvmlockd-use-commonly-used-define-NOTIFYDBUS_.patch
deleted file mode 100644
index b04e096..0000000
--- a/SOURCES/lvm2-2_03_06-Revert-lvmlockd-use-commonly-used-define-NOTIFYDBUS_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
- daemons/lvmlockd/Makefile.in     | 21 ++++++++++++++-------
- daemons/lvmlockd/lvmlockd-core.c |  2 +-
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in
-index dca05b8..9c03401 100644
---- a/daemons/lvmlockd/Makefile.in
-+++ b/daemons/lvmlockd/Makefile.in
-@@ -38,18 +38,25 @@ TARGETS = lvmlockd lvmlockctl
- 
- include $(top_builddir)/make.tmpl
- 
--CFLAGS += $(EXTRA_EXEC_CFLAGS) $(SYSTEMD_CFLAGS)
-+CFLAGS += $(EXTRA_EXEC_CFLAGS)
- INCLUDES += -I$(top_srcdir)/libdaemon/server
--LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
--LIBS += $(PTHREAD_LIBS) $(SYSTEMD_LIBS)
-+LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
-+LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS)
- 
--lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
-+
-+ifeq ($(USE_SD_NOTIFY),yes)
-+	CFLAGS += $(shell pkg-config --cflags libsystemd) -DUSE_SD_NOTIFY
-+	LIBS += $(shell pkg-config --libs libsystemd)
-+endif
-+
-+lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
-+		    $(top_builddir)/libdaemon/server/libdaemonserver.a
- 	@echo "    [CC] $@"
--	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LOCK_LIBS) $(LIBS)
-+	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS)
- 
--lvmlockctl: lvmlockctl.o $(INTERNAL_LIBS)
-+lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a
- 	@echo "    [CC] $@"
--	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
-+	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS)
- 
- install_lvmlockd: lvmlockd
- 	@echo "    [INSTALL] $<"
-diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
-index 5609ccc..39275fb 100644
---- a/daemons/lvmlockd/lvmlockd-core.c
-+++ b/daemons/lvmlockd/lvmlockd-core.c
-@@ -31,7 +31,7 @@
- #include <sys/utsname.h>
- #include <sys/un.h>
- 
--#ifdef NOTIFYDBUS_SUPPORT
-+#ifdef USE_SD_NOTIFY
- #include <systemd/sd-daemon.h>
- #endif
- 
diff --git a/SOURCES/lvm2-2_03_06-WHATS_NEW-fix-large-physical-block-size.patch b/SOURCES/lvm2-2_03_06-WHATS_NEW-fix-large-physical-block-size.patch
deleted file mode 100644
index 72b8c0b..0000000
--- a/SOURCES/lvm2-2_03_06-WHATS_NEW-fix-large-physical-block-size.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- WHATS_NEW | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/WHATS_NEW b/WHATS_NEW
-index 3a58de5..cb693de 100644
---- a/WHATS_NEW
-+++ b/WHATS_NEW
-@@ -1,3 +1,7 @@
-+Version 2.03.06 - 
-+================================
-+  Fix metadata writes from corrupting with large physical block size.
-+
- Version 2.03.05 - 15th June 2019
- ================================
-   Fix command definition for pvchange -a.
diff --git a/SOURCES/lvm2-2_03_06-WHATS_NEW-vgcreate-vgextend-logical-block-size.patch b/SOURCES/lvm2-2_03_06-WHATS_NEW-vgcreate-vgextend-logical-block-size.patch
deleted file mode 100644
index 06cf00a..0000000
--- a/SOURCES/lvm2-2_03_06-WHATS_NEW-vgcreate-vgextend-logical-block-size.patch
+++ /dev/null
@@ -1,14 +0,0 @@
- WHATS_NEW | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/WHATS_NEW b/WHATS_NEW
-index cb693de..a7ccd39 100644
---- a/WHATS_NEW
-+++ b/WHATS_NEW
-@@ -1,5 +1,6 @@
- Version 2.03.06 - 
- ================================
-+  Prevent creating VGs with PVs with different logical block sizes.
-   Fix metadata writes from corrupting with large physical block size.
- 
- Version 2.03.05 - 15th June 2019
diff --git a/SOURCES/lvm2-2_03_06-build-make-generate.patch b/SOURCES/lvm2-2_03_06-build-make-generate.patch
deleted file mode 100644
index eb6c4ac..0000000
--- a/SOURCES/lvm2-2_03_06-build-make-generate.patch
+++ /dev/null
@@ -1,135 +0,0 @@
- conf/example.conf.in   |  9 +++----
- man/lvconvert.8_pregen | 70 +++++++++++++++++++++++++++-----------------------
- 2 files changed, 42 insertions(+), 37 deletions(-)
-
-diff --git a/conf/example.conf.in b/conf/example.conf.in
-index b9cdf0c..ed6a3b6 100644
---- a/conf/example.conf.in
-+++ b/conf/example.conf.in
-@@ -143,7 +143,7 @@ devices {
- 	# 
- 	# Example
- 	# Accept every block device:
--	# filter = [ "a|.*/|" ]
-+	# filter = [ "a|.*|" ]
- 	# Reject the cdrom drive:
- 	# filter = [ "r|/dev/cdrom|" ]
- 	# Work with just loopback devices, e.g. for testing:
-@@ -151,10 +151,10 @@ devices {
- 	# Accept all loop devices and ide drives except hdc:
- 	# filter = [ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ]
- 	# Use anchors to be very specific:
--	# filter = [ "a|^/dev/hda8$|", "r|.*/|" ]
-+	# filter = [ "a|^/dev/hda8$|", "r|.*|" ]
- 	# 
- 	# This configuration option has an automatic default value.
--	# filter = [ "a|.*/|" ]
-+	# filter = [ "a|.*|" ]
- 
- 	# Configuration option devices/global_filter.
- 	# Limit the block devices that are used by LVM system components.
-@@ -164,7 +164,7 @@ devices {
- 	# The syntax is the same as devices/filter. Devices rejected by
- 	# global_filter are not opened by LVM.
- 	# This configuration option has an automatic default value.
--	# global_filter = [ "a|.*/|" ]
-+	# global_filter = [ "a|.*|" ]
- 
- 	# Configuration option devices/types.
- 	# List of additional acceptable block device types.
-@@ -1752,7 +1752,6 @@ activation {
- 	# additional space for VG metadata. The --metadatasize option overrides
- 	# this setting.
- 	# This configuration option does not have a default value defined.
--	# This configuration option has an automatic default value.
- 
- 	# Configuration option metadata/pvmetadataignore.
- 	# Ignore metadata areas on a new PV.
-diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
-index 7252f6f..846ea2d 100644
---- a/man/lvconvert.8_pregen
-+++ b/man/lvconvert.8_pregen
-@@ -378,6 +378,44 @@ Convert LV to striped.
- .RE
- -
- 
-+Convert LV to type mirror (also see type raid1),
-+.br
-+.P
-+\fBlvconvert\fP \fB--type\fP \fBmirror\fP \fILV\fP
-+.br
-+.RS 4
-+.ad l
-+[ \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP ]
-+.ad b
-+.br
-+.ad l
-+[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-+.ad b
-+.br
-+.ad l
-+[ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
-+.ad b
-+.br
-+.ad l
-+[ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-+.ad b
-+.br
-+.ad l
-+[    \fB--stripes\fP \fINumber\fP ]
-+.ad b
-+.br
-+.ad l
-+[    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
-+.ad b
-+.br
-+[ COMMON_OPTIONS ]
-+.RE
-+.br
-+.RS 4
-+[ \fIPV\fP ... ]
-+.RE
-+-
-+
- Convert LV to raid or change raid layout 
- .br
- (a specific raid level must be used, e.g. raid1).
-@@ -1636,38 +1674,6 @@ For example, LVM_VG_NAME can generally be substituted for a required VG paramete
- .SH ADVANCED USAGE
- Alternate command forms, advanced command usage, and listing of all valid syntax for completeness.
- .P
--Convert LV to type mirror (also see type raid1), 
--.br
--(also see lvconvert --mirrors).
--.br
--.P
--\fBlvconvert\fP \fB--type\fP \fBmirror\fP \fILV\fP
--.br
--.RS 4
--.ad l
--[ \fB-m\fP|\fB--mirrors\fP [\fB+\fP|\fB-\fP]\fINumber\fP ]
--.ad b
--.br
--.ad l
--[ \fB-R\fP|\fB--regionsize\fP \fISize\fP[m|UNIT] ]
--.ad b
--.br
--.ad l
--[ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
--.ad b
--.br
--.ad l
--[    \fB--mirrorlog\fP \fBcore\fP|\fBdisk\fP ]
--.ad b
--.br
--[ COMMON_OPTIONS ]
--.RE
--.br
--.RS 4
--[ \fIPV\fP ... ]
--.RE
---
--
- Change the region size of an LV.
- .br
- .P
diff --git a/SOURCES/lvm2-2_03_06-cache-warn-and-prompt-for-writeback-with-cachevol.patch b/SOURCES/lvm2-2_03_06-cache-warn-and-prompt-for-writeback-with-cachevol.patch
deleted file mode 100644
index a101fd6..0000000
--- a/SOURCES/lvm2-2_03_06-cache-warn-and-prompt-for-writeback-with-cachevol.patch
+++ /dev/null
@@ -1,56 +0,0 @@
- test/shell/cache-single-options.sh | 2 +-
- tools/lvchange.c                   | 8 ++++++++
- tools/lvconvert.c                  | 8 ++++++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
-index da9cbba..6b71b2f 100644
---- a/test/shell/cache-single-options.sh
-+++ b/test/shell/cache-single-options.sh
-@@ -228,7 +228,7 @@ lvconvert -y --type cache --cachevol $lv2 $vg/$lv1
- 
- lvchange -ay $vg/$lv1
- 
--lvchange --cachemode writeback $vg/$lv1
-+lvchange -y --cachemode writeback $vg/$lv1
- 
- check lv_field $vg/$lv1 cachemode "writeback"
- 
-diff --git a/tools/lvchange.c b/tools/lvchange.c
-index 7bdf997..92c6524 100644
---- a/tools/lvchange.c
-+++ b/tools/lvchange.c
-@@ -635,6 +635,14 @@ static int _lvchange_cache(struct cmd_context *cmd,
- 	if (!get_cache_params(cmd, &chunk_size, &format, &mode, &name, &settings))
- 		goto_out;
- 
-+	if (seg_is_cache(seg) && lv_is_cache_vol(seg->pool_lv) && (mode == CACHE_MODE_WRITEBACK)) {
-+		log_warn("WARNING: repairing a damaged cachevol is not yet possible.");
-+		log_warn("WARNING: cache mode writethrough is suggested for safe operation.");
-+		if (!arg_count(cmd, yes_ARG) &&
-+			yes_no_prompt("Continue using writeback without repair?") == 'n')
-+			goto_out;
-+	}
-+
- 	if ((mode != CACHE_MODE_UNSELECTED) &&
- 	    (mode != setting_seg->cache_mode) &&
- 	    lv_is_cache(lv)) {
-diff --git a/tools/lvconvert.c b/tools/lvconvert.c
-index 24db8d2..ebc2243 100644
---- a/tools/lvconvert.c
-+++ b/tools/lvconvert.c
-@@ -3401,6 +3401,14 @@ static int _cache_vol_attach(struct cmd_context *cmd,
- 	if (!cache_vol_set_params(cmd, cache_lv, lv_fast, poolmetadatasize, chunk_size, cache_metadata_format, cache_mode, policy_name, policy_settings))
- 		goto_out;
- 
-+	if (cache_mode == CACHE_MODE_WRITEBACK) {
-+		log_warn("WARNING: repairing a damaged cachevol is not yet possible.");
-+		log_warn("WARNING: cache mode writethrough is suggested for safe operation.");
-+		if (!arg_count(cmd, yes_ARG) &&
-+		    yes_no_prompt("Continue using writeback without repair?") == 'n')
-+			goto_out;
-+	}
-+
- 	/*
- 	 * lv/cache_lv keeps the same lockd lock it had before, the lock for
- 	 * lv_fast is freed, and lv_corig has no lock.
diff --git a/SOURCES/lvm2-2_03_06-config-Fix-default-option-which-makes-no-sense.patch b/SOURCES/lvm2-2_03_06-config-Fix-default-option-which-makes-no-sense.patch
deleted file mode 100644
index 0872a06..0000000
--- a/SOURCES/lvm2-2_03_06-config-Fix-default-option-which-makes-no-sense.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- lib/config/config_settings.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index 70fb36d..f14f0b8 100644
---- a/lib/config/config_settings.h
-+++ b/lib/config/config_settings.h
-@@ -1694,7 +1694,7 @@ cfg(metadata_vgmetadatacopies_CFG, "vgmetadatacopies", metadata_CFG_SECTION, CFG
- 	"and allows you to control which metadata areas are used at the\n"
- 	"individual PV level using pvchange --metadataignore y|n.\n")
- 
--cfg_runtime(metadata_pvmetadatasize_CFG, "pvmetadatasize", metadata_CFG_SECTION, CFG_DEFAULT_COMMENTED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(1, 0, 0), 0, NULL,
-+cfg_runtime(metadata_pvmetadatasize_CFG, "pvmetadatasize", metadata_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(1, 0, 0), 0, NULL,
- 	"The default size of the metadata area in units of 512 byte sectors.\n"
- 	"The metadata area begins at an offset of the page size from the start\n"
- 	"of the device. The first PE is by default at 1 MiB from the start of\n"
diff --git a/SOURCES/lvm2-2_03_06-config-remove-filter-typo.patch b/SOURCES/lvm2-2_03_06-config-remove-filter-typo.patch
deleted file mode 100644
index 11698e0..0000000
--- a/SOURCES/lvm2-2_03_06-config-remove-filter-typo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- lib/config/config_settings.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index 3113fe1..70fb36d 100644
---- a/lib/config/config_settings.h
-+++ b/lib/config/config_settings.h
-@@ -288,7 +288,7 @@ cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, C
- 	"preferred_names = [ \"^/dev/mpath/\", \"^/dev/mapper/mpath\", \"^/dev/[hs]d\" ]\n"
- 	"#\n")
- 
--cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*/|", vsn(1, 0, 0), NULL, 0, NULL,
-+cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*|", vsn(1, 0, 0), NULL, 0, NULL,
- 	"Limit the block devices that are used by LVM commands.\n"
- 	"This is a list of regular expressions used to accept or reject block\n"
- 	"device path names. Each regex is delimited by a vertical bar '|'\n"
-@@ -306,7 +306,7 @@ cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENT
- 	"#\n"
- 	"Example\n"
- 	"Accept every block device:\n"
--	"filter = [ \"a|.*/|\" ]\n"
-+	"filter = [ \"a|.*|\" ]\n"
- 	"Reject the cdrom drive:\n"
- 	"filter = [ \"r|/dev/cdrom|\" ]\n"
- 	"Work with just loopback devices, e.g. for testing:\n"
-@@ -314,10 +314,10 @@ cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENT
- 	"Accept all loop devices and ide drives except hdc:\n"
- 	"filter = [ \"a|loop|\", \"r|/dev/hdc|\", \"a|/dev/ide|\", \"r|.*|\" ]\n"
- 	"Use anchors to be very specific:\n"
--	"filter = [ \"a|^/dev/hda8$|\", \"r|.*/|\" ]\n"
-+	"filter = [ \"a|^/dev/hda8$|\", \"r|.*|\" ]\n"
- 	"#\n")
- 
--cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*/|", vsn(2, 2, 98), NULL, 0, NULL,
-+cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*|", vsn(2, 2, 98), NULL, 0, NULL,
- 	"Limit the block devices that are used by LVM system components.\n"
- 	"Because devices/filter may be overridden from the command line, it is\n"
- 	"not suitable for system-wide device filtering, e.g. udev.\n"
diff --git a/SOURCES/lvm2-2_03_06-configure-Fix-setting-of-CLDFLAGS-default.patch b/SOURCES/lvm2-2_03_06-configure-Fix-setting-of-CLDFLAGS-default.patch
deleted file mode 100644
index c1521e1..0000000
--- a/SOURCES/lvm2-2_03_06-configure-Fix-setting-of-CLDFLAGS-default.patch
+++ /dev/null
@@ -1,66 +0,0 @@
- configure    | 6 +++---
- configure.ac | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure b/configure
-index ff3a59b..4c84765 100755
---- a/configure
-+++ b/configure
-@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then :
- fi
- case "$host_os" in
- 	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
- 		# equivalent to -rdynamic
- 		ELDFLAGS="-Wl,--export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3098,7 +3098,7 @@ case "$host_os" in
- 		;;
- 	darwin*)
- 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		ELDFLAGS=
- 		CLDWHOLEARCHIVE="-all_load"
- 		CLDNOWHOLEARCHIVE=
-@@ -3111,7 +3111,7 @@ case "$host_os" in
- 		BLKDEACTIVATE=no
- 		;;
- 	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		;;
- esac
- 
-diff --git a/configure.ac b/configure.ac
-index 1e45c0e..9c82773 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([])
- AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
- case "$host_os" in
- 	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
- 		# equivalent to -rdynamic
- 		ELDFLAGS="-Wl,--export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -51,7 +51,7 @@ case "$host_os" in
- 		;;
- 	darwin*)
- 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		ELDFLAGS=
- 		CLDWHOLEARCHIVE="-all_load"
- 		CLDNOWHOLEARCHIVE=
-@@ -64,7 +64,7 @@ case "$host_os" in
- 		BLKDEACTIVATE=no
- 		;;
- 	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
-+		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- 		;;
- esac
- 
diff --git a/SOURCES/lvm2-2_03_06-cov-check-for-socket_path-being-set.patch b/SOURCES/lvm2-2_03_06-cov-check-for-socket_path-being-set.patch
deleted file mode 100644
index 4633f41..0000000
--- a/SOURCES/lvm2-2_03_06-cov-check-for-socket_path-being-set.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libdaemon/server/daemon-server.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
-index 9dd0017..2df4e89 100644
---- a/libdaemon/server/daemon-server.c
-+++ b/libdaemon/server/daemon-server.c
-@@ -690,7 +690,7 @@ void daemon_start(daemon_state s)
- out:
- 	/* If activated by systemd, do not unlink the socket - systemd takes care of that! */
- 	if (!_systemd_activation && s.socket_fd >= 0)
--		if (unlink(s.socket_path))
-+		if (s.socket_path && unlink(s.socket_path))
- 			perror("unlink error");
- 
- 	if (s.socket_fd >= 0)
diff --git a/SOURCES/lvm2-2_03_06-cov-ensure-cname-exists-before-derefering-it.patch b/SOURCES/lvm2-2_03_06-cov-ensure-cname-exists-before-derefering-it.patch
deleted file mode 100644
index a790836..0000000
--- a/SOURCES/lvm2-2_03_06-cov-ensure-cname-exists-before-derefering-it.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- tools/command.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/command.c b/tools/command.c
-index 724040e..2e69eff 100644
---- a/tools/command.c
-+++ b/tools/command.c
-@@ -1935,7 +1935,7 @@ void print_usage(struct command *cmd, int longhelp, int desc_first)
- 			 * see print_common_options_cmd()
- 			 */
- 
--			if ((cname->variants > 1) && cname->common_options[opt_enum])
-+			if (cname && (cname->variants > 1) && cname->common_options[opt_enum])
- 				continue;
- 
- 			printf("\n\t[");
-@@ -1975,7 +1975,7 @@ void print_usage(struct command *cmd, int longhelp, int desc_first)
- 			 * see print_common_options_cmd()
- 			 */
- 
--			if ((cname->variants > 1) && cname->common_options[opt_enum])
-+			if (cname && (cname->variants > 1) && cname->common_options[opt_enum])
- 				continue;
- 
- 			printf("\n\t[");
-@@ -3438,7 +3438,7 @@ static int _print_man(char *name, char *des_file, int secondary)
- 
- 		if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
- 			printf(".SH NAME\n");
--			if (cname->desc)
-+			if (cname && cname->desc)
- 				printf("%s - %s\n", lvmname, cname->desc);
- 			else
- 				printf("%s\n", lvmname);
diff --git a/SOURCES/lvm2-2_03_06-dmeventd-avoid-bail-out-preventing-repair-in-raid-pl.patch b/SOURCES/lvm2-2_03_06-dmeventd-avoid-bail-out-preventing-repair-in-raid-pl.patch
deleted file mode 100644
index 001d2e0..0000000
--- a/SOURCES/lvm2-2_03_06-dmeventd-avoid-bail-out-preventing-repair-in-raid-pl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- daemons/dmeventd/plugins/raid/dmeventd_raid.c | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
-index aa2b578..3431f1e 100644
---- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c
-+++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
-@@ -76,16 +76,12 @@ static int _process_raid_event(struct dso_state *state, char *params, const char
- 	}
- 
- 	if (dead) {
--		if (status->insync_regions < status->total_regions) {
--			if (!state->warned) {
--				state->warned = 1;
--				log_warn("WARNING: waiting for resynchronization to finish "
--					 "before initiating repair on RAID device %s.", device);
--			}
--
--			goto out; /* Not yet done syncing with accessible devices */
--		}
--
-+		/*
-+		 * Use the first event to run a repair ignoring any additonal ones.
-+		 *
-+		 * We presume lvconvert to do pre-repair
-+		 * checks to avoid bloat in this plugin.
-+		 */
- 		if (state->failed)
- 			goto out; /* already reported */
- 
diff --git a/SOURCES/lvm2-2_03_06-enable-full-md-component-detection-at-the-right-time.patch b/SOURCES/lvm2-2_03_06-enable-full-md-component-detection-at-the-right-time.patch
deleted file mode 100644
index c27d18d..0000000
--- a/SOURCES/lvm2-2_03_06-enable-full-md-component-detection-at-the-right-time.patch
+++ /dev/null
@@ -1,151 +0,0 @@
- lib/device/dev-cache.c | 19 +++++++++++++++++++
- lib/device/dev-cache.h |  3 +++
- lib/device/dev-md.c    |  6 +++---
- lib/label/label.c      | 27 ++++++++++++++-------------
- tools/pvscan.c         |  7 +++++++
- 5 files changed, 46 insertions(+), 16 deletions(-)
-
-diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
-index 1492181..980dd3c 100644
---- a/lib/device/dev-cache.c
-+++ b/lib/device/dev-cache.c
-@@ -15,6 +15,7 @@
- 
- #include "base/memory/zalloc.h"
- #include "lib/misc/lib.h"
-+#include "lib/device/dev-type.h"
- #include "lib/datastruct/btree.h"
- #include "lib/config/config.h"
- #include "lib/commands/toolcontext.h"
-@@ -1634,3 +1635,21 @@ const char *dev_name(const struct device *dev)
- 	return (dev && dev->aliases.n) ? dm_list_item(dev->aliases.n, struct dm_str_list)->str :
- 	    unknown_device_name();
- }
-+
-+bool dev_cache_has_md_with_end_superblock(struct dev_types *dt)
-+{
-+	struct btree_iter *iter = btree_first(_cache.devices);
-+	struct device *dev;
-+
-+	while (iter) {
-+		dev = btree_get_data(iter);
-+
-+		if (dev_is_md_with_end_superblock(dt, dev))
-+			return true;
-+
-+		iter = btree_next(iter);
-+	}
-+
-+	return false;
-+}
-+
-diff --git a/lib/device/dev-cache.h b/lib/device/dev-cache.h
-index 8a1c277..46c86c2 100644
---- a/lib/device/dev-cache.h
-+++ b/lib/device/dev-cache.h
-@@ -17,6 +17,7 @@
- #define _LVM_DEV_CACHE_H
- 
- #include "lib/device/device.h"
-+#include "lib/device/dev-type.h"
- #include "lib/misc/lvm-wrappers.h"
- 
- struct cmd_context;
-@@ -71,4 +72,6 @@ void dev_reset_error_count(struct cmd_context *cmd);
- 
- void dev_cache_failed_path(struct device *dev, const char *path);
- 
-+bool dev_cache_has_md_with_end_superblock(struct dev_types *dt);
-+
- #endif
-diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c
-index 08143b7..9d0a363 100644
---- a/lib/device/dev-md.c
-+++ b/lib/device/dev-md.c
-@@ -302,12 +302,12 @@ static int _md_sysfs_attribute_scanf(struct dev_types *dt,
- 		return ret;
- 
- 	if (!(fp = fopen(path, "r"))) {
--		log_sys_error("fopen", path);
-+		log_debug("_md_sysfs_attribute_scanf fopen failed %s", path);
- 		return ret;
- 	}
- 
- 	if (!fgets(buffer, sizeof(buffer), fp)) {
--		log_sys_error("fgets", path);
-+		log_debug("_md_sysfs_attribute_scanf fgets failed %s", path);
- 		goto out;
- 	}
- 
-@@ -449,7 +449,7 @@ int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev)
- 
- 	if (_md_sysfs_attribute_scanf(dt, dev, attribute,
- 				      "%s", &version_string) != 1)
--		return -1;
-+		return 0;
- 
- 	log_very_verbose("Device %s %s is %s.",
- 			 dev_name(dev), attribute, version_string);
-diff --git a/lib/label/label.c b/lib/label/label.c
-index a8d87ec..4c21d97 100644
---- a/lib/label/label.c
-+++ b/lib/label/label.c
-@@ -901,6 +901,20 @@ int label_scan(struct cmd_context *cmd)
- 	dev_cache_scan();
- 
- 	/*
-+	 * If we know that there will be md components with an end
-+	 * superblock, then enable the full md filter before label
-+	 * scan begins.  FIXME: we could skip the full md check on
-+	 * devs that are not identified as PVs, but then we'd need
-+	 * to do something other than using the standard md filter.
-+	 */
-+	if (cmd->md_component_detection && !cmd->use_full_md_check &&
-+	    !strcmp(cmd->md_component_checks, "auto") &&
-+	    dev_cache_has_md_with_end_superblock(cmd->dev_types)) {
-+		log_debug("Enable full md component check.");
-+		cmd->use_full_md_check = 1;
-+	}
-+
-+	/*
- 	 * Set up the iterator that is needed to step through each device in
- 	 * dev cache.
- 	 */
-@@ -938,19 +952,6 @@ int label_scan(struct cmd_context *cmd)
- 			bcache_invalidate_fd(scan_bcache, dev->bcache_fd);
- 			_scan_dev_close(dev);
- 		}
--
--		/*
--		 * When md devices exist that use the old superblock at the
--		 * end of the device, then in order to detect and filter out
--		 * the component devices of those md devs, we enable the full
--		 * md filter which scans both the start and the end of every
--		 * device.  This doubles the amount of scanning i/o, which we
--		 * want to avoid.  FIXME: this forces start+end scanning of
--		 * every device, but it would be more efficient to limit the
--		 * end scan only to PVs.
--		 */
--		if (dev_is_md_with_end_superblock(cmd->dev_types, dev))
--			cmd->use_full_md_check = 1;
- 	};
- 	dev_iter_destroy(iter);
- 
-diff --git a/tools/pvscan.c b/tools/pvscan.c
-index db813ad..0a91add 100644
---- a/tools/pvscan.c
-+++ b/tools/pvscan.c
-@@ -938,6 +938,13 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)
- 	/* Creates a list of dev names from /dev, sysfs, etc; does not read any. */
- 	dev_cache_scan();
- 
-+	if (cmd->md_component_detection && !cmd->use_full_md_check &&
-+	    !strcmp(cmd->md_component_checks, "auto") &&
-+	    dev_cache_has_md_with_end_superblock(cmd->dev_types)) {
-+		log_debug("Enable full md component check.");
-+		cmd->use_full_md_check = 1;
-+	}
-+
- 	/*
- 	 * For each device command arg (from either position or --major/--minor),
- 	 * decide if that device is being added to the system (a dev node exists
diff --git a/SOURCES/lvm2-2_03_06-exported-vg-handling.patch b/SOURCES/lvm2-2_03_06-exported-vg-handling.patch
deleted file mode 100644
index d263822..0000000
--- a/SOURCES/lvm2-2_03_06-exported-vg-handling.patch
+++ /dev/null
@@ -1,629 +0,0 @@
- lib/commands/toolcontext.h       |  1 +
- lib/metadata/metadata-exported.h |  1 -
- lib/metadata/metadata.c          | 42 ++++++++++++++++++++++----------
- tools/command.c                  |  1 +
- tools/commands.h                 | 29 +++++++++++-----------
- tools/lvmcmdline.c               |  2 ++
- tools/pvchange.c                 |  7 +-----
- tools/pvresize.c                 |  7 +-----
- tools/toollib.c                  | 52 +++++++++++++++++++++++++++++++---------
- tools/tools.h                    |  2 ++
- tools/vgchange.c                 | 22 ++++-------------
- tools/vgck.c                     |  3 ---
- tools/vgimport.c                 |  6 ++---
- tools/vgimportclone.c            |  4 ++--
- tools/vgreduce.c                 |  5 ++--
- tools/vgremove.c                 |  3 ---
- tools/vgrename.c                 |  3 +--
- tools/vgsplit.c                  | 12 ++++++++--
- 18 files changed, 115 insertions(+), 87 deletions(-)
-
-diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
-index 6e4530c..488752c 100644
---- a/lib/commands/toolcontext.h
-+++ b/lib/commands/toolcontext.h
-@@ -148,6 +148,7 @@ struct cmd_context {
- 	unsigned unknown_system_id:1;
- 	unsigned include_historical_lvs:1;	/* also process/report/display historical LVs */
- 	unsigned record_historical_lvs:1;	/* record historical LVs */
-+	unsigned include_exported_vgs:1;
- 	unsigned include_foreign_vgs:1;		/* report/display cmds can reveal foreign VGs */
- 	unsigned include_shared_vgs:1;		/* report/display cmds can reveal lockd VGs */
- 	unsigned include_active_foreign_vgs:1;	/* cmd should process foreign VGs with active LVs */
-diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
-index 9029d3f..77b971b 100644
---- a/lib/metadata/metadata-exported.h
-+++ b/lib/metadata/metadata-exported.h
-@@ -181,7 +181,6 @@
- #define MIRROR_SKIP_INIT_SYNC	0x00000010U	/* skip initial sync */
- 
- /* vg_read and vg_read_for_update flags */
--#define READ_ALLOW_EXPORTED	0x00020000U
- #define READ_OK_NOTFOUND	0x00040000U
- #define READ_WARN_INCONSISTENT	0x00080000U
- #define READ_FOR_UPDATE		0x00100000U /* A meta-flag, useful with toollib for_each_* functions. */
-diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
-index 039a7d6..dc1b501 100644
---- a/lib/metadata/metadata.c
-+++ b/lib/metadata/metadata.c
-@@ -593,9 +593,6 @@ int vg_remove_check(struct volume_group *vg)
- 		return 0;
- 	}
- 
--	if (!vg_check_status(vg, EXPORTED_VG))
--		return 0;
--
- 	lv_count = vg_visible_lvs(vg);
- 
- 	if (lv_count) {
-@@ -3709,12 +3706,6 @@ uint32_t vg_bad_status_bits(const struct volume_group *vg, uint64_t status)
- 		/* Return because other flags are considered undefined. */
- 		return FAILED_CLUSTERED;
- 
--	if ((status & EXPORTED_VG) &&
--	    vg_is_exported(vg)) {
--		log_error("Volume group %s is exported", vg->name);
--		failure |= FAILED_EXPORTED;
--	}
--
- 	if ((status & LVM_WRITE) &&
- 	    !(vg->status & LVM_WRITE)) {
- 		log_error("Volume group %s is read-only", vg->name);
-@@ -3733,7 +3724,7 @@ uint32_t vg_bad_status_bits(const struct volume_group *vg, uint64_t status)
- /**
-  * vg_check_status - check volume group status flags and log error
-  * @vg - volume group to check status flags
-- * @status - specific status flags to check (e.g. EXPORTED_VG)
-+ * @status - specific status flags to check
-  */
- int vg_check_status(const struct volume_group *vg, uint64_t status)
- {
-@@ -3914,6 +3905,28 @@ static int _access_vg_systemid(struct cmd_context *cmd, struct volume_group *vg)
- 	return 0;
- }
- 
-+static int _access_vg_exported(struct cmd_context *cmd, struct volume_group *vg)
-+{
-+	if (!vg_is_exported(vg))
-+		return 1;
-+
-+	if (cmd->include_exported_vgs)
-+		return 1;
-+
-+	/*
-+	 * Some commands want the error printed by vg_read, others by ignore_vg.
-+	 * Those using ignore_vg may choose to skip the error.
-+	 */
-+	if (cmd->vg_read_print_access_error) {
-+		log_error("Volume group %s is exported", vg->name);
-+		return 0;
-+	}
-+
-+	/* Silently ignore exported vgs. */
-+
-+	return 0;
-+}
-+
- /*
-  * Test the validity of a VG handle returned by vg_read() or vg_read_for_update().
-  */
-@@ -4883,8 +4896,7 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
- 		goto_bad;
- 	}
- 
--	if (writing && !(read_flags & READ_ALLOW_EXPORTED) && vg_is_exported(vg)) {
--		log_error("Volume group %s is exported", vg->name);
-+	if (!_access_vg_exported(cmd, vg)) {
- 		failure |= FAILED_EXPORTED;
- 		goto_bad;
- 	}
-@@ -4895,6 +4907,12 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
- 		goto_bad;
- 	}
- 
-+	if (writing && !(vg->status & LVM_WRITE)) {
-+		log_error("Volume group %s is read-only", vg->name);
-+		failure |= FAILED_READ_ONLY;
-+		goto_bad;
-+	}
-+
- 	if (!cmd->handles_missing_pvs && (missing_pv_dev || missing_pv_flag) && writing) {
- 		log_error("Cannot change VG %s while PVs are missing.", vg->name);
- 		log_error("See vgreduce --removemissing and vgextend --restoremissing.");
-diff --git a/tools/command.c b/tools/command.c
-index bdd18d6..724040e 100644
---- a/tools/command.c
-+++ b/tools/command.c
-@@ -137,6 +137,7 @@ static inline int configtype_arg(struct cmd_context *cmd __attribute__((unused))
- #define GET_VGNAME_FROM_OPTIONS  0x00001000
- #define CAN_USE_ONE_SCAN	 0x00002000
- #define ALLOW_HINTS              0x00004000
-+#define ALLOW_EXPORTED           0x00008000
- 
- 
- /* create foo_CMD enums for command def ID's in command-lines.in */
-diff --git a/tools/commands.h b/tools/commands.h
-index 4006fab..c1670ae 100644
---- a/tools/commands.h
-+++ b/tools/commands.h
-@@ -35,7 +35,7 @@ xx(help,
- 
- xx(fullreport,
-    "Display full report",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_HINTS)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_HINTS | ALLOW_EXPORTED)
- 
- xx(lastlog,
-    "Display last command's log report",
-@@ -71,7 +71,7 @@ xx(lvmconfig,
- 
- xx(lvmdiskscan,
-    "List devices that may be used as physical volumes",
--   PERMITTED_READ_ONLY | ENABLE_ALL_DEVS)
-+   PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ALLOW_EXPORTED)
- 
- xx(lvmsadc,
-    "Collect activity data",
-@@ -115,7 +115,7 @@ xx(pvresize,
- 
- xx(pvck,
-    "Check metadata on physical volumes",
--   LOCKD_VG_SH)
-+   LOCKD_VG_SH | ALLOW_EXPORTED)
- 
- xx(pvcreate,
-    "Initialize physical volume(s) for use by LVM",
-@@ -127,7 +127,7 @@ xx(pvdata,
- 
- xx(pvdisplay,
-    "Display various attributes of physical volume(s)",
--   PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS)
-+   PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED)
- 
- /* ALL_VGS_IS_DEFAULT is for polldaemon to find pvmoves in-progress using process_each_vg. */
- 
-@@ -145,11 +145,11 @@ xx(pvremove,
- 
- xx(pvs,
-    "Display information about physical volumes",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED)
- 
- xx(pvscan,
-    "List all physical volumes",
--   PERMITTED_READ_ONLY | LOCKD_VG_SH)
-+   PERMITTED_READ_ONLY | LOCKD_VG_SH | ALLOW_EXPORTED)
- 
- xx(segtypes,
-    "List available segment types",
-@@ -165,11 +165,11 @@ xx(tags,
- 
- xx(vgcfgbackup,
-    "Backup volume group configuration(s)",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_EXPORTED)
- 
- xx(vgcfgrestore,
-    "Restore volume group configuration",
--   0)
-+   ALLOW_EXPORTED)
- 
- xx(vgchange,
-    "Change volume group attributes",
-@@ -189,7 +189,7 @@ xx(vgcreate,
- 
- xx(vgdisplay,
-    "Display volume group information",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED)
- 
- xx(vgexport,
-    "Unregister volume group(s) from the system",
-@@ -201,10 +201,11 @@ xx(vgextend,
- 
- xx(vgimport,
-    "Register exported volume group with system",
--   ALL_VGS_IS_DEFAULT)
-+   ALL_VGS_IS_DEFAULT | ALLOW_EXPORTED)
- 
- xx(vgimportclone,
--   "Import a VG from cloned PVs", 0)
-+   "Import a VG from cloned PVs",
-+   ALLOW_EXPORTED)
- 
- xx(vgmerge,
-    "Merge volume groups",
-@@ -224,15 +225,15 @@ xx(vgremove,
- 
- xx(vgrename,
-    "Rename a volume group",
--   ALLOW_UUID_AS_NAME)
-+   ALLOW_UUID_AS_NAME | ALLOW_EXPORTED)
- 
- xx(vgs,
-    "Display information about volume groups",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED)
- 
- xx(vgscan,
-    "Search for all volume groups",
--   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
-+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_EXPORTED)
- 
- xx(vgsplit,
-    "Move physical volumes into a new or existing volume group",
-diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 3fec702..30f9d81 100644
---- a/tools/lvmcmdline.c
-+++ b/tools/lvmcmdline.c
-@@ -2315,6 +2315,8 @@ static int _get_current_settings(struct cmd_context *cmd)
- 	if (cmd->cname->flags & CAN_USE_ONE_SCAN)
- 		cmd->can_use_one_scan = 1;
- 
-+	cmd->include_exported_vgs = (cmd->cname->flags & ALLOW_EXPORTED) ? 1 : 0;
-+
- 	cmd->scan_lvs = find_config_tree_bool(cmd, devices_scan_lvs_CFG, NULL);
- 
- 	/*
-diff --git a/tools/pvchange.c b/tools/pvchange.c
-index f37fd91..1ece34a 100644
---- a/tools/pvchange.c
-+++ b/tools/pvchange.c
-@@ -35,11 +35,6 @@ static int _pvchange_single(struct cmd_context *cmd, struct volume_group *vg,
- 
- 	params->total++;
- 
--	if (vg && vg_is_exported(vg)) {
--		log_error("Volume group %s is exported", vg->name);
--		goto bad;
--	}
--
- 	/*
- 	 * The primary location of this check is in vg_write(), but it needs
- 	 * to be copied here to prevent the pv_write() which is called before
-@@ -239,7 +234,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv)
- 
- 	clear_hint_file(cmd);
- 
--	ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvchange_single);
-+	ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle, _pvchange_single);
- 
- 	log_print_unless_silent("%d physical volume%s changed / %d physical volume%s not changed",
- 				params.done, params.done == 1 ? "" : "s",
-diff --git a/tools/pvresize.c b/tools/pvresize.c
-index c7e750d..2c7f543 100644
---- a/tools/pvresize.c
-+++ b/tools/pvresize.c
-@@ -36,11 +36,6 @@ static int _pvresize_single(struct cmd_context *cmd,
- 	}
- 	params->total++;
- 
--	if (vg && vg_is_exported(vg)) {
--		log_error("Volume group %s is exported", vg->name);
--		return ECMD_FAILED;
--	}
--
- 	/*
- 	 * Needed to change a property on an orphan PV.
- 	 * i.e. the global lock is only needed for orphans.
-@@ -93,7 +88,7 @@ int pvresize(struct cmd_context *cmd, int argc, char **argv)
- 
- 	handle->custom_handle = &params;
- 
--	ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvresize_single);
-+	ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle, _pvresize_single);
- 
- 	log_print_unless_silent("%d physical volume(s) resized or updated / %d physical volume(s) "
- 				"not resized", params.done, params.total - params.done);
-diff --git a/tools/toollib.c b/tools/toollib.c
-index 506ad2d..b2313f8 100644
---- a/tools/toollib.c
-+++ b/tools/toollib.c
-@@ -223,6 +223,17 @@ static int _ignore_vg(struct cmd_context *cmd,
- 		}
- 	}
- 
-+	if (read_error & FAILED_EXPORTED) {
-+		if (arg_vgnames && str_list_match_item(arg_vgnames, vg_name)) {
-+			log_error("Volume group %s is exported", vg_name);
-+			return 1;
-+		} else {
-+			read_error &= ~FAILED_EXPORTED; /* Check for other errors */
-+			log_verbose("Skipping exported volume group %s", vg_name);
-+			*skip = 1;
-+		}
-+	}
-+
- 	/*
- 	 * Commands that operate on "all vgs" shouldn't be bothered by
- 	 * skipping a foreign VG, and the command shouldn't fail when
-@@ -3032,11 +3043,6 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
- 	dm_list_init(&final_lvs);
- 	dm_list_init(&found_arg_lvnames);
- 
--	if (!vg_check_status(vg, EXPORTED_VG)) {
--		ret_max = ECMD_FAILED;
--		goto_out;
--	}
--
- 	if (tags_in && !dm_list_empty(tags_in))
- 		tags_supplied = 1;
- 
-@@ -4161,6 +4167,7 @@ static int _process_pvs_in_vg(struct cmd_context *cmd,
- 			      int process_all_pvs,
- 			      int process_all_devices,
- 			      int skip,
-+			      uint32_t error_flags,
- 			      struct processing_handle *handle,
- 			      process_single_pv_fn_t process_single_pv)
- {
-@@ -4216,21 +4223,42 @@ static int _process_pvs_in_vg(struct cmd_context *cmd,
- 		}
- 
- 		process_pv = process_all_pvs;
-+		dil = NULL;
- 
- 		/* Remove each arg_devices entry as it is processed. */
- 
--		if (!process_pv && !dm_list_empty(arg_devices) &&
--		    (dil = _device_list_find_dev(arg_devices, pv->dev))) {
--			process_pv = 1;
--			_device_list_remove(arg_devices, dil->dev);
-+		if (arg_devices && !dm_list_empty(arg_devices)) {
-+			if ((dil = _device_list_find_dev(arg_devices, pv->dev)))
-+				_device_list_remove(arg_devices, dil->dev);
- 		}
- 
-+		if (!process_pv && dil)
-+			process_pv = 1;
-+
- 		if (!process_pv && !dm_list_empty(arg_tags) &&
- 		    str_list_match_list(arg_tags, &pv->tags, NULL))
- 			process_pv = 1;
- 
- 		process_pv = process_pv && select_match_pv(cmd, handle, vg, pv) && _select_matches(handle);
- 
-+		/*
-+		 * The command has asked to process a specific PV
-+		 * named on the command line, but the VG containing
-+		 * that PV cannot be accessed.  In this case report
-+		 * and return an error.  If the inaccessible PV is
-+		 * not explicitly named on the command line, it is
-+		 * silently skipped.
-+		 */
-+		if (process_pv && skip && dil && error_flags) {
-+			if (error_flags & FAILED_EXPORTED)
-+				log_error("Cannot use PV %s in exported VG %s.", pv_name, vg->name);
-+			if (error_flags & FAILED_SYSTEMID)
-+				log_error("Cannot use PV %s in foreign VG %s.", pv_name, vg->name);
-+			if (error_flags & (FAILED_LOCK_TYPE | FAILED_LOCK_MODE))
-+				log_error("Cannot use PV %s in shared VG %s.", pv_name, vg->name);
-+			ret_max = ECMD_FAILED;
-+		}
-+
- 		if (process_pv) {
- 			if (skip)
- 				log_verbose("Skipping PV %s in VG %s.", pv_name, vg->name);
-@@ -4352,6 +4380,8 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
- 
- 		log_debug("Processing PVs in VG %s", vg_name);
- 
-+		error_flags = 0;
-+
- 		vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state, &error_flags, &error_vg);
- 		if (_ignore_vg(cmd, error_flags, error_vg, vg_name, NULL, read_flags, &skip, &notfound)) {
- 			stack;
-@@ -4359,7 +4389,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
- 			report_log_ret_code(ret_max);
- 			if (!skip)
- 				goto endvg;
--			/* Drop through to eliminate a clustered VG's PVs from the devices list */
-+			/* Drop through to eliminate unmpermitted PVs from the devices list */
- 		}
- 		if (notfound)
- 			goto endvg;
-@@ -4370,7 +4400,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
- 		 */
- 		
- 		ret = _process_pvs_in_vg(cmd, vg ? vg : error_vg, all_devices, arg_devices, arg_tags,
--					 process_all_pvs, process_all_devices, skip,
-+					 process_all_pvs, process_all_devices, skip, error_flags,
- 					 handle, process_single_pv);
- 		if (ret != ECMD_PROCESSED)
- 			stack;
-diff --git a/tools/tools.h b/tools/tools.h
-index 69132a5..b78c471 100644
---- a/tools/tools.h
-+++ b/tools/tools.h
-@@ -136,6 +136,8 @@ struct arg_value_group_list {
- #define CAN_USE_ONE_SCAN	 0x00002000
- /* Command can use hints file */
- #define ALLOW_HINTS		 0x00004000
-+/* Command can access exported vg. */
-+#define ALLOW_EXPORTED           0x00008000
- 
- 
- void usage(const char *name);
-diff --git a/tools/vgchange.c b/tools/vgchange.c
-index a17f456..1ef94d6 100644
---- a/tools/vgchange.c
-+++ b/tools/vgchange.c
-@@ -630,13 +630,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
- 		{ detachprofile_ARG, &_vgchange_profile },
- 	};
- 
--	if (vg_is_exported(vg)) {
--		if (cmd->command->command_enum == vgchange_monitor_CMD)
--			return ECMD_PROCESSED;
--		log_error("Volume group \"%s\" is exported", vg_name);
--		return ECMD_FAILED;
--	}
--
- 	/*
- 	 * FIXME: DEFAULT_BACKGROUND_POLLING should be "unspecified".
- 	 * If --poll is explicitly provided use it; otherwise polling
-@@ -982,11 +975,6 @@ static int _vgchange_locktype_single(struct cmd_context *cmd, const char *vg_nam
- 			             struct volume_group *vg,
- 			             struct processing_handle *handle)
- {
--	if (vg_is_exported(vg)) {
--		log_error("Volume group \"%s\" is exported", vg_name);
--		return ECMD_FAILED;
--	}
--
- 	if (!archive(vg))
- 		return_ECMD_FAILED;
- 
-@@ -1145,11 +1133,14 @@ int vgchange_lock_start_stop_cmd(struct cmd_context *cmd, int argc, char **argv)
- 
- 		/* Disable the lockd_gl in process_each_vg. */
- 		cmd->lockd_gl_disable = 1;
-+	} else {
-+		/* If the VG was started when it was exported, allow it to be stopped. */
-+		cmd->include_exported_vgs = 1;
- 	}
- 
- 	handle->custom_handle = &vp;
- 
--	ret = process_each_vg(cmd, argc, argv, NULL, NULL, READ_ALLOW_EXPORTED, 0, handle, &_vgchange_lock_start_stop_single);
-+	ret = process_each_vg(cmd, argc, argv, NULL, NULL, 0, 0, handle, &_vgchange_lock_start_stop_single);
- 
- 	/* Wait for lock-start ops that were initiated in vgchange_lockstart. */
- 
-@@ -1178,11 +1169,6 @@ static int _vgchange_systemid_single(struct cmd_context *cmd, const char *vg_nam
- 			             struct volume_group *vg,
- 			             struct processing_handle *handle)
- {
--	if (vg_is_exported(vg)) {
--		log_error("Volume group \"%s\" is exported", vg_name);
--		return ECMD_FAILED;
--	}
--
- 	if (!archive(vg))
- 		return_ECMD_FAILED;
- 
-diff --git a/tools/vgck.c b/tools/vgck.c
-index 90fc5a3..46ad594 100644
---- a/tools/vgck.c
-+++ b/tools/vgck.c
-@@ -71,9 +71,6 @@ static int vgck_single(struct cmd_context *cmd __attribute__((unused)),
- 		       struct volume_group *vg,
- 		       struct processing_handle *handle __attribute__((unused)))
- {
--	if (!vg_check_status(vg, EXPORTED_VG))
--		return_ECMD_FAILED;
--
- 	if (!vg_validate(vg))
- 		return_ECMD_FAILED;
- 
-diff --git a/tools/vgimport.c b/tools/vgimport.c
-index 26c6363..0d8b0f2 100644
---- a/tools/vgimport.c
-+++ b/tools/vgimport.c
-@@ -87,8 +87,6 @@ int vgimport(struct cmd_context *cmd, int argc, char **argv)
- 		cmd->handles_missing_pvs = 1;
- 	}
- 
--	return process_each_vg(cmd, argc, argv, NULL, NULL,
--			       READ_FOR_UPDATE | READ_ALLOW_EXPORTED,
--			       0, NULL,
--			       &_vgimport_single);
-+	return process_each_vg(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
-+			       0, NULL, &_vgimport_single);
- }
-diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c
-index a3af841..be01861 100644
---- a/tools/vgimportclone.c
-+++ b/tools/vgimportclone.c
-@@ -235,7 +235,7 @@ int vgimportclone(struct cmd_context *cmd, int argc, char **argv)
- 
- 	log_debug("Finding devices to import.");
- 	cmd->cname->flags |= ENABLE_DUPLICATE_DEVS;
--	process_each_pv(cmd, argc, argv, NULL, 0, READ_ALLOW_EXPORTED, handle, _vgimportclone_pv_single);
-+	process_each_pv(cmd, argc, argv, NULL, 0, 0, handle, _vgimportclone_pv_single);
- 
- 	if (vp.found_args != argc) {
- 		log_error("Failed to find all devices.");
-@@ -342,7 +342,7 @@ retry_name:
- 
- 	clear_hint_file(cmd);
- 
--	ret = process_each_vg(cmd, 0, NULL, vp.old_vgname, NULL, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, 0, handle, _vgimportclone_vg_single);
-+	ret = process_each_vg(cmd, 0, NULL, vp.old_vgname, NULL, READ_FOR_UPDATE, 0, handle, _vgimportclone_vg_single);
- 
- 	unlock_vg(cmd, NULL, vp.new_vgname);
- out:
-diff --git a/tools/vgreduce.c b/tools/vgreduce.c
-index bc1f5b6..b001ccb 100644
---- a/tools/vgreduce.c
-+++ b/tools/vgreduce.c
-@@ -135,7 +135,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg,
- {
- 	int r;
- 
--	if (!vg_check_status(vg, EXPORTED_VG | LVM_WRITE | RESIZEABLE_VG))
-+	if (!vg_check_status(vg, LVM_WRITE | RESIZEABLE_VG))
- 		return ECMD_FAILED;
- 
- 	r = vgreduce_single(cmd, vg, pv, 1);
-@@ -250,8 +250,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv)
- 
- 	init_ignore_suspended_devices(1);
- 
--	process_each_vg(cmd, 0, NULL, vg_name, NULL,
--			READ_FOR_UPDATE | READ_ALLOW_EXPORTED,
-+	process_each_vg(cmd, 0, NULL, vg_name, NULL, READ_FOR_UPDATE,
- 			0, handle, &_vgreduce_repair_single);
- 
- 	if (vp.already_consistent) {
-diff --git a/tools/vgremove.c b/tools/vgremove.c
-index 23640f6..8f73297 100644
---- a/tools/vgremove.c
-+++ b/tools/vgremove.c
-@@ -42,9 +42,6 @@ static int _vgremove_single(struct cmd_context *cmd, const char *vg_name,
- 	unsigned lv_count, missing;
- 	int ret;
- 
--	if (!vg_check_status(vg, EXPORTED_VG))
--		return_ECMD_FAILED;
--
- 	lv_count = vg_visible_lvs(vg);
- 
- 	if (lv_count) {
-diff --git a/tools/vgrename.c b/tools/vgrename.c
-index 4735e8b..8b76d0b 100644
---- a/tools/vgrename.c
-+++ b/tools/vgrename.c
-@@ -233,8 +233,7 @@ int vgrename(struct cmd_context *cmd, int argc, char **argv)
- 
- 	handle->custom_handle = &vp;
- 
--	ret = process_each_vg(cmd, 0, NULL, vg_name_old, NULL,
--			      READ_FOR_UPDATE | READ_ALLOW_EXPORTED,
-+	ret = process_each_vg(cmd, 0, NULL, vg_name_old, NULL, READ_FOR_UPDATE,
- 			      0, handle, _vgrename_single);
- 
- 	/* Needed if process_each_vg returns error before calling _single. */
-diff --git a/tools/vgsplit.c b/tools/vgsplit.c
-index 61cb13b..1bcc308 100644
---- a/tools/vgsplit.c
-+++ b/tools/vgsplit.c
-@@ -665,8 +665,16 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)
- 	if (!test_mode()) {
- 		unlock_vg(cmd, NULL, vg_name_to);
- 		release_vg(vg_to);
--		vg_to = vg_read_for_update(cmd, vg_name_to, NULL,
--					   READ_ALLOW_EXPORTED, 0);
-+
-+		/*
-+		 * This command uses the exported vg flag internally, but
-+		 * exported VGs are not allowed to be split from the command
-+		 * level, so ALLOW_EXPORTED is not set in commands.h.
-+		 */
-+		cmd->include_exported_vgs = 1;
-+
-+		vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0, 0);
-+
- 		if (vg_read_error(vg_to)) {
- 			log_error("Volume group \"%s\" became inconsistent: "
- 				  "please fix manually", vg_name_to);
diff --git a/SOURCES/lvm2-2_03_06-increase-soft-open-file-limit.patch b/SOURCES/lvm2-2_03_06-increase-soft-open-file-limit.patch
deleted file mode 100644
index 8d762de..0000000
--- a/SOURCES/lvm2-2_03_06-increase-soft-open-file-limit.patch
+++ /dev/null
@@ -1,89 +0,0 @@
- lib/label/label.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/lib/label/label.c b/lib/label/label.c
-index 72be5ec..09bbb92 100644
---- a/lib/label/label.c
-+++ b/lib/label/label.c
-@@ -29,6 +29,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- 
- /* FIXME Allow for larger labels?  Restricted to single sector currently */
- 
-@@ -867,6 +868,57 @@ static void _free_hints(struct dm_list *hints)
- }
- 
- /*
-+ * We don't know how many of num_devs will be PVs that we need to
-+ * keep open, but if it's greater than the soft limit, then we'll
-+ * need the soft limit raised, so do that before starting.
-+ *
-+ * If opens approach the raised soft/hard limit while scanning, then
-+ * we could also attempt to raise the soft/hard limits during the scan.
-+ */
-+
-+#define BASE_FD_COUNT 32 /* Number of open files we want apart from devs */
-+
-+static void _prepare_open_file_limit(struct cmd_context *cmd, unsigned int num_devs)
-+{
-+	struct rlimit old, new;
-+	unsigned int want = num_devs + BASE_FD_COUNT;
-+	int rv;
-+
-+	rv = prlimit(0, RLIMIT_NOFILE, NULL, &old);
-+	if (rv < 0) {
-+		log_debug("Checking fd limit for num_devs %u failed %d", num_devs, errno);
-+		return;
-+	}
-+
-+	log_debug("Checking fd limit for num_devs %u want %u soft %lld hard %lld",
-+		  num_devs, want, (long long)old.rlim_cur, (long long)old.rlim_max);
-+
-+	/* Current soft limit is enough */
-+	if (old.rlim_cur > want)
-+		return;
-+
-+	/* Soft limit already raised to max */
-+	if (old.rlim_cur == old.rlim_max)
-+		return;
-+
-+	/* Raise soft limit up to hard/max limit */
-+	new.rlim_cur = old.rlim_max;
-+	new.rlim_max = old.rlim_max;
-+
-+	log_debug("Setting fd limit for num_devs %u soft %lld hard %lld",
-+		  num_devs, (long long)new.rlim_cur, (long long)new.rlim_max);
-+
-+	rv = prlimit(0, RLIMIT_NOFILE, &new, &old);
-+	if (rv < 0) {
-+		if (errno == EPERM)
-+			log_warn("WARNING: permission error setting open file limit for scanning %u devices.", num_devs);
-+		else
-+			log_warn("WARNING: cannot set open file limit for scanning %u devices.", num_devs);
-+		return;
-+	}
-+}
-+
-+/*
-  * Scan devices on the system to discover which are LVM devices.
-  * Info about the LVM devices (PVs) is saved in lvmcache in a
-  * basic/summary form (info/vginfo structs).  The vg_read phase
-@@ -984,6 +1036,15 @@ int label_scan(struct cmd_context *cmd)
- 	log_debug("Will scan %d devices skip %d", dm_list_size(&scan_devs), dm_list_size(&all_devs));
- 
- 	/*
-+	 * If the total number of devices exceeds the soft open file
-+	 * limit, then increase the soft limit to the hard/max limit
-+	 * in case the number of PVs in scan_devs (it's only the PVs
-+	 * which we want to keep open) is higher than the current
-+	 * soft limit.
-+	 */
-+	_prepare_open_file_limit(cmd, dm_list_size(&scan_devs));
-+
-+	/*
- 	 * Do the main scan.
- 	 */
- 	_scan_list(cmd, cmd->filter, &scan_devs, NULL);
diff --git a/SOURCES/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-convers.patch b/SOURCES/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-convers.patch
deleted file mode 100644
index c669bf2..0000000
--- a/SOURCES/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-convers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- tools/command-lines.in | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/tools/command-lines.in b/tools/command-lines.in
-index 73a1e64..f914650 100644
---- a/tools/command-lines.in
-+++ b/tools/command-lines.in
-@@ -343,13 +343,11 @@ DESC: Convert LV to striped.
- RULE: all not lv_is_locked lv_is_pvmove
- 
- lvconvert --type mirror LV
--OO: --mirrors SNumber, --regionsize RegionSize, --interval Number, --mirrorlog MirrorLog, OO_LVCONVERT
-+OO: --mirrors SNumber, --stripes_long Number, --stripesize SizeKB, --regionsize RegionSize, --interval Number, --mirrorlog MirrorLog, OO_LVCONVERT
- OP: PV ...
- ID: lvconvert_raid_types
- DESC: Convert LV to type mirror (also see type raid1),
--DESC: (also see lvconvert --mirrors).
- RULE: all not lv_is_locked lv_is_pvmove
--FLAGS: SECONDARY_SYNTAX
- 
- # When LV is already raid, this changes the raid layout
- # (changing layout of raid0 and raid1 not allowed.)
diff --git a/SOURCES/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-s.patch b/SOURCES/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-s.patch
deleted file mode 100644
index 02f6f35..0000000
--- a/SOURCES/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-s.patch
+++ /dev/null
@@ -1,51 +0,0 @@
- lib/metadata/metadata.c | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
-index dc1b501..f7eeb52 100644
---- a/lib/metadata/metadata.c
-+++ b/lib/metadata/metadata.c
-@@ -3504,19 +3504,41 @@ static void _set_pv_device(struct format_instance *fid,
- 			   struct physical_volume *pv)
- {
- 	char buffer[64] __attribute__((aligned(8)));
-+	struct cmd_context *cmd = fid->fmt->cmd;
-+	struct device *dev;
- 	uint64_t size;
- 
--	if (!(pv->dev = lvmcache_device_from_pvid(fid->fmt->cmd, &pv->id, &pv->label_sector))) {
-+	if (!(dev = lvmcache_device_from_pvid(cmd, &pv->id, &pv->label_sector))) {
- 		if (!id_write_format(&pv->id, buffer, sizeof(buffer)))
- 			buffer[0] = '\0';
- 
--		if (fid->fmt->cmd && !fid->fmt->cmd->pvscan_cache_single)
-+		if (cmd && !cmd->pvscan_cache_single)
- 			log_warn("WARNING: Couldn't find device with uuid %s.", buffer);
- 		else
- 			log_debug_metadata("Couldn't find device with uuid %s.", buffer);
- 	}
- 
- 	/*
-+	 * If the device and PV are not the size, it's a clue that we might
-+	 * be reading an MD component (but not necessarily). Skip this check:
-+	 * . if md component detection is disabled
-+	 * . if we are already doing full a md check in label scan
-+	 * . if md_component_checks is auto, not none (full means use_full_md_check is set)
-+	 */
-+	if (dev && (pv->size != dev->size) && cmd &&
-+	    cmd->md_component_detection &&
-+	    !cmd->use_full_md_check &&
-+	    !strcmp(cmd->md_component_checks, "auto")) {
-+		if (dev_is_md_component(dev, NULL, 1)) {
-+			log_warn("WARNING: device %s is an md component, not setting device for PV.",
-+				 dev_name(dev));
-+			dev = NULL;
-+		}
-+	}
-+
-+	pv->dev = dev;
-+
-+	/*
- 	 * A previous command wrote the VG while this dev was missing, so
- 	 * the MISSING flag was included in the PV.
- 	 */
diff --git a/SOURCES/lvm2-2_03_06-metadata-include-description-with-command-in-metadat.patch b/SOURCES/lvm2-2_03_06-metadata-include-description-with-command-in-metadat.patch
deleted file mode 100644
index e035826..0000000
--- a/SOURCES/lvm2-2_03_06-metadata-include-description-with-command-in-metadat.patch
+++ /dev/null
@@ -1,115 +0,0 @@
- lib/format_text/export.c      |  4 ++--
- lib/format_text/format-text.c | 27 ++++++++++++++++++++++++++-
- lib/metadata/metadata.h       |  1 -
- lib/metadata/vg.h             |  1 +
- test/shell/metadata.sh        |  4 ++++
- 5 files changed, 33 insertions(+), 4 deletions(-)
-
-diff --git a/lib/format_text/export.c b/lib/format_text/export.c
-index 841e06d..2a3f844 100644
---- a/lib/format_text/export.c
-+++ b/lib/format_text/export.c
-@@ -1086,7 +1086,7 @@ size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf)
- 	return r;
- }
- 
--size_t export_vg_to_buffer(struct volume_group *vg, char **buf)
-+static size_t _export_vg_to_buffer(struct volume_group *vg, char **buf)
- {
- 	return text_vg_export_raw(vg, "", buf);
- }
-@@ -1096,7 +1096,7 @@ struct dm_config_tree *export_vg_to_config_tree(struct volume_group *vg)
- 	char *buf = NULL;
- 	struct dm_config_tree *vg_cft;
- 
--	if (!export_vg_to_buffer(vg, &buf)) {
-+	if (!_export_vg_to_buffer(vg, &buf)) {
- 		log_error("Could not format metadata for VG %s.", vg->name);
- 		return NULL;
- 	}
-diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
-index 13b2c66..6873f19 100644
---- a/lib/format_text/format-text.c
-+++ b/lib/format_text/format-text.c
-@@ -493,6 +493,29 @@ static struct volume_group *_vg_read_precommit_raw(struct format_instance *fid,
- 	return vg;
- }
- 
-+#define MAX_DESC_LEN 2048
-+
-+static char *_build_desc_write(struct cmd_context *cmd, struct volume_group *vg)
-+{
-+	size_t len = strlen(cmd->cmd_line) + 32;
-+	char *desc;
-+
-+	if (len > MAX_DESC_LEN)
-+		len = MAX_DESC_LEN;
-+
-+	if (!(desc = zalloc(len)))
-+		return_NULL;
-+
-+	vg->write_count++;
-+
-+	if (vg->write_count == 1)
-+		dm_snprintf(desc, len, "Write from %s.", cmd->cmd_line);
-+	else
-+		dm_snprintf(desc, len, "Write[%u] from %s.", vg->write_count, cmd->cmd_line);
-+
-+	return desc;
-+}
-+
- /*
-  * VG metadata updates:
-  *
-@@ -576,9 +599,11 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg,
- 		new_buf = fidtc->raw_metadata_buf;
- 		new_size = fidtc->raw_metadata_buf_size;
- 	} else {
--		new_size = text_vg_export_raw(vg, "", &new_buf);
-+		char *desc = _build_desc_write(fid->fmt->cmd, vg);
-+		new_size = text_vg_export_raw(vg, desc, &new_buf);
- 		fidtc->raw_metadata_buf = new_buf;
- 		fidtc->raw_metadata_buf_size = new_size;
-+		free(desc);
- 	}
- 
- 	if (!new_size || !new_buf) {
-diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
-index 63ee4a6..2fc0015 100644
---- a/lib/metadata/metadata.h
-+++ b/lib/metadata/metadata.h
-@@ -473,7 +473,6 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahea
- /*
-  * For internal metadata caching.
-  */
--size_t export_vg_to_buffer(struct volume_group *vg, char **buf);
- struct dm_config_tree *export_vg_to_config_tree(struct volume_group *vg);
- struct volume_group *import_vg_from_config_tree(const struct dm_config_tree *cft,
- 						struct format_instance *fid);
-diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h
-index 6e89b33..2e21461 100644
---- a/lib/metadata/vg.h
-+++ b/lib/metadata/vg.h
-@@ -42,6 +42,7 @@ struct volume_group {
- 	struct lvmcache_vginfo *vginfo;
- 	uint32_t seqno;		/* Metadata sequence number */
- 	unsigned skip_validate_lock_args : 1;
-+	uint32_t write_count; /* count the number of vg_write calls */
- 
- 	/*
- 	 * The parsed committed (on-disk) copy of this VG; is NULL if this VG is committed
-diff --git a/test/shell/metadata.sh b/test/shell/metadata.sh
-index a86bc0b..f5d6483 100644
---- a/test/shell/metadata.sh
-+++ b/test/shell/metadata.sh
-@@ -26,6 +26,10 @@ pvcreate --metadatacopies 0 "$dev5"
- vgcreate $SHARED "$vg" "${DEVICES[@]}"
- lvcreate -n $lv -l 1 -i5 -I256 $vg
- 
-+pvck --dump metadata "$dev1" > meta1
-+grep "description = " meta1 > desc1
-+grep "Write from lvcreate" desc1
-+
- pvchange -x n "$dev1"
- pvchange -x y "$dev1"
- vgchange -a n $vg
diff --git a/SOURCES/lvm2-2_03_06-pvck-fix-looping-dump-metadata_all.patch b/SOURCES/lvm2-2_03_06-pvck-fix-looping-dump-metadata_all.patch
deleted file mode 100644
index 43b5c0b..0000000
--- a/SOURCES/lvm2-2_03_06-pvck-fix-looping-dump-metadata_all.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- tools/pvck.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/pvck.c b/tools/pvck.c
-index 3437164..af2dd8e 100644
---- a/tools/pvck.c
-+++ b/tools/pvck.c
-@@ -395,6 +395,9 @@ static int _dump_meta_all(struct device *dev, const char *tofile,
- 	search_offset = meta_offset + meta_size;
- 
-  search_next:
-+	if (search_wrapped && (search_offset >= meta_offset + meta_size))
-+		goto done;
-+
- 	if (search_offset > mda_size) {
- 		if (search_wrapped)
- 			goto done;
diff --git a/SOURCES/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-siz.patch b/SOURCES/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-siz.patch
deleted file mode 100644
index ae06be5..0000000
--- a/SOURCES/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-siz.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- tools/pvscan.c | 40 ++++++++++------------------------------
- 1 file changed, 10 insertions(+), 30 deletions(-)
-
-diff --git a/tools/pvscan.c b/tools/pvscan.c
-index d41345f..db813ad 100644
---- a/tools/pvscan.c
-+++ b/tools/pvscan.c
-@@ -621,6 +621,16 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev,
- 		set_pv_devices(baton.fid, baton.vg);
- 	}
- 
-+	/* This check repeated because set_pv_devices can do new md check. */
-+	if (dev->flags & DEV_IS_MD_COMPONENT) {
-+		log_print("pvscan[%d] PV %s ignore MD component, ignore metadata.", getpid(), dev_name(dev));
-+		if (baton.vg)
-+			release_vg(baton.vg);
-+		else
-+			fmt->ops->destroy_instance(baton.fid);
-+		return 1;
-+	}
-+
- 	if (baton.vg && vg_is_shared(baton.vg)) {
- 		log_print("pvscan[%d] PV %s ignore shared VG.", getpid(), dev_name(dev));
- 		release_vg(baton.vg);
-@@ -638,36 +648,6 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev,
- 		return 1;
- 	}
- 
--	/*
--	 * Do not consider a device online (for purposes of autoactivation)
--	 * if its size does not match the PV size recorded in the metadata.
--	 * It may mean that it's not the correct dev for the PV, e.g. it
--	 * could be an md component device that's not been filtered.
--	 */
--	if (baton.vg && cmd->check_pv_dev_sizes) {
--		struct pv_list *pvl;
--		uint64_t dev_size = 0;
--		uint64_t meta_pv_size = 0;
--
--		dm_list_iterate_items(pvl, &baton.vg->pvs) {
--			if (pvl->pv->dev != dev)
--				continue;
--
--			if (!dev_get_size(dev, &dev_size))
--				stack;
--			meta_pv_size = pv_size(pvl->pv);
--			break;
--		}
--
--		if (dev_size != meta_pv_size) {
--			log_print("pvscan[%d] PV %s ignore for size %llu not matching device %llu.",
--				  getpid(), dev_name(dev),
--				  (unsigned long long)meta_pv_size, (unsigned long long)dev_size);
--			release_vg(baton.vg);
--			return 1;
--		}
--	}
--
- 	ret = _online_pv_found(cmd, dev, dev_args, baton.vg, found_vgnames);
- 
- 	/*
diff --git a/SOURCES/lvm2-2_03_06-test-Fix-unbound-variable.patch b/SOURCES/lvm2-2_03_06-test-Fix-unbound-variable.patch
deleted file mode 100644
index a7a1efe..0000000
--- a/SOURCES/lvm2-2_03_06-test-Fix-unbound-variable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- test/lib/aux.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/lib/aux.sh b/test/lib/aux.sh
-index 09ef9ed..0cc26a4 100644
---- a/test/lib/aux.sh
-+++ b/test/lib/aux.sh
-@@ -1387,17 +1387,17 @@ version_at_least() {
- 	IFS=".-" read -r major minor revision <<< "$1"
- 	shift
- 
--	test -z "$1" && return 0
-+	test -z "${1:-}" && return 0
- 	test -n "$major" || return 1
- 	test "$major" -gt "$1" && return 0
- 	test "$major" -eq "$1" || return 1
- 
--	test -z "$2" && return 0
-+	test -n "$2" || return 0
- 	test -n "$minor" || return 1
- 	test "$minor" -gt "$2" && return 0
- 	test "$minor" -eq "$2" || return 1
- 
--	test -z "$3" && return 0
-+	test -n "$3" || return 0
- 	test "$revision" -ge "$3" 2>/dev/null || return 1
- }
- #
diff --git a/SOURCES/lvm2-2_03_06-test-Remove-now-useless-clvmd-test.patch b/SOURCES/lvm2-2_03_06-test-Remove-now-useless-clvmd-test.patch
deleted file mode 100644
index 7fbe161..0000000
--- a/SOURCES/lvm2-2_03_06-test-Remove-now-useless-clvmd-test.patch
+++ /dev/null
@@ -1,83 +0,0 @@
- test/shell/clvmd-restart.sh | 73 ---------------------------------------------
- 1 file changed, 73 deletions(-)
- delete mode 100644 test/shell/clvmd-restart.sh
-
-diff --git a/test/shell/clvmd-restart.sh b/test/shell/clvmd-restart.sh
-deleted file mode 100644
-index 7e3257a..0000000
---- a/test/shell/clvmd-restart.sh
-+++ /dev/null
-@@ -1,73 +0,0 @@
--#!/usr/bin/env bash
--
--# Copyright (C) 2011-2015 Red Hat, Inc. All rights reserved.
--#
--# This copyrighted material is made available to anyone wishing to use,
--# modify, copy, or redistribute it subject to the terms and conditions
--# of the GNU General Public License v.2.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--
--# set before test's clvmd is started, so it's passed in environ
--export LVM_CLVMD_BINARY=clvmd
--export LVM_BINARY=lvm
--
--SKIP_WITH_LVMLOCKD=1
--SKIP_WITHOUT_CLVMD=1
--SKIP_WITH_LVMPOLLD=1
--
--. lib/inittest
--
--# only clvmd based test, skip otherwise
--read -r LOCAL_CLVMD < LOCAL_CLVMD
--
--# TODO read from build, for now hardcoded
--CLVMD_SOCKET="/var/run/lvm/clvmd.sock"
--
--restart_clvmd_() {
--	"$LVM_CLVMD_BINARY" -S
--	ls -la "$CLVMD_SOCKET" || true
--
--	for i in $(seq 1 20) ; do
--		test -S "$CLVMD_SOCKET" && break
--		sleep .1
--	done
--	# restarted clvmd has the same PID (no fork, only execvp)
--	NEW_LOCAL_CLVMD=$(pgrep clvmd)
--	test "$LOCAL_CLVMD" -eq "$NEW_LOCAL_CLVMD"
--}
--
--aux prepare_vg
--
--lvcreate -an --zero n -n $lv1 -l1 $vg
--lvcreate -an --zero n -n $lv2 -l1 $vg
--lvcreate -l1 $vg
--
--lvchange -aey $vg/$lv1
--lvchange -aey $vg/$lv2
--
--restart_clvmd_
--
--# try restart once more
--restart_clvmd_
--
--# FIXME: Hmm - how could we test exclusivity is preserved in singlenode ?
--lvchange -an $vg/$lv1
--lvchange -aey $vg/$lv1
--lvcreate -s -l3 -n snap $vg/$lv1
--
--"$LVM_CLVMD_BINARY" -R
--
--vgchange -an $vg
--
--# Test what happens after 'reboot'
--kill "$LOCAL_CLVMD"
--while test -e "$CLVMD_PIDFILE"; do echo -n .; sleep .1; done # wait for the pid removal
--aux prepare_clvmd
--
--vgchange -ay $vg
--lvremove -f $vg/snap
--
--vgremove -ff $vg
diff --git a/SOURCES/lvm2-2_03_06-tests-Fix-unbound-variable.patch b/SOURCES/lvm2-2_03_06-tests-Fix-unbound-variable.patch
deleted file mode 100644
index 3ad7672..0000000
--- a/SOURCES/lvm2-2_03_06-tests-Fix-unbound-variable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- test/lib/aux.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/lib/aux.sh b/test/lib/aux.sh
-index 0cc26a4..e3f624c 100644
---- a/test/lib/aux.sh
-+++ b/test/lib/aux.sh
-@@ -1387,17 +1387,17 @@ version_at_least() {
- 	IFS=".-" read -r major minor revision <<< "$1"
- 	shift
- 
--	test -z "${1:-}" && return 0
-+	test -n "${1:-}" || return 0
- 	test -n "$major" || return 1
- 	test "$major" -gt "$1" && return 0
- 	test "$major" -eq "$1" || return 1
- 
--	test -n "$2" || return 0
-+	test -n "${2:-}" || return 0
- 	test -n "$minor" || return 1
- 	test "$minor" -gt "$2" && return 0
- 	test "$minor" -eq "$2" || return 1
- 
--	test -n "$3" || return 0
-+	test -n "${3:-}" || return 0
- 	test "$revision" -ge "$3" 2>/dev/null || return 1
- }
- #
diff --git a/SOURCES/lvm2-2_03_06-tests-accept-also-value-512.patch b/SOURCES/lvm2-2_03_06-tests-accept-also-value-512.patch
deleted file mode 100644
index b2610ac..0000000
--- a/SOURCES/lvm2-2_03_06-tests-accept-also-value-512.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- test/shell/lvchange-cache.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/shell/lvchange-cache.sh b/test/shell/lvchange-cache.sh
-index ab7c8b0..93c8c3b 100644
---- a/test/shell/lvchange-cache.sh
-+++ b/test/shell/lvchange-cache.sh
-@@ -88,7 +88,8 @@ grep 'random_threshold=4' out
- else
- # When MQ is emulated by SMQ policy it does not hold settings.
- # So just skip testing of param changes when sequential_threshold=0
--grep 'sequential_threshold=0' out
-+# or some older kernel instancies show also value 512
-+grep 'sequential_threshold=0' out || grep 'sequential_threshold=512' out
- fi
- 
- fi  # have_cache 1 5 0
diff --git a/SOURCES/lvm2-2_03_06-tests-add-exported.sh.patch b/SOURCES/lvm2-2_03_06-tests-add-exported.sh.patch
deleted file mode 100644
index 3002bad..0000000
--- a/SOURCES/lvm2-2_03_06-tests-add-exported.sh.patch
+++ /dev/null
@@ -1,217 +0,0 @@
- test/shell/exported.sh | 207 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 207 insertions(+)
- create mode 100644 test/shell/exported.sh
-
-diff --git a/test/shell/exported.sh b/test/shell/exported.sh
-new file mode 100644
-index 0000000..b6d17ce
---- /dev/null
-+++ b/test/shell/exported.sh
-@@ -0,0 +1,207 @@
-+#!/usr/bin/env bash
-+
-+# Copyright (C) 2008-2013,2018 Red Hat, Inc. All rights reserved.
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions
-+# of the GNU General Public License v.2.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+. lib/inittest
-+
-+# Check what is and is not permitted on an exported VG/PV
-+
-+aux prepare_devs 3
-+get_devs
-+
-+vgcreate $vg1 "$dev1"
-+vgcreate $vg2 "$dev2"
-+
-+lvcreate -l1 -n $lv1 -an $vg1
-+lvcreate -l1 -n $lv2 -an $vg2
-+
-+vgchange --addtag aa $vg1
-+lvchange --addtag bb $vg1/$lv1
-+
-+# vgexport only when no lvs are active
-+lvchange -ay $vg1/$lv1
-+not vgexport $vg1
-+lvchange -an $vg1/$lv1
-+
-+vgexport $vg1
-+
-+lvm fullreport |tee out
-+grep $vg1 out
-+
-+lvm fullreport $vg1 |tee out
-+grep $vg1 out
-+
-+not lvchange -ay $vg1
-+not lvchange -ay $vg1/$lv1
-+not lvchange --addtag bar $vg1/$lv1
-+not lvchange --monitor y $vg1/$lv1
-+
-+not lvconvert --type mirror $vg1/$lv1
-+
-+not lvcreate -l1 $vg1
-+
-+not lvdisplay $vg1
-+
-+lvdisplay 2>&1|tee out
-+not grep $vg1 out
-+
-+not lvextend -l+1 $vg1/$lv1
-+
-+lvmdiskscan 2>&1|tee foo
-+grep "$dev1" foo
-+
-+not lvreduce -l-1 $vg1/$lv1
-+
-+not lvremove $vg1
-+not lvremove $vg1/$lv1
-+
-+not lvrename $vg1 $lv1 $lv2
-+
-+not lvresize --size 1M $vg1/$lv1
-+
-+not lvs $vg1
-+
-+lvs 2>&1|tee out
-+not grep $vg1 out
-+
-+lvscan 2>&1|tee out
-+not grep $vg1 out
-+
-+not pvchange --addtag cc "$dev1"
-+pvs -o+tags "$dev1" 2>&1|tee out
-+grep "$dev1" out
-+not grep cc out
-+
-+pvs -osize "$dev1" > before
-+not pvresize --setphysicalvolumesize 100M "$dev1"
-+pvs -osize "$dev1" > after
-+diff before after
-+
-+pvck "$dev1"
-+pvck --dump headers "$dev1" > out
-+grep "label_header at 512" out
-+
-+not pvcreate "$dev1"
-+
-+pvdisplay "$dev1" 2>&1|tee out
-+grep "$dev1" out
-+
-+not pvmove "$dev1"
-+
-+not pvremove "$dev1"
-+
-+pvs "$dev1" 2>&1|tee out
-+grep "$dev1" out
-+
-+pvscan 2>&1|tee out
-+grep "$dev1" out
-+
-+pvscan --cache 2>&1|tee out
-+grep "$dev1" out
-+
-+vgcfgbackup $vg1
-+
-+vgcfgrestore $vg1
-+
-+not vgchange -ay $vg1
-+not vgchange --addtag asdf $vg1
-+not vgchange --monitor y $vg1
-+
-+not vgck $vg1
-+
-+not vgcreate $vg1 "$dev3"
-+
-+vgdisplay $vg1 2>&1|tee out
-+grep $vg1 out
-+
-+not vgexport $vg1
-+
-+vgexport $vg2
-+not lvcreate -l1 -n $lv3 -an $vg2
-+vgimport $vg2
-+lvcreate -l1 -n $lv3 -an $vg2
-+lvremove $vg2/$lv3
-+
-+not vgextend $vg1 "$dev3"
-+
-+not vgmerge $vg1 $vg2
-+
-+not vgmknodes $vg1
-+
-+not vgreduce --removemissing $vg1
-+
-+not vgremove $vg1
-+
-+vgrename $vg1 $vg3
-+vgrename $vg3 $vg1
-+
-+vgs $vg1 2>&1|tee out
-+grep $vg1 out
-+
-+vgscan 2>&1|tee out
-+grep $vg1 out
-+
-+# pvscan --cache tracks online state of exported PVs,
-+# but autoactivation should not activate LVs.
-+pvscan --cache -aay "$dev1"
-+vgimport $vg1
-+check inactive $vg1 $lv1
-+vgexport $vg1
-+
-+# using a tag does not give access to exported vg
-+lvchange -ay @foo
-+vgimport $vg1
-+check inactive $vg1 $lv1
-+vgexport $vg1
-+
-+# using select does not give access to exported vg
-+lvchange -ay --select lvname=$lv1
-+vgimport $vg1
-+check inactive $vg1 $lv1
-+vgexport $vg1
-+
-+# tag or select do not work with vgremove on exported vg
-+vgremove @foo
-+vgs $vg1
-+vgremove --select vgname=$vg1
-+vgs $vg1
-+
-+# exported vg is skipped without error when not named
-+vgchange -ay
-+vgimport $vg1
-+check inactive $vg1 $lv1
-+vgexport $vg1
-+
-+# exported vg is skipped without error when not named
-+vgchange --addtag newtag
-+vgs -o tags $vg1 > out
-+not grep newtag out
-+vgchange --deltag aa
-+vgs -o tags $vg1 > out
-+grep aa out
-+
-+# exported vg is skipped without error when not named
-+vgchange --monitor y
-+vgchange --monitor n
-+
-+vgimport $vg1
-+vgextend $vg1 "$dev3"
-+vgexport $vg1
-+
-+not vgreduce $vg1 "$dev3"
-+
-+not vgsplit $vg1 "$vg3" "$dev3"
-+
-+# For vgimportclone see vgimportclone.sh
-+
-+vgimport $vg1
-+vgremove -ff $vg1
-+vgremove -ff $vg2
diff --git a/SOURCES/lvm2-2_03_06-tests-add-settle-wait-before-issue-remove.patch b/SOURCES/lvm2-2_03_06-tests-add-settle-wait-before-issue-remove.patch
deleted file mode 100644
index 26cf3a9..0000000
--- a/SOURCES/lvm2-2_03_06-tests-add-settle-wait-before-issue-remove.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- test/shell/fsadm-crypt.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/shell/fsadm-crypt.sh b/test/shell/fsadm-crypt.sh
-index 9377e89..4b8fc4e 100644
---- a/test/shell/fsadm-crypt.sh
-+++ b/test/shell/fsadm-crypt.sh
-@@ -83,6 +83,7 @@ export LVM_BINARY
- test ! -d "$mount_dir" && mkdir "$mount_dir"
- 
- crypt_close() {
-+	aux udev_wait
- 	cryptsetup remove "$1"
- 	if [ "$?" -eq 0 -a -n "$DROP_SYMLINK" ]; then
- 		rm -f "$DM_DEV_DIR/mapper/$1"
diff --git a/SOURCES/lvm2-2_03_06-tests-allow-mixed-block-sizes.patch b/SOURCES/lvm2-2_03_06-tests-allow-mixed-block-sizes.patch
deleted file mode 100644
index b44cd94..0000000
--- a/SOURCES/lvm2-2_03_06-tests-allow-mixed-block-sizes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
- test/shell/allow-mixed-block-sizes.sh | 44 +++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
- create mode 100644 test/shell/allow-mixed-block-sizes.sh
-
-diff --git a/test/shell/allow-mixed-block-sizes.sh b/test/shell/allow-mixed-block-sizes.sh
-new file mode 100644
-index 0000000..1803256
---- /dev/null
-+++ b/test/shell/allow-mixed-block-sizes.sh
-@@ -0,0 +1,44 @@
-+#!/usr/bin/env bash
-+
-+# Copyright (C) 2019 Red Hat, Inc. All rights reserved.
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions
-+# of the GNU General Public License v.2.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+SKIP_WITH_LVMPOLLD=1
-+
-+. lib/inittest
-+
-+dd if=/dev/zero of=loopa bs=$((1024*1024)) count=2 2> /dev/null
-+dd if=/dev/zero of=loopb bs=$((1024*1024)) count=2 2> /dev/null
-+LOOP1=$(losetup -f loopa --sector-size 4096 --show)
-+LOOP2=$(losetup -f loopb --show)
-+
-+echo $LOOP1
-+echo $LOOP2
-+
-+aux extend_filter "a|$LOOP1|"
-+aux extend_filter "a|$LOOP2|"
-+
-+not vgcreate --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP1 $LOOP2
-+vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 $LOOP2
-+vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg
-+
-+wipefs -a $LOOP1
-+wipefs -a $LOOP2
-+
-+vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1
-+vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg
-+not vgextend --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP2
-+vgextend --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP2
-+
-+losetup -d $LOOP1
-+losetup -d $LOOP2
-+rm loopa
-+rm loopb
-+
diff --git a/SOURCES/lvm2-2_03_06-tests-extend-lvm-on-md.patch b/SOURCES/lvm2-2_03_06-tests-extend-lvm-on-md.patch
deleted file mode 100644
index f7720b7..0000000
--- a/SOURCES/lvm2-2_03_06-tests-extend-lvm-on-md.patch
+++ /dev/null
@@ -1,357 +0,0 @@
- test/shell/lvm-on-md.sh | 257 ++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 237 insertions(+), 20 deletions(-)
-
-diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh
-index 22cbee8..c848083 100644
---- a/test/shell/lvm-on-md.sh
-+++ b/test/shell/lvm-on-md.sh
-@@ -42,7 +42,7 @@ aux lvmconf 'devices/obtain_device_list_from_udev = 0'
- 
- aux extend_filter_LVMTEST "a|/dev/md|"
- 
--aux prepare_devs 2
-+aux prepare_devs 3
- 
- # create 2 disk MD raid1 array
- # by default using metadata format 1.0 with data at the end of device
-@@ -55,6 +55,9 @@ pvdev=$(< MD_DEV_PV)
- 
- vgcreate $vg "$mddev"
- 
-+PVIDMD=`pvs $mddev --noheading -o uuid | tr -d - | awk '{print $1}'`
-+echo $PVIDMD
-+
- lvcreate -n $lv1 -l 2 $vg
- lvcreate -n $lv2 -l 2 -an $vg
- 
-@@ -87,7 +90,8 @@ pvs > out
- not grep "$dev1" out
- not grep "$dev2" out
- 
--pvs -vvvv
-+pvs 2>&1|tee out
-+not grep "Not using device" out
- 
- # should not activate from the md legs
- not vgchange -ay $vg
-@@ -105,42 +109,62 @@ _clear_online_files
- pvscan --cache -aay "$dev1"
- pvscan --cache -aay "$dev2"
- 
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
- # should not show an active lv
- rm out
- lvs -o active $vg |tee out || true
- not grep "active" out
- 
--# start the md dev
- mdadm --assemble "$mddev" "$dev1" "$dev2"
- aux udev_wait
- 
--# Now that the md dev is online, pvs can see it
--# and check for components even if
--# md_component_checks is "start" (which disables
--# most default end-of-device scans)
--aux lvmconf 'devices/md_component_checks = "start"'
--
- not pvs "$dev1"
- not pvs "$dev2"
- pvs > out
- not grep "$dev1" out
- not grep "$dev2" out
- 
-+lvs $vg
-+vgchange -an $vg
-+
-+# should not activate from the md legs
-+_clear_online_files
-+pvscan --cache -aay "$dev1"
-+pvscan --cache -aay "$dev2"
-+
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+# should not show an active lv
-+rm out
-+lvs -o active $vg |tee out || true
-+not grep "active" out
- 
- vgchange -ay $vg
- 
- check lv_field $vg/$lv1 lv_active "active"
- 
- vgchange -an $vg
-+
-+_clear_online_files
-+pvscan --cache -aay "$mddev"
-+
-+ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+lvs -o active $vg |tee out || true
-+grep "active" out
-+
-+vgchange -an $vg
-+
- aux udev_wait
- 
- vgremove -f $vg
- 
- aux cleanup_md_dev
- 
--# Put this setting back to the default
--aux lvmconf 'devices/md_component_checks = "auto"'
--
- # create 2 disk MD raid0 array
- # by default using metadata format 1.0 with data at the end of device
- # When a raid0 md array is stopped, the components will not look like
-@@ -154,7 +178,8 @@ pvdev=$(< MD_DEV_PV)
- 
- vgcreate $vg "$mddev"
- 
--lvs $vg
-+PVIDMD=`pvs $mddev --noheading -o uuid | tr -d - | awk '{print $1}'`
-+echo $PVIDMD
- 
- lvcreate -n $lv1 -l 2 $vg
- lvcreate -n $lv2 -l 2 -an $vg
-@@ -188,7 +213,8 @@ pvs > out
- not grep "$dev1" out
- not grep "$dev2" out
- 
--pvs -vvvv
-+pvs 2>&1|tee out
-+not grep "Not using device" out
- 
- # should not activate from the md legs
- not vgchange -ay $vg
-@@ -206,6 +232,9 @@ _clear_online_files
- pvscan --cache -aay "$dev1"
- pvscan --cache -aay "$dev2"
- 
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
- # should not show an active lv
- rm out
- lvs -o active $vg |tee out || true
-@@ -215,23 +244,211 @@ not grep "active" out
- mdadm --assemble "$mddev" "$dev1" "$dev2"
- aux udev_wait
- 
--# Now that the md dev is online, pvs can see it
--# and check for components even if
--# md_component_checks is "start" (which disables
--# most default end-of-device scans)
--aux lvmconf 'devices/md_component_checks = "start"'
-+not pvs "$dev1"
-+not pvs "$dev2"
-+pvs > out
-+not grep "$dev1" out
-+not grep "$dev2" out
-+
-+lvs $vg
-+vgchange -an $vg
-+
-+# should not activate from the md legs
-+_clear_online_files
-+pvscan --cache -aay "$dev1"
-+pvscan --cache -aay "$dev2"
-+
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+# should not show an active lv
-+rm out
-+lvs -o active $vg |tee out || true
-+not grep "active" out
-+
-+vgchange -ay $vg
-+
-+check lv_field $vg/$lv1 lv_active "active"
-+
-+vgchange -an $vg
-+
-+_clear_online_files
-+pvscan --cache -aay "$mddev"
-+
-+ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+lvs -o active $vg |tee out || true
-+grep "active" out
-+
-+vgchange -an $vg
-+
-+aux udev_wait
-+
-+vgremove -f $vg
-+
-+aux cleanup_md_dev
-+
-+# Repeat tests using the default config settings
-+
-+aux lvmconf 'devices/hints = "all"'
-+aux lvmconf 'devices/obtain_device_list_from_udev = 1'
-+
-+# create 2 disk MD raid0 array
-+# by default using metadata format 1.0 with data at the end of device
-+# When a raid0 md array is stopped, the components will not look like
-+# duplicate PVs as they do with raid1.
-+aux prepare_md_dev 0 64 2 "$dev1" "$dev2"
-+
-+cat /proc/mdstat
-+
-+mddev=$(< MD_DEV)
-+pvdev=$(< MD_DEV_PV)
-+
-+# Create an unused PV so that there is at least one PV in the hints
-+# when the MD dev is stopped.  If there are no PVs, the hints are
-+# empty, and the code falls back to scanning all, and we do not end
-+# up testing the code with hints actively used.
-+pvcreate "$dev3"
-+
-+vgcreate $vg "$mddev"
-+
-+PVIDMD=`pvs $mddev --noheading -o uuid | tr -d - | awk '{print $1}'`
-+echo $PVIDMD
-+
-+lvcreate -n $lv1 -l 2 $vg
-+lvcreate -n $lv2 -l 2 -an $vg
-+
-+lvchange -ay $vg/$lv2
-+check lv_field $vg/$lv1 lv_active "active"
-+
-+# lvm does not show md components as PVs
-+pvs "$mddev"
-+not pvs "$dev1"
-+not pvs "$dev2"
-+pvs > out
-+not grep "$dev1" out
-+not grep "$dev2" out
-+
-+grep "$mddev" /run/lvm/hints
-+grep "$dev3" /run/lvm/hints
-+not grep "$dev1" /run/lvm/hints
-+not grep "$dev2" /run/lvm/hints
-+
-+sleep 1
-+
-+vgchange -an $vg
-+sleep 1
-+
-+# When the md device is started, lvm will see that and know to
-+# scan for md components, so stop the md device to remove this
-+# advantage so we will test the fallback detection.
-+mdadm --stop "$mddev"
-+aux udev_wait
-+
-+# A WARNING indicating duplicate PVs is printed by 'pvs' in this
-+# case.  It's printed during the scan, but after the scan, the
-+# md component detection is run on the devs and they are dropped
-+# when we see they are md components. So, we ignore the warning
-+# containing the word duplicate, and look for the "Not using device"
-+# message, which shouldn't appear, as it would indicate that
-+# we didn't drop the md components.
-+# FIXME: we should avoid printing the premature warning indicating
-+# duplicate PVs which are eventually recognized as md components
-+# and dropped.
-+pvs 2>&1|tee out1
-+grep -v WARNING out1 > out2
-+not grep "Not using device" out2
-+not grep "$mddev" out2
-+not grep "$dev1" out2
-+not grep "$dev2" out2
-+grep "$dev3" out2
-+cat /run/lvm/hints
-+
-+pvs 2>&1|tee out1
-+grep -v WARNING out1 > out2
-+not grep "Not using device" out2
-+not grep "$mddev" out2
-+not grep "$dev1" out2
-+not grep "$dev2" out2
-+grep "$dev3" out2
-+cat /run/lvm/hints
- 
-+# The md components should still be detected and excluded.
- not pvs "$dev1"
- not pvs "$dev2"
- pvs > out
- not grep "$dev1" out
- not grep "$dev2" out
-+grep "$dev3" out
- 
--vgchange -ay $vg 2>&1 |tee out
-+# should not activate from the md legs
-+not vgchange -ay $vg
-+
-+# should not show an active lv
-+rm out
-+lvs -o active $vg |tee out || true
-+not grep "active" out
-+
-+# should not allow updating vg
-+not lvcreate -l1 $vg
-+
-+# should not activate from the md legs
-+_clear_online_files
-+pvscan --cache -aay "$dev1"
-+pvscan --cache -aay "$dev2"
-+
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+# should not show an active lv
-+rm out
-+lvs -o active $vg |tee out || true
-+not grep "active" out
-+
-+# start the md dev
-+mdadm --assemble "$mddev" "$dev1" "$dev2"
-+aux udev_wait
-+
-+not pvs "$dev1"
-+not pvs "$dev2"
-+pvs > out
-+not grep "$dev1" out
-+not grep "$dev2" out
-+
-+lvs $vg
-+vgchange -an $vg
-+
-+# should not activate from the md legs
-+_clear_online_files
-+pvscan --cache -aay "$dev1"
-+pvscan --cache -aay "$dev2"
-+
-+not ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+not ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+# should not show an active lv
-+rm out
-+lvs -o active $vg |tee out || true
-+not grep "active" out
-+
-+vgchange -ay $vg
- 
- check lv_field $vg/$lv1 lv_active "active"
- 
- vgchange -an $vg
-+
-+_clear_online_files
-+pvscan --cache -aay "$mddev"
-+
-+ls "$RUNDIR/lvm/pvs_online/$PVIDMD"
-+ls "$RUNDIR/lvm/vgs_online/$vg"
-+
-+lvs -o active $vg |tee out || true
-+grep "active" out
-+
-+vgchange -an $vg
-+
- aux udev_wait
- 
- vgremove -f $vg
diff --git a/SOURCES/lvm2-2_03_06-tests-fix-ra-checking.patch b/SOURCES/lvm2-2_03_06-tests-fix-ra-checking.patch
deleted file mode 100644
index 9a5b976..0000000
--- a/SOURCES/lvm2-2_03_06-tests-fix-ra-checking.patch
+++ /dev/null
@@ -1,52 +0,0 @@
- test/shell/lvcreate-usage.sh | 14 ++++++++++----
- test/shell/read-ahead.sh     |  6 +++++-
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/test/shell/lvcreate-usage.sh b/test/shell/lvcreate-usage.sh
-index 6d42401..ca8694e 100644
---- a/test/shell/lvcreate-usage.sh
-+++ b/test/shell/lvcreate-usage.sh
-@@ -175,15 +175,21 @@ check lv_field $vg/$lv2 lv_kernel_read_ahead "0"
- lvcreate -L 8 -n $lv3 --readahead 8k $vg
- check lv_field $vg/$lv3 lv_read_ahead "8.00k"
- check lv_field $vg/$lv3 lv_kernel_read_ahead "8.00k"
--lvcreate -L 8 -n $lv4 --readahead auto $vg
-+lvcreate -L 8 -n $lv4 --readahead auto $vg "$dev1"
- check lv_field $vg/$lv4 lv_read_ahead "auto"
--check lv_field $vg/$lv4 lv_kernel_read_ahead "128.00k"
-+# figure RA value of a PV origin device
-+DEVICE=$(dmsetup deps -o blkdevname "$dev1" | sed -e "s,.*:\ (\(.*\)),/dev/\1,")
-+RASZ=$(( $(blockdev --getra "$DEVICE" ) / 2 ))
-+SZ="$RASZ.00k"
-+test "$RASZ" -ge 128 || SZ="128.00k"
-+check lv_field $vg/$lv4 lv_kernel_read_ahead "$SZ" --units k
- lvcreate -L 8 -n $lv5 -i2 --stripesize 16k --readahead auto $vg
- check lv_field $vg/$lv5 lv_read_ahead "auto"
--check lv_field $vg/$lv5 lv_kernel_read_ahead "128.00k"
-+check lv_field $vg/$lv5 lv_kernel_read_ahead "$SZ" --units k
- lvcreate -L 8 -n $lv6 -i2 --stripesize 128k --readahead auto $vg
- check lv_field $vg/$lv6 lv_read_ahead "auto"
--check lv_field $vg/$lv6 lv_kernel_read_ahead "512.00k"
-+test "$RASZ" -ge 512 || SZ="512.00k"
-+check lv_field $vg/$lv6 lv_kernel_read_ahead "$SZ" --units k
- lvremove -ff $vg
- 
- #
-diff --git a/test/shell/read-ahead.sh b/test/shell/read-ahead.sh
-index 60e5912..53cc572 100644
---- a/test/shell/read-ahead.sh
-+++ b/test/shell/read-ahead.sh
-@@ -35,8 +35,12 @@ lvremove -ff $vg
- #COMM "read ahead is properly inherited from underlying PV"
- blockdev --setra 768 "$dev1"
- vgscan
-+DEVICE=$(dmsetup deps -o blkdevname "$dev1" | sed -e "s,.*:\ (\(.*\)),/dev/\1,")
-+RASZ=$(blockdev --getra "$DEVICE")
-+SZ=$RASZ
-+test "$RASZ" -ge 768 || SZ=768
- lvcreate -n $lv -L4m $vg "$dev1"
--test "$(blockdev --getra "$DM_DEV_DIR/$vg/$lv")" -eq 768
-+test "$(blockdev --getra "$DM_DEV_DIR/$vg/$lv")" -eq "$SZ"
- lvremove -ff $vg
- 
- # Check default, active/inactive values for read_ahead / kernel_read_ahead
diff --git a/SOURCES/lvm2-2_03_06-tests-for-cluster-testing-we-always-need-exclusive-m.patch b/SOURCES/lvm2-2_03_06-tests-for-cluster-testing-we-always-need-exclusive-m.patch
deleted file mode 100644
index 4b125f7..0000000
--- a/SOURCES/lvm2-2_03_06-tests-for-cluster-testing-we-always-need-exclusive-m.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- test/shell/lvconvert-mirror-split.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/shell/lvconvert-mirror-split.sh b/test/shell/lvconvert-mirror-split.sh
-index 40720a4..00291ec 100644
---- a/test/shell/lvconvert-mirror-split.sh
-+++ b/test/shell/lvconvert-mirror-split.sh
-@@ -20,7 +20,7 @@ aux prepare_vg 3
- # Mirror split tests
- ###########################################
- # 3-way to 2-way/linear
--lvcreate --type mirror -m 2 -l 2 -n $lv1 $vg
-+lvcreate -aey --type mirror -m 2 -l 2 -n $lv1 $vg
- aux wait_for_sync $vg $lv1
- lvconvert --splitmirrors 1 -n $lv2 -vvvv $vg/$lv1
- 
diff --git a/SOURCES/lvm2-2_03_06-tests-large-physical-sector-size.patch b/SOURCES/lvm2-2_03_06-tests-large-physical-sector-size.patch
deleted file mode 100644
index 9d0bc45..0000000
--- a/SOURCES/lvm2-2_03_06-tests-large-physical-sector-size.patch
+++ /dev/null
@@ -1,53 +0,0 @@
- test/shell/large-physical-sector-size.sh | 43 ++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 test/shell/large-physical-sector-size.sh
-
-diff --git a/test/shell/large-physical-sector-size.sh b/test/shell/large-physical-sector-size.sh
-new file mode 100644
-index 0000000..891f409
---- /dev/null
-+++ b/test/shell/large-physical-sector-size.sh
-@@ -0,0 +1,43 @@
-+#!/usr/bin/env bash
-+
-+# Copyright (C) 2019 Red Hat, Inc. All rights reserved.
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions
-+# of the GNU General Public License v.2.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+SKIP_WITH_LVMPOLLD=1
-+
-+. lib/inittest
-+
-+LOGICAL_BLOCK_SIZE=4096
-+
-+# PHYSICAL_BLOCK_SIZE is set with physblk_exp which
-+# shifts the logical block size value.
-+
-+# 4096 << 9 = 2MB physical block size
-+PHYSICAL_BLOCK_SHIFT=9
-+
-+aux prepare_scsi_debug_dev 256 sector_size=$LOGICAL_BLOCK_SIZE physblk_exp=$PHYSICAL_BLOCK_SHIFT
-+
-+check sysfs "$(< SCSI_DEBUG_DEV)" queue/logical_block_size "$LOGICAL_BLOCK_SIZE"
-+
-+aux prepare_pvs 1 256
-+
-+get_devs
-+
-+vgcreate $SHARED $vg "$dev1"
-+
-+for i in `seq 1 40`; do lvcreate -an -l1 $vg; done;
-+
-+lvs $vg
-+
-+lvremove -y $vg
-+
-+vgremove $vg
-+
-+aux cleanup_scsi_debug_dev
diff --git a/SOURCES/lvm2-2_03_06-tests-lvm-on-md-use-variable-run-dir.patch b/SOURCES/lvm2-2_03_06-tests-lvm-on-md-use-variable-run-dir.patch
deleted file mode 100644
index 670f2d2..0000000
--- a/SOURCES/lvm2-2_03_06-tests-lvm-on-md-use-variable-run-dir.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- test/shell/lvm-on-md.sh | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh
-index c848083..2877ea2 100644
---- a/test/shell/lvm-on-md.sh
-+++ b/test/shell/lvm-on-md.sh
-@@ -16,6 +16,7 @@ RUNDIR="/run"
- test -d "$RUNDIR" || RUNDIR="/var/run"
- PVS_ONLINE_DIR="$RUNDIR/lvm/pvs_online"
- VGS_ONLINE_DIR="$RUNDIR/lvm/vgs_online"
-+HINTS="$RUNDIR/lvm/hints"
- 
- _clear_online_files() {
-         # wait till udev is finished
-@@ -330,10 +331,10 @@ pvs > out
- not grep "$dev1" out
- not grep "$dev2" out
- 
--grep "$mddev" /run/lvm/hints
--grep "$dev3" /run/lvm/hints
--not grep "$dev1" /run/lvm/hints
--not grep "$dev2" /run/lvm/hints
-+grep "$mddev" $HINTS
-+grep "$dev3" $HINTS
-+not grep "$dev1" $HINTS
-+not grep "$dev2" $HINTS
- 
- sleep 1
- 
-@@ -363,7 +364,7 @@ not grep "$mddev" out2
- not grep "$dev1" out2
- not grep "$dev2" out2
- grep "$dev3" out2
--cat /run/lvm/hints
-+cat $HINTS
- 
- pvs 2>&1|tee out1
- grep -v WARNING out1 > out2
-@@ -372,7 +373,7 @@ not grep "$mddev" out2
- not grep "$dev1" out2
- not grep "$dev2" out2
- grep "$dev3" out2
--cat /run/lvm/hints
-+cat $HINTS
- 
- # The md components should still be detected and excluded.
- not pvs "$dev1"
diff --git a/SOURCES/lvm2-2_03_06-tests-open-file-limit.patch b/SOURCES/lvm2-2_03_06-tests-open-file-limit.patch
deleted file mode 100644
index 1154167..0000000
--- a/SOURCES/lvm2-2_03_06-tests-open-file-limit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
- test/shell/open-file-limit.sh | 46 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 test/shell/open-file-limit.sh
-
-diff --git a/test/shell/open-file-limit.sh b/test/shell/open-file-limit.sh
-new file mode 100644
-index 0000000..87b0f7e
---- /dev/null
-+++ b/test/shell/open-file-limit.sh
-@@ -0,0 +1,46 @@
-+#!/bin/bash
-+# Copyright (C) 2014 Red Hat, Inc. All rights reserved.
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions
-+# of the GNU General Public License v.2.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+# Test scan_lvs config setting
-+
-+SKIP_WITH_LVMPOLLD=1
-+SKIP_WITH_LVMLOCKD=1
-+
-+. lib/inittest
-+
-+aux lvmconf 'devices/pv_min_size = 1024'
-+
-+aux prepare_devs 200 1
-+
-+for i in $(seq 1 200); do
-+	pvcreate "$DM_DEV_DIR/mapper/${PREFIX}pv$i"
-+done
-+
-+pvs > out
-+test "$(grep pv out | wc -l)" -eq 200
-+
-+# Set the soft limit to 100 fd's when 200 PVs need to be open.
-+# This requires lvm to increase its soft limit in order to
-+# process all the PVs.
-+# Test this with and without udev providing device lists.
-+
-+aux lvmconf 'devices/obtain_device_list_from_udev = 0'
-+
-+prlimit --nofile=100: pvs > out
-+
-+test "$(grep pv out | wc -l)" -eq 200
-+
-+aux lvmconf 'devices/obtain_device_list_from_udev = 1'
-+
-+prlimit --nofile=100: pvs > out
-+
-+test "$(grep pv out | wc -l)" -eq 200
-+
diff --git a/SOURCES/lvm2-2_03_06-tests-pvscan-autoactivate-test-unmatching-dev-and-PV.patch b/SOURCES/lvm2-2_03_06-tests-pvscan-autoactivate-test-unmatching-dev-and-PV.patch
deleted file mode 100644
index 71ef6f7..0000000
--- a/SOURCES/lvm2-2_03_06-tests-pvscan-autoactivate-test-unmatching-dev-and-PV.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- test/shell/pvscan-autoactivate.sh | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/test/shell/pvscan-autoactivate.sh b/test/shell/pvscan-autoactivate.sh
-index d674dc5..d79a7e3 100644
---- a/test/shell/pvscan-autoactivate.sh
-+++ b/test/shell/pvscan-autoactivate.sh
-@@ -27,7 +27,7 @@ _clear_online_files() {
- 
- . lib/inittest
- 
--aux prepare_pvs 8
-+aux prepare_devs 8 16
- 
- vgcreate $vg1 "$dev1" "$dev2"
- lvcreate -n $lv1 -l 4 -a n $vg1
-@@ -209,3 +209,29 @@ pvscan --cache -aay
- check lv_field $vg3/$lv1 lv_active "active"
- lvchange -an $vg3
- 
-+# Test event activation when PV and dev size don't match
-+
-+vgremove -ff $vg3
-+
-+pvremove "$dev8"
-+pvcreate -y --setphysicalvolumesize 8M "$dev8"
-+
-+PVID8=`pvs $dev8 --noheading -o uuid | tr -d - | awk '{print $1}'`
-+echo $PVID8
-+
-+vgcreate $vg3 "$dev8"
-+lvcreate -l1 -n $lv1 $vg3
-+check lv_field $vg3/$lv1 lv_active "active"
-+vgchange -an $vg3
-+check lv_field $vg3/$lv1 lv_active ""
-+
-+_clear_online_files
-+
-+pvscan --cache -aay "$dev8"
-+check lv_field $vg3/$lv1 lv_active "active"
-+ls "$RUNDIR/lvm/pvs_online/$PVID8"
-+ls "$RUNDIR/lvm/vgs_online/$vg3"
-+vgchange -an $vg3
-+
-+vgremove -ff $vg3
-+
diff --git a/SOURCES/lvm2-2_03_06-tests-replaces-grep-q-usage.patch b/SOURCES/lvm2-2_03_06-tests-replaces-grep-q-usage.patch
deleted file mode 100644
index bcb090f..0000000
--- a/SOURCES/lvm2-2_03_06-tests-replaces-grep-q-usage.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- test/lib/aux.sh | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/test/lib/aux.sh b/test/lib/aux.sh
-index e3f624c..81e8f91 100644
---- a/test/lib/aux.sh
-+++ b/test/lib/aux.sh
-@@ -26,7 +26,7 @@ expect_failure() {
- check_daemon_in_builddir() {
- 	# skip if we don't have our own deamon...
- 	if test -z "${installed_testsuite+varset}"; then
--		(which "$1" 2>/dev/null | grep -q "$abs_builddir") || skip "$1 is not in executed path."
-+		(which "$1" 2>/dev/null | grep "$abs_builddir" >/dev/null ) || skip "$1 is not in executed path."
- 	fi
- 	rm -f debug.log strace.log
- }
-@@ -167,7 +167,7 @@ prepare_clvmd() {
- 
- 	test -e "$DM_DEV_DIR/control" || dmsetup table >/dev/null # create control node
- 	# skip if singlenode is not compiled in
--	(clvmd --help 2>&1 | grep "Available cluster managers" | grep -q "singlenode") || \
-+	(clvmd --help 2>&1 | grep "Available cluster managers" | grep "singlenode" >/dev/null) || \
- 		skip "Compiled clvmd does not support singlenode for testing."
- 
- #	lvmconf "activation/monitoring = 1"
-@@ -531,7 +531,7 @@ teardown() {
- 	dm_table | not grep -E -q "$vg|$vg1|$vg2|$vg3|$vg4" || {
- 		# Avoid activation of dmeventd if there is no pid
- 		cfg=$(test -s LOCAL_DMEVENTD || echo "--config activation{monitoring=0}")
--		if dm_info suspended,name | grep -q "^Suspended:.*$PREFIX" ; then
-+		if dm_info suspended,name | grep "^Suspended:.*$PREFIX" >/dev/null ; then
- 			echo "## skipping vgremove, suspended devices detected."
- 		else
- 			vgremove -ff "$cfg"  \
-@@ -662,7 +662,7 @@ prepare_scsi_debug_dev() {
- 
- 	# Skip test if scsi_debug module is unavailable or is already in use
- 	modprobe --dry-run scsi_debug || skip
--	lsmod | not grep -q scsi_debug || skip
-+	lsmod | not grep scsi_debug >/dev/null || skip
- 
- 	# Create the scsi_debug device and determine the new scsi device's name
- 	# NOTE: it will _never_ make sense to pass num_tgts param;
-@@ -1447,7 +1447,7 @@ driver_at_least() {
- }
- 
- have_thin() {
--	lvm segtypes 2>/dev/null | grep -q thin$ || {
-+	lvm segtypes 2>/dev/null | grep thin$ >/dev/null || {
- 		echo "Thin is not built-in." >&2
- 		return 1
- 	}
-@@ -1471,7 +1471,7 @@ have_thin() {
- }
- 
- have_vdo() {
--	lvm segtypes 2>/dev/null | grep -q vdo$ || {
-+	lvm segtypes 2>/dev/null | grep vdo$ >/dev/null || {
- 		echo "VDO is not built-in." >&2
- 		return 1
- 	}
-@@ -1507,7 +1507,7 @@ have_raid4 () {
- }
- 
- have_cache() {
--	lvm segtypes 2>/dev/null | grep -q cache$ || {
-+	lvm segtypes 2>/dev/null | grep cache$ >/dev/null || {
- 		echo "Cache is not built-in." >&2
- 		return 1
- 	}
diff --git a/SOURCES/lvm2-2_03_06-tests-simplify-some-var-settings.patch b/SOURCES/lvm2-2_03_06-tests-simplify-some-var-settings.patch
deleted file mode 100644
index 5a1e36e..0000000
--- a/SOURCES/lvm2-2_03_06-tests-simplify-some-var-settings.patch
+++ /dev/null
@@ -1,192 +0,0 @@
- test/lib/aux.sh                       | 2 +-
- test/shell/discards-thin.sh           | 2 --
- test/shell/lvconvert-thin.sh          | 2 --
- test/shell/lvcreate-large-raid10.sh   | 1 -
- test/shell/lvcreate-large.sh          | 2 --
- test/shell/pvcreate-operation-md.sh   | 3 +--
- test/shell/pvcreate-restore.sh        | 2 --
- test/shell/pvremove-thin.sh           | 2 --
- test/shell/scan-lvs.sh                | 4 +---
- test/shell/snapshot-remove-dmsetup.sh | 2 --
- test/shell/snapshot-usage-exa.sh      | 2 --
- test/shell/snapshot-usage.sh          | 2 --
- test/shell/vgsplit-stacked.sh         | 2 --
- 13 files changed, 3 insertions(+), 25 deletions(-)
-
-diff --git a/test/lib/aux.sh b/test/lib/aux.sh
-index 81e8f91..32d5a0b 100644
---- a/test/lib/aux.sh
-+++ b/test/lib/aux.sh
-@@ -1164,7 +1164,7 @@ devices/default_data_alignment = 1
- devices/dir = "$DM_DEV_DIR"
- devices/filter = "a|.*|"
- devices/global_filter = [ "a|$DM_DEV_DIR/mapper/${PREFIX}.*pv[0-9_]*$|", "r|.*|" ]
--devices/md_component_detection  = 0
-+devices/md_component_detection = 0
- devices/scan = "$DM_DEV_DIR"
- devices/sysfs_scan = 1
- devices/write_cache_state = 0
-diff --git a/test/shell/discards-thin.sh b/test/shell/discards-thin.sh
-index 3564a87..f27d4c3 100644
---- a/test/shell/discards-thin.sh
-+++ b/test/shell/discards-thin.sh
-@@ -25,8 +25,6 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
- #
- aux have_thin 1 1 0 || skip
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux prepare_vg 2 64
- get_devs
- 
-diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
-index 731c45b..1f8d2ed 100644
---- a/test/shell/lvconvert-thin.sh
-+++ b/test/shell/lvconvert-thin.sh
-@@ -17,8 +17,6 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- prepare_lvs() {
- 	lvremove -f $vg
- 	lvcreate -L10M -n $lv1 $vg
-diff --git a/test/shell/lvcreate-large-raid10.sh b/test/shell/lvcreate-large-raid10.sh
-index 1ad09aa..a46be37 100644
---- a/test/shell/lvcreate-large-raid10.sh
-+++ b/test/shell/lvcreate-large-raid10.sh
-@@ -20,7 +20,6 @@ SKIP_WITH_LVMPOLLD=1
- # FIXME  update test to make something useful on <16T
- aux can_use_16T || skip
- aux have_raid 1 3 0 || skip
--aux lvmconf 'devices/scan_lvs = 1'
- 
- aux prepare_vg 5
- 
-diff --git a/test/shell/lvcreate-large.sh b/test/shell/lvcreate-large.sh
-index b1cb0b0..473b0ed 100644
---- a/test/shell/lvcreate-large.sh
-+++ b/test/shell/lvcreate-large.sh
-@@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- # FIXME  update test to make something useful on <16T
- aux can_use_16T || skip
- 
-diff --git a/test/shell/pvcreate-operation-md.sh b/test/shell/pvcreate-operation-md.sh
-index 11f0887..4b51932 100644
---- a/test/shell/pvcreate-operation-md.sh
-+++ b/test/shell/pvcreate-operation-md.sh
-@@ -22,8 +22,7 @@ test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
- 	modprobe raid0 || skip
- 
- aux lvmconf 'devices/md_component_detection = 1'
--aux extend_filter_LVMTEST
--aux extend_filter "a|/dev/md.*|"
-+aux extend_filter_LVMTEST "a|/dev/md|"
- 
- aux prepare_devs 2
- 
-diff --git a/test/shell/pvcreate-restore.sh b/test/shell/pvcreate-restore.sh
-index 789f45c..d0b46eb 100644
---- a/test/shell/pvcreate-restore.sh
-+++ b/test/shell/pvcreate-restore.sh
-@@ -15,8 +15,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux prepare_vg 4
- 
- lvcreate --type snapshot -s -L10 -n $lv1 $vg --virtualsize 2T
-diff --git a/test/shell/pvremove-thin.sh b/test/shell/pvremove-thin.sh
-index 84a2a55..9859b6c 100644
---- a/test/shell/pvremove-thin.sh
-+++ b/test/shell/pvremove-thin.sh
-@@ -18,8 +18,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux prepare_vg
- 
- aux have_thin 1 8 0 || skip
-diff --git a/test/shell/scan-lvs.sh b/test/shell/scan-lvs.sh
-index 8e8a77d..f49bf4d 100644
---- a/test/shell/scan-lvs.sh
-+++ b/test/shell/scan-lvs.sh
-@@ -15,10 +15,9 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
-+# Sets 'scan_lvs = 1'
- aux extend_filter_LVMTEST
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux prepare_pvs 1
- 
- vgcreate $SHARED $vg1 "$dev1"
-@@ -44,4 +43,3 @@ lvchange -an "$vg1/$lv1"
- lvremove "$vg1/$lv1"
- 
- vgremove $vg1
--
-diff --git a/test/shell/snapshot-remove-dmsetup.sh b/test/shell/snapshot-remove-dmsetup.sh
-index 916aec9..19411ce 100644
---- a/test/shell/snapshot-remove-dmsetup.sh
-+++ b/test/shell/snapshot-remove-dmsetup.sh
-@@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- which mkfs.ext2 || skip
- 
- aux prepare_vg 5
-diff --git a/test/shell/snapshot-usage-exa.sh b/test/shell/snapshot-usage-exa.sh
-index f537f0d..5d666bf 100644
---- a/test/shell/snapshot-usage-exa.sh
-+++ b/test/shell/snapshot-usage-exa.sh
-@@ -18,8 +18,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux can_use_16T || skip
- 
- aux prepare_pvs 1
-diff --git a/test/shell/snapshot-usage.sh b/test/shell/snapshot-usage.sh
-index 5cfdae6..bcfa16a 100644
---- a/test/shell/snapshot-usage.sh
-+++ b/test/shell/snapshot-usage.sh
-@@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- MKFS=mkfs.ext2
- which $MKFS || skip
- 
-diff --git a/test/shell/vgsplit-stacked.sh b/test/shell/vgsplit-stacked.sh
-index 09af3f7..331ee8e 100644
---- a/test/shell/vgsplit-stacked.sh
-+++ b/test/shell/vgsplit-stacked.sh
-@@ -15,8 +15,6 @@ SKIP_WITH_LVMPOLLD=1
- 
- . lib/inittest
- 
--aux lvmconf 'devices/scan_lvs = 1'
--
- aux extend_filter_LVMTEST
- aux prepare_pvs 3
- 
diff --git a/SOURCES/lvm2-2_03_06-udev-do-not-overwrite-ID_MODEL-in-69-dm-lvm-metad.ru.patch b/SOURCES/lvm2-2_03_06-udev-do-not-overwrite-ID_MODEL-in-69-dm-lvm-metad.ru.patch
deleted file mode 100644
index 3e9cfbf..0000000
--- a/SOURCES/lvm2-2_03_06-udev-do-not-overwrite-ID_MODEL-in-69-dm-lvm-metad.ru.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- udev/69-dm-lvm-metad.rules.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/udev/69-dm-lvm-metad.rules.in b/udev/69-dm-lvm-metad.rules.in
-index 2ff8ddc..d510064 100644
---- a/udev/69-dm-lvm-metad.rules.in
-+++ b/udev/69-dm-lvm-metad.rules.in
-@@ -110,7 +110,6 @@ LABEL="systemd_background"
- #  other |    X     |      X      |       X        |                   |   X
- ACTION!="remove", ENV{LVM_PV_GONE}=="1", RUN+="(BINDIR)/systemd-run (LVM_EXEC)/lvm pvscan --cache $major:$minor", GOTO="lvm_end"
- ENV{SYSTEMD_ALIAS}="/dev/block/$major:$minor"
--ENV{ID_MODEL}="LVM PV $env{ID_FS_UUID_ENC} on /dev/$name"
- ENV{SYSTEMD_WANTS}+="lvm2-pvscan@$major:$minor.service"
- GOTO="lvm_end"
- 
diff --git a/SOURCES/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/SOURCES/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch
deleted file mode 100644
index dcab367..0000000
--- a/SOURCES/lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- WHATS_NEW               | 1 +
- udev/11-dm-lvm.rules.in | 2 --
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/WHATS_NEW b/WHATS_NEW
-index a7ccd39..63c3c27 100644
---- a/WHATS_NEW
-+++ b/WHATS_NEW
-@@ -1,5 +1,6 @@
- Version 2.03.06 - 
- ================================
-+  Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules.
-   Prevent creating VGs with PVs with different logical block sizes.
-   Fix metadata writes from corrupting with large physical block size.
- 
-diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in
-index 91cb991..7c58994 100644
---- a/udev/11-dm-lvm.rules.in
-+++ b/udev/11-dm-lvm.rules.in
-@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE
- 
- ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
- 
--OPTIONS+="event_timeout=180"
--
- # Do not create symlinks for inappropriate subdevices.
- ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable"
- ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"
diff --git a/SOURCES/lvm2-2_03_06-vgchange-don-t-fail-monitor-command-if-vg-is-exporte.patch b/SOURCES/lvm2-2_03_06-vgchange-don-t-fail-monitor-command-if-vg-is-exporte.patch
deleted file mode 100644
index f65f0dd..0000000
--- a/SOURCES/lvm2-2_03_06-vgchange-don-t-fail-monitor-command-if-vg-is-exporte.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tools/vgchange.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/vgchange.c b/tools/vgchange.c
-index d6d4f91..a17f456 100644
---- a/tools/vgchange.c
-+++ b/tools/vgchange.c
-@@ -631,6 +631,8 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
- 	};
- 
- 	if (vg_is_exported(vg)) {
-+		if (cmd->command->command_enum == vgchange_monitor_CMD)
-+			return ECMD_PROCESSED;
- 		log_error("Volume group \"%s\" is exported", vg_name);
- 		return ECMD_FAILED;
- 	}
diff --git a/SOURCES/lvm2-2_03_06-vgcreate-vgextend-restrict-PVs-with-mixed-block-size.patch b/SOURCES/lvm2-2_03_06-vgcreate-vgextend-restrict-PVs-with-mixed-block-size.patch
deleted file mode 100644
index 106c2e5..0000000
--- a/SOURCES/lvm2-2_03_06-vgcreate-vgextend-restrict-PVs-with-mixed-block-size.patch
+++ /dev/null
@@ -1,208 +0,0 @@
- lib/commands/toolcontext.h       |  1 +
- lib/config/config_settings.h     |  5 +++++
- lib/metadata/metadata-exported.h |  1 +
- lib/metadata/metadata.c          | 44 +++++++++++++++++++++++++++++++++++++
- tools/lvmcmdline.c               |  2 ++
- tools/toollib.c                  | 47 ++++++++++++++++++++++++++++++++++++++++
- tools/vgcreate.c                 |  2 ++
- 7 files changed, 102 insertions(+)
-
-diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
-index 488752c..655d9f2 100644
---- a/lib/commands/toolcontext.h
-+++ b/lib/commands/toolcontext.h
-@@ -153,6 +153,7 @@ struct cmd_context {
- 	unsigned include_shared_vgs:1;		/* report/display cmds can reveal lockd VGs */
- 	unsigned include_active_foreign_vgs:1;	/* cmd should process foreign VGs with active LVs */
- 	unsigned vg_read_print_access_error:1;	/* print access errors from vg_read */
-+	unsigned allow_mixed_block_sizes:1;
- 	unsigned force_access_clustered:1;
- 	unsigned lockd_gl_disable:1;
- 	unsigned lockd_vg_disable:1;
-diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index f14f0b8..25650e3 100644
---- a/lib/config/config_settings.h
-+++ b/lib/config/config_settings.h
-@@ -502,6 +502,11 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_
- 	"Enabling this setting allows the VG to be used as usual even with\n"
- 	"uncertain devices.\n")
- 
-+cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 6), NULL, 0, NULL,
-+	"Allow PVs in the same VG with different logical block sizes.\n"
-+	"When allowed, the user is responsible to ensure that an LV is\n"
-+	"using PVs with matching block sizes when necessary.\n")
-+
- cfg_array(allocation_cling_tag_list_CFG, "cling_tag_list", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 77), NULL, 0, NULL,
- 	"Advise LVM which PVs to use when searching for new space.\n"
- 	"When searching for free space to extend an LV, the 'cling' allocation\n"
-diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
-index 77b971b..539845c 100644
---- a/lib/metadata/metadata-exported.h
-+++ b/lib/metadata/metadata-exported.h
-@@ -622,6 +622,7 @@ struct pvcreate_params {
- 	unsigned is_remove : 1;         /* is removing PVs, not creating */
- 	unsigned preserve_existing : 1;
- 	unsigned check_failed : 1;
-+	unsigned check_consistent_block_size : 1;
- };
- 
- struct lvresize_params {
-diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
-index f7eeb52..55ae46d 100644
---- a/lib/metadata/metadata.c
-+++ b/lib/metadata/metadata.c
-@@ -751,12 +751,40 @@ int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp)
- {
- 	struct pv_list *pvl;
- 	unsigned int max_phys_block_size = 0;
-+	unsigned int physical_block_size, logical_block_size;
-+	unsigned int prev_lbs = 0;
-+	int inconsistent_existing_lbs = 0;
- 
- 	log_debug_metadata("Adding PVs to VG %s.", vg->name);
- 
- 	if (vg_bad_status_bits(vg, RESIZEABLE_VG))
- 		return_0;
- 
-+	/*
-+	 * Check if existing PVs have inconsistent block sizes.
-+	 * If so, do not enforce new devices to be consistent.
-+	 */
-+	dm_list_iterate_items(pvl, &vg->pvs) {
-+		logical_block_size = 0;
-+		physical_block_size = 0;
-+
-+		if (!dev_get_direct_block_sizes(pvl->pv->dev, &physical_block_size, &logical_block_size))
-+			continue;
-+
-+		if (!logical_block_size)
-+			continue;
-+
-+		if (!prev_lbs) {
-+			prev_lbs = logical_block_size;
-+			continue;
-+		}
-+		
-+		if (prev_lbs != logical_block_size) {
-+			inconsistent_existing_lbs = 1;
-+			break;
-+		}
-+	}
-+
- 	dm_list_iterate_items(pvl, &pp->pvs) {
- 		log_debug_metadata("Adding PV %s to VG %s.", pv_dev_name(pvl->pv), vg->name);
- 
-@@ -767,6 +795,22 @@ int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp)
- 			return 0;
- 		}
- 
-+		logical_block_size = 0;
-+		physical_block_size = 0;
-+
-+		if (!dev_get_direct_block_sizes(pvl->pv->dev, &physical_block_size, &logical_block_size))
-+			log_warn("WARNING: PV %s has unknown block size.", pv_dev_name(pvl->pv));
-+
-+		else if (prev_lbs && logical_block_size && (logical_block_size != prev_lbs)) {
-+			if (vg->cmd->allow_mixed_block_sizes || inconsistent_existing_lbs)
-+				log_debug("Devices have inconsistent block sizes (%u and %u)", prev_lbs, logical_block_size);
-+			else {
-+				log_error("Devices have inconsistent logical block sizes (%u and %u).",
-+					  prev_lbs, logical_block_size);
-+				return 0;
-+			}
-+		}
-+
- 		if (!add_pv_to_vg(vg, pv_dev_name(pvl->pv), pvl->pv, 0)) {
- 			log_error("PV %s cannot be added to VG %s.",
- 				  pv_dev_name(pvl->pv), vg->name);
-diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 30f9d81..7d29b6f 100644
---- a/tools/lvmcmdline.c
-+++ b/tools/lvmcmdline.c
-@@ -2319,6 +2319,8 @@ static int _get_current_settings(struct cmd_context *cmd)
- 
- 	cmd->scan_lvs = find_config_tree_bool(cmd, devices_scan_lvs_CFG, NULL);
- 
-+	cmd->allow_mixed_block_sizes = find_config_tree_bool(cmd, devices_allow_mixed_block_sizes_CFG, NULL);
-+
- 	/*
- 	 * enable_hints is set to 1 if any commands are using hints.
- 	 * use_hints is set to 1 if this command doesn't use the hints.
-diff --git a/tools/toollib.c b/tools/toollib.c
-index b2313f8..155528c 100644
---- a/tools/toollib.c
-+++ b/tools/toollib.c
-@@ -5355,6 +5355,8 @@ int pvcreate_each_device(struct cmd_context *cmd,
- 	struct pv_list *vgpvl;
- 	struct device_list *devl;
- 	const char *pv_name;
-+	unsigned int physical_block_size, logical_block_size;
-+	unsigned int prev_pbs = 0, prev_lbs = 0;
- 	int must_use_all = (cmd->cname->flags & MUST_USE_ALL_ARGS);
- 	int found;
- 	unsigned i;
-@@ -5395,6 +5397,51 @@ int pvcreate_each_device(struct cmd_context *cmd,
- 		pd->dev = dev_cache_get(cmd, pd->name, cmd->filter);
- 
- 	/*
-+	 * Check for consistent block sizes.
-+	 */
-+	if (pp->check_consistent_block_size) {
-+		dm_list_iterate_items(pd, &pp->arg_devices) {
-+			if (!pd->dev)
-+				continue;
-+
-+			logical_block_size = 0;
-+			physical_block_size = 0;
-+
-+			if (!dev_get_direct_block_sizes(pd->dev, &physical_block_size, &logical_block_size)) {
-+				log_warn("WARNING: Unknown block size for device %s.", dev_name(pd->dev));
-+				continue;
-+			}
-+
-+			if (!logical_block_size) {
-+				log_warn("WARNING: Unknown logical_block_size for device %s.", dev_name(pd->dev));
-+				continue;
-+			}
-+
-+			if (!prev_lbs) {
-+				prev_lbs = logical_block_size;
-+				prev_pbs = physical_block_size;
-+				continue;
-+			}
-+
-+			if (prev_lbs == logical_block_size) {
-+				/* Require lbs to match, just warn about unmatching pbs. */
-+				if (!cmd->allow_mixed_block_sizes && prev_pbs && physical_block_size &&
-+				    (prev_pbs != physical_block_size))
-+					log_warn("WARNING: Devices have inconsistent physical block sizes (%u and %u).",
-+						  prev_pbs, physical_block_size);
-+				continue;
-+			}
-+
-+			if (!cmd->allow_mixed_block_sizes) {
-+				log_error("Devices have inconsistent logical block sizes (%u and %u).",
-+					  prev_lbs, logical_block_size);
-+				log_print("See lvm.conf allow_mixed_block_sizes.");
-+				return 0;
-+			}
-+		}
-+	}
-+
-+	/*
- 	 * Use process_each_pv to search all existing PVs and devices.
- 	 *
- 	 * This is a slightly different way to use process_each_pv, because the
-diff --git a/tools/vgcreate.c b/tools/vgcreate.c
-index d594ec1..09b6a6c 100644
---- a/tools/vgcreate.c
-+++ b/tools/vgcreate.c
-@@ -47,6 +47,8 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
- 	/* Don't create a new PV on top of an existing PV like pvcreate does. */
- 	pp.preserve_existing = 1;
- 
-+	pp.check_consistent_block_size = 1;
-+
- 	if (!vgcreate_params_set_defaults(cmd, &vp_def, NULL))
- 		return EINVALID_CMD_LINE;
- 	vp_def.vg_name = vg_name;
diff --git a/SOURCES/lvm2-2_03_09-cachevol-stop-dm-errors-with-uncaching-cache-with-ca.patch b/SOURCES/lvm2-2_03_09-cachevol-stop-dm-errors-with-uncaching-cache-with-ca.patch
new file mode 100644
index 0000000..8b53214
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-cachevol-stop-dm-errors-with-uncaching-cache-with-ca.patch
@@ -0,0 +1,70 @@
+ WHATS_NEW                  |  4 ++++
+ lib/activate/dev_manager.c | 14 +++++++-------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/WHATS_NEW b/WHATS_NEW
+index 50a0045..30f1391 100644
+--- a/WHATS_NEW
++++ b/WHATS_NEW
+@@ -1,3 +1,7 @@
++Version 2.03.09 - 
++====================================
++  Fix showing of a dm kernel error when uncaching a volume with cachevol.
++
+ Version 2.03.08 - 11th February 2020
+ ====================================
+   Prevent problematic snapshots of writecache volumes.
+diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
+index 8569e86..c8a22fb 100644
+--- a/lib/activate/dev_manager.c
++++ b/lib/activate/dev_manager.c
+@@ -3161,8 +3161,8 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
+ 		char *dlid_meta;
+ 		char *dlid_data;
+ 		char *dlid_pool;
+-		uint64_t meta_len = first_seg(lv)->metadata_len;
+-		uint64_t data_len = first_seg(lv)->data_len;
++		uint64_t meta_size = first_seg(lv)->metadata_len;
++		uint64_t data_size = first_seg(lv)->data_len;
+ 		uint16_t udev_flags = _get_udev_flags(dm, lv, layer,
+ 					     laopts->noscan, laopts->temporary,
+ 					     0);
+@@ -3210,12 +3210,12 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
+ 
+ 		if (dm->track_pending_delete) {
+ 			log_debug_activation("Using error for pending meta delete %s.", display_lvname(lv));
+-			if (!dm_tree_node_add_error_target(dnode_meta, (uint64_t)lv->vg->extent_size * meta_len))
++			if (!dm_tree_node_add_error_target(dnode_meta, meta_size))
+ 				return_0;
+ 		} else {
+ 			/* add load_segment to meta dnode: linear, size of meta area */
+ 			if (!add_linear_area_to_dtree(dnode_meta,
+-						      meta_len,
++						      meta_size,
+ 						      lv->vg->extent_size,
+ 						      lv->vg->cmd->use_linear_target,
+ 						      lv->vg->name, lv->name))
+@@ -3239,19 +3239,19 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
+ 
+ 		if (dm->track_pending_delete) {
+ 			log_debug_activation("Using error for pending data delete %s.", display_lvname(lv));
+-			if (!dm_tree_node_add_error_target(dnode_data, (uint64_t)lv->vg->extent_size * data_len))
++			if (!dm_tree_node_add_error_target(dnode_data, data_size))
+ 				return_0;
+ 		} else {
+ 			/* add load_segment to data dnode: linear, size of data area */
+ 			if (!add_linear_area_to_dtree(dnode_data,
+-						      data_len,
++						      data_size,
+ 						      lv->vg->extent_size,
+ 						      lv->vg->cmd->use_linear_target,
+ 						      lv->vg->name, lv->name))
+ 				return_0;
+ 
+ 			/* add seg_area to prev load_seg: offset 0 maps to cachepool lv after meta */
+-			if (!dm_tree_node_add_target_area(dnode_data, NULL, dlid_pool, meta_len))
++			if (!dm_tree_node_add_target_area(dnode_data, NULL, dlid_pool, meta_size))
+ 				return_0;
+ 		}
+ 	}
+
diff --git a/SOURCES/lvm2-2_03_09-test-Can-not-attach-writecache-to-active-volume.patch b/SOURCES/lvm2-2_03_09-test-Can-not-attach-writecache-to-active-volume.patch
new file mode 100644
index 0000000..d579eb0
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-test-Can-not-attach-writecache-to-active-volume.patch
@@ -0,0 +1,36 @@
+From 54d0cb47848f2abfcbe106dc65250f612c7b1455 Mon Sep 17 00:00:00 2001
+From: Marian Csontos <mcsontos@redhat.com>
+Date: Wed, 18 Mar 2020 14:30:09 +0100
+Subject: [PATCH] test: Can not attach writecache to active volume
+
+---
+ test/shell/writecache.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/shell/writecache.sh b/test/shell/writecache.sh
+index 0a7f694..a7a2d95 100644
+--- a/test/shell/writecache.sh
++++ b/test/shell/writecache.sh
+@@ -139,8 +139,10 @@ mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+ cp pattern1 $mount_dir/pattern1
+ ls -l $mount_dir
+ 
+-lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
++# TODO BZ 1808012 - can not convert active volume to writecache:
++not lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
+ 
++if false; then
+ check lv_field $vg/$lv1 segtype writecache
+ 
+ lvs -a $vg/${lv2}_cvol --noheadings -o segtype >out
+@@ -162,6 +164,7 @@ diff pattern1 $mount_dir/pattern1.after
+ umount $mount_dir
+ lvchange -an $vg/$lv1
+ lvremove $vg/$lv1
++fi
+ 
+ vgremove -ff $vg
+ 
+-- 
+1.8.3.1
+
diff --git a/SOURCES/lvm2-2_03_09-thin-don-t-use-writecache-for-poolmetadata.patch b/SOURCES/lvm2-2_03_09-thin-don-t-use-writecache-for-poolmetadata.patch
new file mode 100644
index 0000000..071c852
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-thin-don-t-use-writecache-for-poolmetadata.patch
@@ -0,0 +1,18 @@
+ tools/lvconvert.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/lvconvert.c b/tools/lvconvert.c
+index aa2dca7..757b323 100644
+--- a/tools/lvconvert.c
++++ b/tools/lvconvert.c
+@@ -3104,8 +3104,9 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
+ 			return 0;
+ 		}
+ 
+-		/* FIXME Tidy up all these type restrictions. */
++		/* FIXME Tidy up all these type restrictions. (Use a type whitelist?) */
+ 		if (lv_is_cache_type(metadata_lv) ||
++		    lv_is_writecache(metadata_lv) ||
+ 		    lv_is_thin_type(metadata_lv) ||
+ 		    lv_is_cow(metadata_lv) || lv_is_merging_cow(metadata_lv) ||
+ 		    lv_is_origin(metadata_lv) || lv_is_merging_origin(metadata_lv) ||
diff --git a/SOURCES/lvm2-2_03_09-writecache-allow-removing-wcorig-lv.patch b/SOURCES/lvm2-2_03_09-writecache-allow-removing-wcorig-lv.patch
new file mode 100644
index 0000000..d76f358
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-allow-removing-wcorig-lv.patch
@@ -0,0 +1,16 @@
+ lib/metadata/lv_manip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
+index 3604a63..3090a93 100644
+--- a/lib/metadata/lv_manip.c
++++ b/lib/metadata/lv_manip.c
+@@ -6638,7 +6638,7 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
+ 		return 0;
+ 	}
+ 
+-	if (lv_is_cache_origin(lv)) {
++	if (lv_is_cache_origin(lv) || lv_is_writecache_origin(lv)) {
+ 		if (!_lv_remove_segs_using_this_lv(cmd, lv, force, level, "cache origin"))
+ 			return_0;
+ 		/* Removal of cache LV also removes caching origin */
diff --git a/SOURCES/lvm2-2_03_09-writecache-check-if-cachevol-is-writable.patch b/SOURCES/lvm2-2_03_09-writecache-check-if-cachevol-is-writable.patch
new file mode 100644
index 0000000..0a04eff
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-check-if-cachevol-is-writable.patch
@@ -0,0 +1,19 @@
+ tools/lvconvert.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/lvconvert.c b/tools/lvconvert.c
+index cd9a3e8..aa2dca7 100644
+--- a/tools/lvconvert.c
++++ b/tools/lvconvert.c
+@@ -5351,6 +5351,11 @@ static int _writecache_zero(struct cmd_context *cmd, struct logical_volume *lv)
+ 	};
+ 	int ret;
+ 
++	if (!(lv->status & LVM_WRITE)) {
++		log_error("Cannot initialize readonly LV %s", display_lvname(lv));
++		return 0;
++	}
++
+ 	if (test_mode())
+ 		return 1;
+ 
diff --git a/SOURCES/lvm2-2_03_09-writecache-drop-real-dm-suffix.patch b/SOURCES/lvm2-2_03_09-writecache-drop-real-dm-suffix.patch
new file mode 100644
index 0000000..f5dde8b
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-drop-real-dm-suffix.patch
@@ -0,0 +1,76 @@
+ lib/misc/lvm-string.c       |  1 -
+ lib/writecache/writecache.c |  2 +-
+ test/shell/writecache.sh    | 36 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
+index 0ee3403..d8b27cb 100644
+--- a/lib/misc/lvm-string.c
++++ b/lib/misc/lvm-string.c
+@@ -251,7 +251,6 @@ char *build_dm_uuid(struct dm_pool *mem, const struct logical_volume *lv,
+ 		 */
+ 		/* Suffixes used here MUST match lib/activate/dev_manager.c */
+ 		layer = lv_is_cache_origin(lv) ? "real" :
+-			lv_is_writecache_origin(lv) ? "real" :
+ 			(lv_is_cache(lv) && lv_is_pending_delete(lv)) ? "real" :
+ 			lv_is_cache_pool_data(lv) ? "cdata" :
+ 			lv_is_cache_pool_metadata(lv) ? "cmeta" :
+diff --git a/lib/writecache/writecache.c b/lib/writecache/writecache.c
+index 130922a..08a306e 100644
+--- a/lib/writecache/writecache.c
++++ b/lib/writecache/writecache.c
+@@ -260,7 +260,7 @@ static int _writecache_add_target_line(struct dev_manager *dm,
+ 	if ((pmem = lv_on_pmem(seg->writecache)) < 0)
+ 		return_0;
+ 
+-	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), "real")))
++	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), NULL)))
+ 		return_0;
+ 
+ 	if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, "cvol")))
+diff --git a/test/shell/writecache.sh b/test/shell/writecache.sh
+index 6cd4665..0a7f694 100644
+--- a/test/shell/writecache.sh
++++ b/test/shell/writecache.sh
+@@ -127,5 +127,41 @@ umount $mount_dir
+ lvchange -an $vg/$lv1
+ lvchange -an $vg/$lv2
+ 
++
++# test3: attach writecache to an active LV
++
++lvchange -ay $vg/$lv1
++
++mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
++
++mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
++
++cp pattern1 $mount_dir/pattern1
++ls -l $mount_dir
++
++lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
++
++check lv_field $vg/$lv1 segtype writecache
++
++lvs -a $vg/${lv2}_cvol --noheadings -o segtype >out
++grep linear out
++
++cp pattern1 $mount_dir/pattern1.after
++
++diff pattern1 $mount_dir/pattern1
++diff pattern1 $mount_dir/pattern1.after
++
++umount $mount_dir
++lvchange -an $vg/$lv1
++lvchange -ay $vg/$lv1
++mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
++
++diff pattern1 $mount_dir/pattern1
++diff pattern1 $mount_dir/pattern1.after
++
++umount $mount_dir
++lvchange -an $vg/$lv1
++lvremove $vg/$lv1
++
+ vgremove -ff $vg
+ 
diff --git a/SOURCES/lvm2-2_03_09-writecache-fix-watermark-error-message.patch b/SOURCES/lvm2-2_03_09-writecache-fix-watermark-error-message.patch
new file mode 100644
index 0000000..bc3d1b6
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-fix-watermark-error-message.patch
@@ -0,0 +1,16 @@
+ tools/lvconvert.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lvconvert.c b/tools/lvconvert.c
+index 0ddeb35..4ebda4c 100644
+--- a/tools/lvconvert.c
++++ b/tools/lvconvert.c
+@@ -5515,7 +5515,7 @@ static int _get_writecache_settings(struct cmd_context *cmd, struct writecache_s
+ 
+ 	if (settings->high_watermark_set && settings->low_watermark_set &&
+ 	    (settings->high_watermark <= settings->low_watermark)) {
+-		log_error("High watermark must be greater than or equal to low watermark.");
++		log_error("High watermark must be greater than low watermark.");
+ 		return 0;
+ 	}
+ 
diff --git a/SOURCES/lvm2-2_03_09-writecache-require-inactive-LV-to-attach.patch b/SOURCES/lvm2-2_03_09-writecache-require-inactive-LV-to-attach.patch
new file mode 100644
index 0000000..8a93ba5
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-require-inactive-LV-to-attach.patch
@@ -0,0 +1,40 @@
+ tools/lvconvert.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/tools/lvconvert.c b/tools/lvconvert.c
+index 4ebda4c..bfaf4c0 100644
+--- a/tools/lvconvert.c
++++ b/tools/lvconvert.c
+@@ -5599,6 +5599,16 @@ static int _lvconvert_writecache_attach_single(struct cmd_context *cmd,
+ 		goto bad;
+ 	}
+ 
++	/*
++	 * To permit this we need to check the block size of the fs using lv
++	 * (recently in libblkid) so that we can use a matching writecache
++	 * block size.  We also want to do that if the lv is inactive.
++	 */
++	if (lv_is_active(lv)) {
++		log_error("LV %s must be inactive to attach writecache.", display_lvname(lv));
++		goto bad;
++	}
++
+ 	/* fast LV shouldn't generally be active by itself, but just in case. */
+ 	if (lv_info(cmd, lv_fast, 1, NULL, 0, 0)) {
+ 		log_error("LV %s must be inactive to attach.", display_lvname(lv_fast));
+@@ -5639,15 +5649,6 @@ static int _lvconvert_writecache_attach_single(struct cmd_context *cmd,
+ 		memcpy(&lockd_fast_id, &lv_fast->lvid.id[1], sizeof(struct id));
+ 	}
+ 
+-	/*
+-	 * TODO: use libblkid to get the sector size of lv.  If it doesn't
+-	 * match the block_size we are using for the writecache, then warn that
+-	 * an existing file system on lv may become unmountable with the
+-	 * writecache attached because of the changing sector size.  If this
+-	 * happens, then use --splitcache, and reattach the writecache using a
+-	 * writecache block_size value matching the sector size of lv.
+-	 */
+-
+ 	if (!_writecache_zero(cmd, lv_fast)) {
+ 		log_error("LV %s could not be zeroed.", display_lvname(lv_fast));
+ 		return ECMD_FAILED;
diff --git a/SOURCES/lvm2-2_03_09-writecache-working-real-dm-uuid-suffix-for-wcorig-lv.patch b/SOURCES/lvm2-2_03_09-writecache-working-real-dm-uuid-suffix-for-wcorig-lv.patch
new file mode 100644
index 0000000..2df3470
--- /dev/null
+++ b/SOURCES/lvm2-2_03_09-writecache-working-real-dm-uuid-suffix-for-wcorig-lv.patch
@@ -0,0 +1,102 @@
+ lib/activate/dev_manager.c      |  4 ++++
+ lib/metadata/lv.c               |  2 +-
+ lib/metadata/writecache_manip.c | 16 ++++++++--------
+ lib/misc/lvm-string.c           |  1 +
+ lib/writecache/writecache.c     |  2 +-
+ tools/lvconvert.c               |  2 ++
+ 6 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
+index c8a22fb..3b99131 100644
+--- a/lib/activate/dev_manager.c
++++ b/lib/activate/dev_manager.c
+@@ -3316,6 +3316,10 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
+ 	if (!layer && lv_is_new_thin_pool(lv))
+ 		layer = lv_layer(lv);
+ 
++	/* Adds -real to the dm uuid of wcorig LV. */
++	if (!layer && lv_is_writecache_origin(lv))
++		layer = lv_layer(lv); /* "real" */
++
+ 	if (!(dlid = build_dm_uuid(dm->mem, lv, layer)))
+ 		return_0;
+ 
+diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
+index ab26b8d..17d4907 100644
+--- a/lib/metadata/lv.c
++++ b/lib/metadata/lv.c
+@@ -830,7 +830,7 @@ const char *lv_layer(const struct logical_volume *lv)
+ 	if (lv_is_vdo_pool(lv))
+ 		return "vpool";
+ 
+-	if (lv_is_origin(lv) || lv_is_external_origin(lv))
++	if (lv_is_origin(lv) || lv_is_external_origin(lv) || lv_is_writecache_origin(lv))
+ 		return "real";
+ 
+ 	return NULL;
+diff --git a/lib/metadata/writecache_manip.c b/lib/metadata/writecache_manip.c
+index 0122025..31d069e 100644
+--- a/lib/metadata/writecache_manip.c
++++ b/lib/metadata/writecache_manip.c
+@@ -24,15 +24,15 @@
+ 
+ int lv_is_writecache_origin(const struct logical_volume *lv)
+ {
+-	struct seg_list *sl;
++	struct lv_segment *seg;
+ 
+-	dm_list_iterate_items(sl, &lv->segs_using_this_lv) {
+-		if (!sl->seg || !sl->seg->lv || !sl->seg->origin)
+-			continue;
+-		if (lv_is_writecache(sl->seg->lv) && (sl->seg->origin == lv))
+-			return 1;
+-	}
+-	return 0;
++	/* Make sure there's exactly one segment in segs_using_this_lv! */
++	if (dm_list_empty(&lv->segs_using_this_lv) ||
++	    (dm_list_size(&lv->segs_using_this_lv) > 1))
++		return 0;
++
++	seg = get_only_segment_using_this_lv(lv);
++	return seg && lv_is_writecache(seg->lv) && !lv_is_pending_delete(seg->lv) && (seg_lv(seg, 0) == lv);
+ }
+ 
+ int lv_is_writecache_cachevol(const struct logical_volume *lv)
+diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
+index d8b27cb..0ee3403 100644
+--- a/lib/misc/lvm-string.c
++++ b/lib/misc/lvm-string.c
+@@ -251,6 +251,7 @@ char *build_dm_uuid(struct dm_pool *mem, const struct logical_volume *lv,
+ 		 */
+ 		/* Suffixes used here MUST match lib/activate/dev_manager.c */
+ 		layer = lv_is_cache_origin(lv) ? "real" :
++			lv_is_writecache_origin(lv) ? "real" :
+ 			(lv_is_cache(lv) && lv_is_pending_delete(lv)) ? "real" :
+ 			lv_is_cache_pool_data(lv) ? "cdata" :
+ 			lv_is_cache_pool_metadata(lv) ? "cmeta" :
+diff --git a/lib/writecache/writecache.c b/lib/writecache/writecache.c
+index 08a306e..130922a 100644
+--- a/lib/writecache/writecache.c
++++ b/lib/writecache/writecache.c
+@@ -260,7 +260,7 @@ static int _writecache_add_target_line(struct dev_manager *dm,
+ 	if ((pmem = lv_on_pmem(seg->writecache)) < 0)
+ 		return_0;
+ 
+-	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), NULL)))
++	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), "real")))
+ 		return_0;
+ 
+ 	if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, "cvol")))
+diff --git a/tools/lvconvert.c b/tools/lvconvert.c
+index 757b323..0ddeb35 100644
+--- a/tools/lvconvert.c
++++ b/tools/lvconvert.c
+@@ -5537,6 +5537,8 @@ static struct logical_volume *_lv_writecache_create(struct cmd_context *cmd,
+ 	if (!(segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_WRITECACHE)))
+ 		return_NULL;
+ 
++	lv->status |= WRITECACHE;
++
+ 	/*
+ 	 * "lv_wcorig" is a new LV with new id, but with the segments from "lv".
+ 	 * "lv" keeps the existing name and id, but gets a new writecache segment,
diff --git a/SOURCES/lvm2-rhel8.patch b/SOURCES/lvm2-rhel8.patch
index 0c12ddd..e6b4752 100644
--- a/SOURCES/lvm2-rhel8.patch
+++ b/SOURCES/lvm2-rhel8.patch
@@ -3,16 +3,16 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/VERSION b/VERSION
-index ab284be..4661287 100644
+index c5cc2e4..49d4854 100644
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1 @@
--2.03.05(2) (2019-06-15)
-+2.03.05(2)-RHEL8 (2019-06-15)
+-2.03.08(2) (2020-02-11)
++2.03.08(2)-RHEL8 (2020-02-11)
 diff --git a/VERSION_DM b/VERSION_DM
-index bd19b7d..32999a6 100644
+index f909625..3c2949a 100644
 --- a/VERSION_DM
 +++ b/VERSION_DM
 @@ -1 +1 @@
--1.02.163 (2019-06-15)
-+1.02.163-RHEL8 (2019-06-15)
+-1.02.169 (2020-02-11)
++1.02.169-RHEL8 (2020-02-11)
diff --git a/SOURCES/lvm2-set-default-preferred_names.patch b/SOURCES/lvm2-set-default-preferred_names.patch
index 7e18e8f..853cf51 100644
--- a/SOURCES/lvm2-set-default-preferred_names.patch
+++ b/SOURCES/lvm2-set-default-preferred_names.patch
@@ -3,7 +3,7 @@
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 154f621..b9cdf0c 100644
+index 05b0857..88858fc 100644
 --- a/conf/example.conf.in
 +++ b/conf/example.conf.in
 @@ -122,7 +122,8 @@ devices {
@@ -17,7 +17,7 @@ index 154f621..b9cdf0c 100644
  	# Configuration option devices/filter.
  	# Limit the block devices that are used by LVM commands.
 diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index e718dec..3113fe1 100644
+index 2bb72ba..dce9705 100644
 --- a/lib/config/config_settings.h
 +++ b/lib/config/config_settings.h
 @@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_
diff --git a/SOURCES/lvm2-test-skip-problematic-tests.patch b/SOURCES/lvm2-test-skip-problematic-tests.patch
index 29dde62..68df0ee 100644
--- a/SOURCES/lvm2-test-skip-problematic-tests.patch
+++ b/SOURCES/lvm2-test-skip-problematic-tests.patch
@@ -3,10 +3,10 @@
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py
-index 9bc1683..1b5608c 100755
+index 8753e65..b2986bf 100755
 --- a/test/dbus/lvmdbustest.py
 +++ b/test/dbus/lvmdbustest.py
-@@ -1885,6 +1885,7 @@ class TestDbusService(unittest.TestCase):
+@@ -1821,6 +1821,7 @@ class TestDbusService(unittest.TestCase):
  		# path to it.  Additionally, we will take the symlink and do a lookup
  		# (Manager.LookUpByLvmId) using it and the original device path to
  		# ensure that we can find the PV.
@@ -15,24 +15,25 @@ index 9bc1683..1b5608c 100755
  
  		pv = self.objs[PV_INT][0]
 diff --git a/test/shell/lvcreate-usage.sh b/test/shell/lvcreate-usage.sh
-index ca8694e..90ca600 100644
+index 6d46939..9e00f1c 100644
 --- a/test/shell/lvcreate-usage.sh
 +++ b/test/shell/lvcreate-usage.sh
-@@ -182,14 +182,14 @@ DEVICE=$(dmsetup deps -o blkdevname "$dev1" | sed -e "s,.*:\ (\(.*\)),/dev/\1,")
+@@ -181,15 +181,15 @@ check lv_field $vg/$lv4 lv_read_ahead "auto"
+ DEVICE=$(dmsetup deps -o blkdevname "$dev1" | sed -e "s,.*:\ (\(.*\)),/dev/\1,")
  RASZ=$(( $(blockdev --getra "$DEVICE" ) / 2 ))
- SZ="$RASZ.00k"
- test "$RASZ" -ge 128 || SZ="128.00k"
--check lv_field $vg/$lv4 lv_kernel_read_ahead "$SZ" --units k
-+should check lv_field $vg/$lv4 lv_kernel_read_ahead "$SZ" --units k
- lvcreate -L 8 -n $lv5 -i2 --stripesize 16k --readahead auto $vg
+ test "$RASZ" -ge 128 || RASZ="128"
+-check lv_field $vg/$lv4 lv_kernel_read_ahead "${RASZ}.00k" --units k
++should check lv_field $vg/$lv4 lv_kernel_read_ahead "${RASZ}.00k" --units k
+ lvcreate -vvvvv -L 8 -n $lv5 -i2 --stripesize 16k --readahead auto $vg
  check lv_field $vg/$lv5 lv_read_ahead "auto"
--check lv_field $vg/$lv5 lv_kernel_read_ahead "$SZ" --units k
-+should check lv_field $vg/$lv5 lv_kernel_read_ahead "$SZ" --units k
+ # For 16k stripe we set '128k' as the is the minimum size we get when creating DM device
+-check lv_field $vg/$lv5 lv_kernel_read_ahead "128.00k" --units k
++should check lv_field $vg/$lv5 lv_kernel_read_ahead "128.00k" --units k
  lvcreate -L 8 -n $lv6 -i2 --stripesize 128k --readahead auto $vg
  check lv_field $vg/$lv6 lv_read_ahead "auto"
- test "$RASZ" -ge 512 || SZ="512.00k"
--check lv_field $vg/$lv6 lv_kernel_read_ahead "$SZ" --units k
-+should check lv_field $vg/$lv6 lv_kernel_read_ahead "$SZ" --units k
+ # For striped device we set double of strip size unrelated to underlaying dev RA size
+-check lv_field $vg/$lv6 lv_kernel_read_ahead "512.00k" --units k
++should check lv_field $vg/$lv6 lv_kernel_read_ahead "512.00k" --units k
  lvremove -ff $vg
  
  #
diff --git a/SPECS/lvm2.spec b/SPECS/lvm2.spec
index 7af3e06..8a86760 100644
--- a/SPECS/lvm2.spec
+++ b/SPECS/lvm2.spec
@@ -1,4 +1,4 @@
-%global device_mapper_version 1.02.163
+%global device_mapper_version 1.02.169
 
 %global enable_cache 1
 %global enable_cluster 1
@@ -8,8 +8,9 @@
 %global enable_lvmpolld 1
 %global enable_thin 1
 %global enable_dmfilemapd 1
-%global enable_testsuite 0
+%global enable_testsuite 1
 %global enable_vdo 1
+%global enable_writecache 1
 
 %global system_release_version 23
 %global systemd_version 189-3
@@ -27,13 +28,13 @@
 %global enable_lockd_dlm %{enable_lvmlockd}
 
 %if 0%{?rhel} && 0%{?rhel} <= 8
-  %ifnarch i686 x86_64 ppc64le s390x %{arm}
+  %ifnarch i686 x86_64 ppc64le s390x
     %global enable_cluster 0
     %global enable_cmirror 0
     %global enable_lockd_dlm 0
   %endif
 
-  %ifnarch x86_64 ppc64 aarch64 %{arm}
+  %ifnarch x86_64 ppc64 aarch64
     %global enable_lockd_sanlock 0
   %endif
 %endif
@@ -55,63 +56,24 @@ Name: lvm2
 %if 0%{?rhel}
 Epoch: %{rhel}
 %endif
-Version: 2.03.05
-Release: 5%{?dist}.0.1
+Version: 2.03.08
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sourceware.org/lvm2
 Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
 Patch0: lvm2-rhel8.patch
 Patch1: lvm2-set-default-preferred_names.patch
-Patch2: lvm2-2_03_06-config-remove-filter-typo.patch
-Patch3: lvm2-2_03_06-config-Fix-default-option-which-makes-no-sense.patch
-# RHEL7 BZ 1569431
-Patch4: lvm2-2_03_06-vgchange-don-t-fail-monitor-command-if-vg-is-exporte.patch
-Patch5: lvm2-2_03_06-metadata-include-description-with-command-in-metadat.patch
-Patch6: lvm2-2_03_06-exported-vg-handling.patch
-Patch7: lvm2-2_03_06-tests-add-exported.sh.patch
-Patch8: lvm2-2_03_06-test-Fix-unbound-variable.patch
-Patch9: lvm2-2_03_06-test-Remove-now-useless-clvmd-test.patch
-Patch10: lvm2-2_03_06-cache-warn-and-prompt-for-writeback-with-cachevol.patch
-Patch11: lvm2-2_03_06-udev-do-not-overwrite-ID_MODEL-in-69-dm-lvm-metad.ru.patch
-# BZ 1720705
-Patch12: lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-convers.patch
-# BZ 1727270
-Patch13: lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-s.patch
-Patch14: lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-siz.patch
-Patch15: lvm2-2_03_06-enable-full-md-component-detection-at-the-right-time.patch
-Patch16: lvm2-2_03_06-tests-extend-lvm-on-md.patch
-Patch17: lvm2-2_03_06-tests-pvscan-autoactivate-test-unmatching-dev-and-PV.patch
-Patch18: lvm2-2_03_06-pvck-fix-looping-dump-metadata_all.patch
-Patch19: lvm2-2_03_06-tests-lvm-on-md-use-variable-run-dir.patch
-Patch20: lvm2-2_03_06-tests-Fix-unbound-variable.patch
-# BZ 1732994
-Patch21: lvm2-2_03_06-Fix-rounding-writes-up-to-sector-size.patch
-Patch22: lvm2-2_03_06-tests-large-physical-sector-size.patch
-Patch23: lvm2-2_03_06-WHATS_NEW-fix-large-physical-block-size.patch
-# RHEL7 BZ 1669751
-Patch24: lvm2-2_03_06-vgcreate-vgextend-restrict-PVs-with-mixed-block-size.patch
-Patch25: lvm2-2_03_06-tests-allow-mixed-block-sizes.patch
-Patch26: lvm2-2_03_06-WHATS_NEW-vgcreate-vgextend-logical-block-size.patch
-Patch27: lvm2-2_03_06-increase-soft-open-file-limit.patch
-# Coverity and test updates:
-Patch28: lvm2-2_03_06-tests-open-file-limit.patch
-Patch29: lvm2-2_03_06-cov-ensure-cname-exists-before-derefering-it.patch
-Patch30: lvm2-2_03_06-cov-check-for-socket_path-being-set.patch
-Patch31: lvm2-2_03_06-tests-replaces-grep-q-usage.patch
-Patch32: lvm2-2_03_06-tests-fix-ra-checking.patch
-Patch33: lvm2-2_03_06-tests-add-settle-wait-before-issue-remove.patch
-Patch34: lvm2-2_03_06-tests-accept-also-value-512.patch
-Patch35: lvm2-2_03_06-tests-for-cluster-testing-we-always-need-exclusive-m.patch
-Patch36: lvm2-2_03_06-tests-simplify-some-var-settings.patch
-# Upstream BZ 1740666
-Patch37: lvm2-2_03_06-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch
-# RHEL7 BZ 1560739 and related BZs
-Patch38: lvm2-2_03_06-dmeventd-avoid-bail-out-preventing-repair-in-raid-pl.patch
-Patch39: lvm2-2_03_06-build-make-generate.patch
-Patch40: lvm2-test-skip-problematic-tests.patch
-Patch41: lvm2-2_03_06-configure-Fix-setting-of-CLDFLAGS-default.patch
-# BZ 1752635
-Patch42: lvm2-2_03_06-Revert-lvmlockd-use-commonly-used-define-NOTIFYDBUS_.patch
+Patch2: lvm2-test-skip-problematic-tests.patch
+Patch3: lvm2-2_03_09-cachevol-stop-dm-errors-with-uncaching-cache-with-ca.patch
+Patch4: lvm2-2_03_09-writecache-check-if-cachevol-is-writable.patch
+Patch5: lvm2-2_03_09-thin-don-t-use-writecache-for-poolmetadata.patch
+Patch6: lvm2-2_03_09-writecache-drop-real-dm-suffix.patch
+Patch7: lvm2-2_03_09-writecache-working-real-dm-uuid-suffix-for-wcorig-lv.patch
+Patch8: lvm2-2_03_09-writecache-fix-watermark-error-message.patch
+Patch9: lvm2-2_03_09-writecache-allow-removing-wcorig-lv.patch
+# BZ 1808012:
+Patch10: lvm2-2_03_09-writecache-require-inactive-LV-to-attach.patch
+Patch11: lvm2-2_03_09-test-Can-not-attach-writecache-to-active-volume.patch
 
 BuildRequires: gcc
 %if %{enable_testsuite}
@@ -179,37 +141,6 @@ or more physical volumes and creating one or more logical volumes
 %patch9 -p1 -b .backup9
 %patch10 -p1 -b .backup10
 %patch11 -p1 -b .backup11
-%patch12 -p1 -b .backup12
-%patch13 -p1 -b .backup13
-%patch14 -p1 -b .backup14
-%patch15 -p1 -b .backup15
-%patch16 -p1 -b .backup16
-%patch17 -p1 -b .backup17
-%patch18 -p1 -b .backup18
-%patch19 -p1 -b .backup19
-%patch20 -p1 -b .backup20
-%patch21 -p1 -b .backup21
-%patch22 -p1 -b .backup22
-%patch23 -p1 -b .backup23
-%patch24 -p1 -b .backup24
-%patch25 -p1 -b .backup25
-%patch26 -p1 -b .backup26
-%patch27 -p1 -b .backup27
-%patch28 -p1 -b .backup28
-%patch29 -p1 -b .backup29
-%patch30 -p1 -b .backup30
-%patch31 -p1 -b .backup31
-%patch32 -p1 -b .backup32
-%patch33 -p1 -b .backup33
-%patch34 -p1 -b .backup34
-%patch35 -p1 -b .backup35
-%patch36 -p1 -b .backup36
-%patch37 -p1 -b .backup37
-%patch38 -p1 -b .backup38
-%patch39 -p1 -b .backup39
-%patch40 -p1 -b .backup40
-%patch41 -p1 -b .backup41
-%patch42 -p1 -b .backup42
 
 %build
 %global _default_pid_dir /run
@@ -252,7 +183,11 @@ or more physical volumes and creating one or more logical volumes
 %global configure_vdo --with-vdo=internal --with-vdo-format=%{_bindir}/vdoformat
 %endif
 
-%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-fsadm --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %{?configure_lvmdbusd} %{?configure_dmfilemapd} %{?configure_vdo} --disable-silent-rules
+%if %{enable_writecache}
+%global configure_writecache --with-writecache=internal
+%endif
+
+%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-fsadm --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %{?configure_lvmdbusd} %{?configure_dmfilemapd} %{?configure_writecache} %{?configure_vdo} --disable-silent-rules
 
 make %{?_smp_mflags}
 
@@ -267,7 +202,6 @@ make -C test install DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %post
-/sbin/ldconfig
 %systemd_post blk-availability.service lvm2-monitor.service
 if [ "$1" = "1" ] ; then
 	# FIXME: what to do with this? We do not want to start it in a container/chroot
@@ -807,6 +741,33 @@ An extensive functional testsuite for LVM2.
 %endif
 
 %changelog
+* Wed Mar 18 2020 Marian Csontos <mcsontos@redhat.com> - 2.03.08-3
+- Attaching writecache require inactive LV.
+
+* Mon Feb 24 2020 Marian Csontos <mcsontos@redhat.com> - 2.03.08-2
+- Writecache bug fixes.
+
+* Tue Feb 11 2020 Marian Csontos <mcsontos@redhat.com> - 2.03.08-1
+- VDO and writecache volume improvements.
+- Prohibit reshaping of stacked raid LVs to prevent corruption.
+
+* Fri Feb 07 2020 Marian Csontos <mcsontos@redhat.com> - 2.03.07-2
+- VDO: Adapt for changed vdo_format output.
+
+* Sat Nov 30 2019 Marian Csontos <mcsontos@redhat.com> - 2.03.07-1
+- Ensure minimum required region size on striped RaidLV creation.
+- Fix resize of thin-pool with data and metadata of different segtype.
+- Improve mirror type leg splitting.
+- Fix activation order when removing merged snapshot.
+- Experimental VDO support for lvmdbusd.
+- Correctly set read_ahead for LVs when pvmove is finished.
+- Add support for DM_DEVICE_GET_TARGET_VERSION into device_mapper.
+- Activate thin-pool layered volume as 'read-only' device.
+- Ignore crypto devices with UUID signature CRYPT-SUBDEV.
+- Synchronize with udev when dropping snapshot.
+- Add missing device synchronization point before removing pvmove node.
+- See WHATS_NEW for more.
+
 * Wed Sep 25 2019 Marian Csontos <mcsontos@redhat.com> - 2.03.05-5
 - Fix lvmlockd is not started with sanlock running.