report: cachevol field for writecache LVs

Add dm-writecache support
Use dm-writecache to attach a cache volume (CV) to an LV. The LV type becomes "writecache" (--type writecache can be optionally specified when attaching.) lvconvert --cachevol-attach CV LV lvconvert --cachevol-detach CV LV The cachevol (CV) is a special LV that was created on cache devices, e.g. lvcreate --cachevol -L <size> -n <name> VG Cache devices are special PVs that are added to the VG to use for cachevols, e.g. vgextend --cachedev VG PV Example: Add persistent memory to a VG as a cache device: vgextend --cachedev vg /dev/pmem0 Create a cache volume from pmem0: lvcreate --cachevol -L1G -n cvol0 vg Create a second cache volume from pmem0: lvcreate --cachevol -L1G -n cvol1 vg Attach the cache volumes to LVs: lvconvert --cachevol-attach cvol0 vg/lv0 lvconvert --cachevol-attach cvol1 vg/lv1
2025-12-24 16:23:50 +03:00 · 2018-07-24 17:00:06 -05:00 · 2018-07-24 15:46:06 -05:00 · 2018-07-24 15:46:06 -05:00 · 2018-07-24 15:46:06 -05:00
575 changed files with 16803 additions and 47193 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -25,29 +25,17 @@ make.tmpl

 /autom4te.cache/
 /autoscan.log
-/build/
-/config.cache
 /config.log
 /config.status
 /configure.scan
-/cscope.*
-/html/
-/reports/
+/cscope.out
 /tags
 /tmp/

-coverity/coverity_model.xml
-
-# gcov files:
-*.gcda
-*.gcno

 tools/man-generator
 tools/man-generator.c

-test/.lib-dir-stamp
-test/.tests-stamp
-test/lib/dmsecuretest
 test/lib/lvchange
 test/lib/lvconvert
 test/lib/lvcreate
@@ -72,7 +60,6 @@ test/lib/pvremove
 test/lib/pvresize
 test/lib/pvs
 test/lib/pvscan
-test/lib/securetest
 test/lib/vgcfgbackup
 test/lib/vgcfgrestore
 test/lib/vgchange
--- a/COPYING.BSD
+++ b/COPYING.BSD
@@ -1,25 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2014, Red Hat, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,22 +43,16 @@ DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl

 include make.tmpl

-include $(top_srcdir)/base/Makefile
-include $(top_srcdir)/device_mapper/Makefile
-include $(top_srcdir)/test/unit/Makefile
-
 libdm: include
 libdaemon: include
-lib: libdaemon $(BASE_TARGET) $(DEVICE_MAPPER_TARGET)
+lib: libdm libdaemon
 daemons: lib libdaemon tools
-scripts: lib
-tools: lib libdaemon
+tools: lib libdaemon device-mapper
 po: tools daemons
 man: tools
 all_man: tools
 scripts: libdm
 test: tools daemons
-unit-test  run-unit-test: test

 lib.device-mapper: include.device-mapper
 libdm.device-mapper: include.device-mapper
@@ -154,8 +148,18 @@ install_all_man:
 install_tmpfiles_configuration:
 	$(MAKE) -C scripts install_tmpfiles_configuration

+LCOV_TRACES = libdm.info lib.info tools.info \
+	libdaemon/client.info libdaemon/server.info \
+	test/unit.info \
+	daemons/clvmd.info \
+	daemons/dmeventd.info \
+	daemons/lvmlockd.info \
+	daemons/lvmpolld.info
+
+CLEAN_TARGETS += $(LCOV_TRACES)
+
 ifneq ("$(LCOV)", "")
-.PHONY: lcov-reset lcov lcov-dated
+.PHONY: lcov-reset lcov lcov-dated $(LCOV_TRACES)

 ifeq ($(MAKECMDGOALS),lcov-dated)
 LCOV_REPORTS_DIR := lcov_reports-$(shell date +%Y%m%d%k%M%S)
@@ -165,22 +169,35 @@ LCOV_REPORTS_DIR := lcov_reports
 endif

 lcov-reset:
-	$(LCOV) --zerocounters --directory $(top_builddir)
+	$(LCOV) --zerocounters $(addprefix -d , $(basename $(LCOV_TRACES)))
+
+# maybe use subdirs processing to create tracefiles...
+$(LCOV_TRACES):
+	$(LCOV) -b $(basename $@) -d $(basename $@) \
+		--ignore-errors source -c -o - | $(SED) \
+		-e "s/\(dmeventd_lvm.[ch]\)/plugins\/lvm2\/\1/" \
+		-e "s/dmeventd_\(mirror\|snapshot\|thin\|raid\)\.c/plugins\/\1\/dmeventd_\1\.c/" \
+		>$@

 ifneq ("$(GENHTML)", "")
-lcov:
-	$(RM) -rf $(LCOV_REPORTS_DIR)
+lcov: $(LCOV_TRACES)
+	$(RM) -r $(LCOV_REPORTS_DIR)
 	$(MKDIR_P) $(LCOV_REPORTS_DIR)
-	$(LCOV) --capture --directory $(top_builddir) --ignore-errors source \
-		--output-file $(LCOV_REPORTS_DIR)/out.info
-	-test ! -s $(LCOV_REPORTS_DIR)/out.info || \
-		$(GENHTML) -o $(LCOV_REPORTS_DIR) --ignore-errors source \
-		$(LCOV_REPORTS_DIR)/out.info
+	for i in $(LCOV_TRACES); do \
+		test -s $$i -a $$(wc -w <$$i) -ge 100 && lc="$$lc $$i"; \
+	done; \
+	test -z "$$lc" || $(GENHTML) -p @abs_top_builddir@ \
+		-o $(LCOV_REPORTS_DIR) $$lc
 endif

 endif

-ifneq ($(shell which ctags 2>/dev/null),)
+# FIXME: Drop once top-level make is resolved
+-include test/unit/Makefile
+include $(top_srcdir)/device_mapper/Makefile
+include $(top_srcdir)/base/Makefile
+
+ifneq ($(shell which ctags),)
 .PHONY: tags
 tags:
 	test -z "$(shell find $(top_srcdir) -type f -name '*.[ch]' -newer tags 2>/dev/null | head -1)" || $(RM) tags
--- a/10
+++ b/10
@@ -1,7 +1,5 @@
 This tree contains the LVM2 and device-mapper tools and libraries.

-This is development branch, for stable 2.02 release see stable-2.02 branch.
-
 For more information about LVM2 read the changelog in the WHATS_NEW file.
 Installation instructions are in INSTALL.

@@ -9,6 +7,7 @@ There is no warranty - see COPYING and COPYING.LIB.

 Tarballs are available from:
  ftp://sourceware.org/pub/lvm2/
+  ftp://sources.redhat.com/pub/lvm2/
  https://github.com/lvmteam/lvm2/releases

 The source code is stored in git:
@@ -43,9 +42,6 @@ Report upstream bugs at:
 or open issues at:
  https://github.com/lvmteam/lvm2/issues

-The source code repository used until 7th June 2012 is accessible using CVS:
+The source code repository used until 7th June 2012 is accessible here:
+  http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/?cvsroot=lvm2.

-  cvs -d :pserver:cvs@sourceware.org:/cvs/lvm2 login cvs
-  cvs -d :pserver:cvs@sourceware.org:/cvs/lvm2 checkout LVM2
-
-The password is cvs.
--- a/2
+++ b/2
@@ -1 +1 @@
-2.03.11(2)-git (2020-08-09)
+2.02.178(2)-git (2018-05-24)
--- a/2
+++ b/2
@@ -1 +1 @@
-1.02.175-git (2020-08-09)
+1.02.147-git (2018-05-24)
--- a/183
+++ b/183
@@ -1,183 +1,5 @@
-Version 2.03.11 - 
-==================================
-  Enhance error handling for fsadm and hanled correct fsck result.
-  Dmeventd lvm plugin ignores higher reserved_stack lvm.conf values.
-  Support using BLKZEROOUT for clearing devices.
-  Support interruption when wipping LVs.
-  Support interruption for bcache waiting.
-  Fix bcache when device has too many failing writes.
-  Fix bcache waiting for IO completion with failing disks.
-  Configure use own python path name order to prefer using python3.
-  Add configure --enable-editline support as an alternative to readline.
-  Enhance reporting and error handling when creating thin volumes.
-  Enable vgsplit for VDO volumes.
-  Lvextend of vdo pool volumes ensure at least 1 new VDO slab is added.
-  Use revert_lv() on reload error path after vg_revert().
-  Configure --with-integrity enabled.
-  Restore lost signal blocking while VG lock is held.
-  Improve estimation of needed extents when creating thin-pool.
-  Use extra 1% when resizing thin-pool metadata LV with --use-policy.
-  Enhance --use-policy percentage rounding.
-  Configure --with-vdo and --with-writecache as internal segments.
-  Improving VDO man page examples.
-  Switch code base to use flexible array syntax.
-  Fix 64bit math when calculation cachevol size.
-  Preserve uint32_t for seqno handling.
-  Switch from mmap to plain read when loading regular files.
-  Update lvmvdo man page and better explain DISCARD usage.
-
-Version 2.03.10 - 09th August 2020
-==================================
-  Add writecache and integrity support to lvmdbusd.
-  Generate unique cachevol name when default required from lvcreate.
-  Converting RAID1 volume to one with same number of legs now succeeds with a
-  warning.
-  Fix conversion to raid from striped lagging type.
-  Fix conversion to 'mirrored' mirror log with larger regionsize.
-  Zero pool metadata on allocation (disable with allocation/zero_metadata=0).
-  Failure in zeroing or wiping will fail command (bypass with -Zn, -Wn).
-  Add lvcreate of new cache or writecache lv with single command.
-  Fix running out of free buffers for async writing for larger writes.
-  Add integrity with raid capability.
-  Fix support for lvconvert --repair used by foreign apps (i.e. Docker).
-
-Version 2.03.09 - 26th March 2020
-=================================
-  Fix formating of vdopool (vdo_slab_size_mb was smaller by 2 bits).
-  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.
-  Add error handling for failing allocation in _reserve_area().
-  Fix memleak in syncing of internal cache.
-  Fix pvck dump_current_text memleak.
-  Fix lvmlockd result code on error path for _query_lock_lv().
-  Update pvck man page and help output.
-  Reject invalid writecache high/low_watermark setting.
-  Report writecache status.
-  Accept more output lines from vdo_format.
-  Prohibit reshaping of stacked raid LVs.
-  Avoid running cache input arg validation when creating vdo pool.
-  Prevent raid reshaping of stacked volumes.
-  Added VDO lvmdbusd methods for enable/disable compression & dedupe.
-  Added VDO lvmdbusd method for converting LV to VDO pool.
-
-Version 2.03.07 - 30th November 2019
-====================================
-  Subcommand in vgck for repairing headers and metadata.
-  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.
-  Improve error path handling in daemons on shutdown.
-  Fix activation order when removing merged snapshot.
-  Experimental VDO support for lvmdbusd.
-
-Version 2.03.06 - 23rd October 2019
-===================================
-  Add _cpool suffix to cache-pool LV name when used by caching LV.
-  No longer store extra UUID for cmeta and cdata cachevol layer.
-  Enhance activation of cache devices with cachevols.
-  Add _cvol in list of protected suffixes and start use it with DM UUID.
-  Rename LV converted to cachevol to use _cvol suffix.
-  Use normal LVs for wiping of cachevols.
-  Reload cleanered cache DM only with cleaner policy.
-  Fix cmd return when zeroing of cachevol fails.
-  Extend lvs to show all VDO properties.
-  Preserve VDO write policy with vdopool.
-  Increase default vdo bio threads to 4.
-  Continue report when cache_status fails.
-  Add support for DM_DEVICE_GET_TARGET_VERSION into device_mapper.
-  Fix cmirrord usage of header files from device_mapper subdir.
-  Allow standalone activation of VDO pool just like for thin-pools.
-  Activate thin-pool layered volume as 'read-only' device.
-  Ignore crypto devices with UUID signature CRYPT-SUBDEV.
-  Enhance validation for thin and cache pool conversion and swapping.
-  Improve internal removal of cached devices.
-  Synchronize with udev when dropping snapshot.
-  Add missing device synchronization point before removing pvmove node.
-  Correctly set read_ahead for LVs when pvmove is finished.
-  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.
-
-Version 2.03.05 - 15th June 2019
-================================
-  Fix command definition for pvchange -a.
-  Add vgck --updatemetadata command that will repair metadata problems.
-  Improve VG reading to work if one good copy of metadata is found.
-  Report/display/scan commands that read VGs will no longer write/repair.
-  Move metadata repairs from VG reading to VG writing.
-  Add config setting md_component_checks to control MD component checks.
-  Add end of device MD component checks when dev has no udev info.
-
-Version 2.03.04 - 10th June 2019
-================================
-  Remove unused_duplicate_devs from cmd causing segfault in dmeventd.
-
-Version 2.03.03 - 07th June 2019
-================================
-  Report no_discard_passdown for cache LVs with lvs -o+kernel_discards.
-  Add pvck --dump option to extract metadata.
-  Fix signal delivery checking race in libdaemon (lvmetad).
-  Add missing Before=shutdown.target to LVM2 services to fix shutdown ordering.
-  Skip autoactivation for a PV when PV size does not match device size.
-  Remove first-pvscan-initialization which should no longer be needed.
-  Add remote refresh through lvmlockd/dlm for shared LVs after lvextend.
-  Ignore foreign and shared PVs for pvscan online files.
-  Add config setting to control fields in debug file and verbose output.
-  Add command[pid] and timestamp to debug file and verbose output.
-  Fix missing growth of _pmsmare volume when extending _tmeta volume.
-  Automatically grow thin metadata, when thin data gets too big.
-  Add synchronization with udev before removing cached devices.
-  Add support for caching VDO LVs and VDOPOOL LVs.
-  Add support for vgsplit with cached devices.
-  Query mpath device only once per command for its state.
-  Use device INFO instead of STATUS when checking for mpath device uuid.
-  Change default io_memory_size from 4 to 8 MiB.
-  Add config setting io_memory_size to set bcache size.
-  Fix pvscan autoactivation for concurrent pvscans.
-  Change scan_lvs default to 0 so LVs are not scanned for PVs.
-  Thin-pool selects power-of-2 chunk size by default.
-  Cache selects power-of-2 chunk size by default.
-  Support reszing for VDOPoolLV and VDOLV.
-  Improve -lXXX%VG modifier which improves cache segment estimation.
-  Ensure migration_threshold for cache is at least 8 chunks.
-  Restore missing man info lvcreate --zero for thin-pools.
-  Drop misleadning comment for metadata minimum_io_size for VDO segment.
-  Add device hints to reduce scanning.
-  Introduce LVM_SUPPRESS_SYSLOG to suppress syslog usage by generator.
-  Fix generator quering lvmconfig unpresent config option.
-  Fix memleak on bcache error path code.
-  Fix missing unlock on lvm2 dmeventd plugin error path initialization.
-  Improve Makefile dependency tracking.
-  Move VDO support towards V2 target (6.2) support.
-
-Version 2.03.02 - 18th December 2018
-====================================
-  Fix missing proper initialization of pv_list struct when adding pv.
-  Fix (de)activation of RaidLVs with visible SubLVs.
-  Prohibit mirrored 'mirror' log via lvcreate and lvconvert.
-  Use sync io if async io_setup fails, or use_aio=0 is set in config.
-  Fix more issues reported by coverity scan.
-
-Version 2.03.01 - 31st October 2018
-===================================
-
-Version 2.03.00 - 10th October 2018
-===================================
-  Add hot fix to avoiding locking collision when monitoring thin-pools.
-  Allow raid4 -> linear conversion request.
-  Fix lvconvert striped/raid0/raid0_meta -> raid6 regression.
-  Add 'lvm2-activation-generator:' prefix for kmsg messages logged by generator.
-  Add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service.
-  Reduce max concurrent aios to avoid EMFILE with many devices.
-  Fix lvconvert conversion attempts to linear.
-  Fix lvconvert raid0/raid0_meta -> striped regression.
-  Fix lvconvert --splitmirror for mirror type (2.02.178).
-  Do not pair cache policy and cache metadata format.
-  lvconvert: reject conversions on raid1 LVs with split tracked SubLVs
-  lvconvert: reject conversions on raid1 split tracked SubLVs
+Version 3.0.0
+=============
  Add basic creation support for VDO target.
  Never send any discard ioctl with test mode.
  Fix thin-pool alloc which needs same PV for data and metadata.
@@ -190,7 +12,6 @@ Version 2.03.00 - 10th October 2018
  Avoid showing internal error in lvs output or pvmoved LVs.
  Remove clvmd
  Remove lvmlib (api)
-  Remove lvmetad
  lvconvert: provide possible layouts between linear and striped/raid
  Use versionsort to fix archive file expiry beyond 100000 files.

--- a/63
+++ b/63
@@ -1,68 +1,7 @@
-Version 1.02.175 - 
-===================================
-
-Version 1.02.173 - 09th August 2020
-===================================
-  Add support for VDO in blkdeactivate script.
-
-Version 1.02.171 - 26th March 2020
-==================================
-  Try to remove all created devices on dm preload tree error path.
-  Fix dm_list interators with gcc 10 optimization (-ftree-pta).
-  Dmeventd handles timer without looping on short intervals.
-
-Version 1.02.169 - 11th February 2020
-=====================================
-  Enhance error messages for device creation.
-
-Version 1.02.167 - 30th November 2019
-=====================================
-
-Version 1.02.165 - 23rd October 2019
+Version 1.02.147 -
 ====================================
-  Add support for DM_DEVICE_GET_TARGET_VERSION.
-  Add debug of dmsetup udevcomplete with hexa print DM_COOKIE_COMPLETED.
-  Fix versioning of dm_stats_create_region and dm_stats_create_region.
-
-Version 1.02.163 - 15th June 2019
-=================================
-
-Version 1.02.161 - 10th June 2019
-=================================
-
-Version 1.02.159 - 07th June 2019
-=================================
-  Parsing of cache status understand no_discard_passdown.
-  Ensure migration_threshold for cache is at least 8 chunks.
-
-Version 1.02.155 - 18th December 2018
-=====================================
-  Include correct internal header inside libdm list.c.
-  Enhance ioctl flattening and add parameters only when needed.
-  Add DM_DEVICE_ARM_POLL for API completness matching kernel.
-  Do not add parameters for RESUME with DM_DEVICE_CREATE dm task.
-  Fix dmstats report printing no output.
-
-Version 1.02.153 - 31st October 2018
-====================================
-
-Version 1.02.151 - 10th October 2018
-====================================
-  Add hot fix to avoiding locking collision when monitoring thin-pools.
-
-Version 1.02.150 - 01 August 2018
-=================================
  Add vdo plugin for monitoring VDO devices.

-Version 1.02.149 - 19th July 2018
-=================================
-
-Version 1.02.148 - 18th June 2018
-=================================
-
-Version 1.02.147 - 13th June 2018
-=================================
-
 Version 1.02.147-rc1 - 24th May 2018
 ====================================
  Reuse uname() result for mirror target.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-

-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -413,7 +413,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
 ])dnl PKG_HAVE_DEFINE_WITH_MODULES

-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -446,12 +446,10 @@ AC_DEFUN([AM_PATH_PYTHON],
 [
  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
  dnl supported. (2.0 was released on October 16, 2000).
+  dnl FIXME: Remove the need to hard-code Python versions here.
  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 dnl
- python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
- python3.2 python3.1 python3.0 dnl
- python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
- python2.0])
+[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])

  AC_ARG_VAR([PYTHON], [the Python interpreter])

@@ -651,7 +649,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
 sys.exit(sys.hexversion < minverhex)"
  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])

-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/base/Makefile
+++ b/base/Makefile
@@ -10,31 +10,22 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

-# Uncomment this to build the simple radix tree.  You'll need to make clean too.
-# Comment to build the advanced radix tree.
-#base/data-struct/radix-tree.o: CFLAGS += -DSIMPLE_RADIX_TREE
-
-# NOTE: this Makefile only works as 'include' for toplevel Makefile
-#       which defined all top_* variables
-
 BASE_SOURCE=\
+	base/data-struct/radix-tree.c \
 	base/data-struct/hash.c \
-	base/data-struct/list.c \
-	base/data-struct/radix-tree.c
+	base/data-struct/list.c

-BASE_TARGET = base/libbase.a
-BASE_DEPENDS = $(BASE_SOURCE:%.c=%.d)
-BASE_OBJECTS = $(BASE_SOURCE:%.c=%.o)
-CLEAN_TARGETS += $(BASE_DEPENDS) $(BASE_OBJECTS) \
-	$(BASE_SOURCE:%.c=%.gcda) \
-	$(BASE_SOURCE:%.c=%.gcno) \
-	$(BASE_TARGET)
+BASE_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(BASE_SOURCE)))
+BASE_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(BASE_SOURCE)))
+CLEAN_TARGETS+=$(BASE_DEPENDS) $(BASE_OBJECTS)

-$(BASE_TARGET): $(BASE_OBJECTS)
+-include $(BASE_DEPENDS)
+
+$(BASE_OBJECTS): INCLUDES+=-I$(top_srcdir)/base/
+
+$(top_builddir)/base/libbase.a: $(BASE_OBJECTS)
 	@echo "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null

-ifeq ("$(DEPENDS)","yes")
-include $(BASE_DEPENDS)
-endif
+CLEAN_TARGETS+=$(top_builddir)/base/libbase.a
--- a/base/data-struct/hash.c
+++ b/base/data-struct/hash.c
@@ -22,7 +22,7 @@ struct dm_hash_node {
 	void *data;
 	unsigned data_len;
 	unsigned keylen;
-	char key[];
+	char key[0];
 };

 struct dm_hash_table {
@@ -59,27 +59,26 @@ static unsigned char _nums[] = {
 	209
 };

-static struct dm_hash_node *_create_node(const void *key, unsigned len)
+static struct dm_hash_node *_create_node(const char *str, unsigned len)
 {
 	struct dm_hash_node *n = malloc(sizeof(*n) + len);

 	if (n) {
-		memcpy(n->key, key, len);
+		memcpy(n->key, str, len);
 		n->keylen = len;
 	}

 	return n;
 }

-static unsigned long _hash(const void *key, unsigned len)
+static unsigned long _hash(const char *str, unsigned len)
 {
-	const unsigned char *str = key;
 	unsigned long h = 0, g;
 	unsigned i;

 	for (i = 0; i < len; i++) {
 		h <<= 4;
-		h += _nums[*str++];
+		h += _nums[(unsigned char) *str++];
 		g = h & ((unsigned long) 0xf << 16u);
 		if (g) {
 			h ^= g >> 16u;
--- a/base/data-struct/list.h
+++ b/base/data-struct/list.h
@@ -1,8 +1,6 @@
 #ifndef BASE_DATA_STRUCT_LIST_H
 #define BASE_DATA_STRUCT_LIST_H

-#include "base/memory/container_of.h"
-
 //----------------------------------------------------------------

 /*
@@ -100,7 +98,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e
 * contained in a structure of type t, return the containing structure.
 */
 #define dm_list_struct_base(v, t, head) \
-    container_of(v, t, head)
+    ((t *)((const char *)(v) - (const char *)&((t *) 0)->head))

 /*
 * Given the address v of an instance of 'struct dm_list list' contained in
@@ -113,7 +111,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e
 * return another element f.
 */
 #define dm_struct_field(v, t, e, f) \
-    (((t *)((uintptr_t)(v) - offsetof(t, e)))->f)
+    (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f)

 /*
 * Given the address v of a known element e in a known structure of type t,
--- a/base/data-struct/radix-tree-adaptive.c
+++ b/base/data-struct/radix-tree-adaptive.c
--- a/base/data-struct/radix-tree-simple.c
+++ b/base/data-struct/radix-tree-simple.c
@@ -1,256 +0,0 @@
-// Copyright (C) 2018 Red Hat, Inc. All rights reserved.
-// 
-// This file is part of LVM2.
-//
-// 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 Lesser General Public License v.2.1.
-//
-// You should have received a copy of the GNU Lesser 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
-
-#include "radix-tree.h"
-
-#include "base/memory/container_of.h"
-#include "base/memory/zalloc.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-//----------------------------------------------------------------
-// This implementation is based around nested binary trees.  Very
-// simple (and hopefully correct).
-
-struct node {
-	struct node *left;
-	struct node *right;
-
-	uint8_t key;
-	struct node *center;
-
-	bool has_value;
-	union radix_value value;
-};
-
-struct radix_tree {
-	radix_value_dtr dtr;
-	void *dtr_context;
-
-	struct node *root;
-};
-
-struct radix_tree *
-radix_tree_create(radix_value_dtr dtr, void *dtr_context)
-{
-	struct radix_tree *rt = zalloc(sizeof(*rt));
-
-	if (rt) {
-		rt->dtr = dtr;
-		rt->dtr_context = dtr_context;
-	}
-
-	return rt;
-}
-
-// Returns the number of entries in the tree
-static unsigned _destroy_tree(struct node *n, radix_value_dtr dtr, void *context)
-{
-	unsigned r;
-
-	if (!n)
-		return 0;
-
-	r = _destroy_tree(n->left, dtr, context);
-	r += _destroy_tree(n->right, dtr, context);
-	r += _destroy_tree(n->center, dtr, context);
-
-	if (n->has_value) {
-		if (dtr)
-			dtr(context, n->value);
-		r++;
-	}
-
-	free(n);
-
-	return r;
-}
-
-void radix_tree_destroy(struct radix_tree *rt)
-{
-	_destroy_tree(rt->root, rt->dtr, rt->dtr_context);
-	free(rt);
-}
-
-static unsigned _count(struct node *n)
-{
-	unsigned r;
-
-	if (!n)
-		return 0;
-
-	r = _count(n->left);
-	r += _count(n->right);
-	r += _count(n->center);
-
-	if (n->has_value)
-		r++;
-
-	return r;
-}
-
-unsigned radix_tree_size(struct radix_tree *rt)
-{
-	return _count(rt->root);
-}
-
-static struct node **_lookup(struct node **pn, uint8_t *kb, uint8_t *ke)
-{
-	struct node *n = *pn;
-
-	if (!n || (kb == ke))
-		return pn;
-
-	if (*kb < n->key)
-		return _lookup(&n->left, kb, ke);
-
-	else if (*kb > n->key)
-		return _lookup(&n->right, kb, ke);
-
-	else
-		return _lookup(&n->center, kb + 1, ke);
-}
-
-static bool _insert(struct node **pn, uint8_t *kb, uint8_t *ke, union radix_value v)
-{
-	struct node *n = *pn;
-
-	if (!n) {
-		n = zalloc(sizeof(*n));
-		if (!n)
-			return false;
-
-		n->key = *kb;
-		*pn = n;
-	}
-
-	if (kb == ke) {
-		n->has_value = true;
-		n->value = v;
-		return true;
-	}
-
-	if (*kb < n->key)
-		return _insert(&n->left, kb, ke, v);
-
-	else if (*kb > n->key)
-		return _insert(&n->right, kb, ke, v);
-
-	else
-		return _insert(&n->center, kb + 1, ke, v);
-}
-
-bool radix_tree_insert(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, union radix_value v)
-{
-	return _insert(&rt->root, kb, ke, v);
-}
-
-bool radix_tree_remove(struct radix_tree *rt, uint8_t *kb, uint8_t *ke)
-{
-	struct node **pn = _lookup(&rt->root, kb, ke);
-	struct node *n = *pn;
-
-	if (!n || !n->has_value)
-		return false;
-
-	else {
-		if (rt->dtr)
-			rt->dtr(rt->dtr_context, n->value);
-
-		if (n->left || n->center || n->right) {
-			n->has_value = false;
-			return true;
-
-		} else {
-			// FIXME: delete parent if this was the last entry
-			free(n);
-			*pn = NULL;
-		}
-
-		return true;
-	}
-}
-
-unsigned radix_tree_remove_prefix(struct radix_tree *rt, uint8_t *kb, uint8_t *ke)
-{
-	struct node **pn;
-	unsigned count;
-
-	pn = _lookup(&rt->root, kb, ke);
-
-	if (*pn) {
-		count = _destroy_tree(*pn, rt->dtr, rt->dtr_context);
-		*pn = NULL;
-	}
-
-	return count;
-}
-
-bool
-radix_tree_lookup(struct radix_tree *rt, uint8_t *kb, uint8_t *ke, union radix_value *result)
-{
-	struct node **pn = _lookup(&rt->root, kb, ke);
-	struct node *n = *pn;
-
-	if (n && n->has_value) {
-		*result = n->value;
-		return true;
-	} else
-		return false;
-}
-
-static void _iterate(struct node *n, struct radix_tree_iterator *it)
-{
-	if (!n)
-		return;
-
-	_iterate(n->left, it);
-
-	if (n->has_value)
-		// FIXME: fill out the key
-		it->visit(it, NULL, NULL, n->value);
-
-	_iterate(n->center, it);
-	_iterate(n->right, it);
-}
-
-void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke,
-                        struct radix_tree_iterator *it)
-{
-	if (kb == ke)
-		_iterate(rt->root, it);
-
-	else {
-		struct node **pn = _lookup(&rt->root, kb, ke);
-		struct node *n = *pn;
-
-		if (n) {
-			if (n->has_value)
-				it->visit(it, NULL, NULL, n->value);
-			_iterate(n->center, it);
-		}
-	}
-}
-
-bool radix_tree_is_well_formed(struct radix_tree *rt)
-{
-	return true;
-}
-
-void radix_tree_dump(struct radix_tree *rt, FILE *out)
-{
-}
-
-//----------------------------------------------------------------
-
--- a/base/data-struct/radix-tree.c
+++ b/base/data-struct/radix-tree.c
--- a/base/memory/container_of.h
+++ b/base/memory/container_of.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 - 2020 Red Hat, Inc. All rights reserved.
+// Copyright (C) 2018 Red Hat, Inc. All rights reserved.
 // 
 // This file is part of LVM2.
 //
@@ -13,12 +13,10 @@
 #ifndef BASE_MEMORY_CONTAINER_OF_H
 #define BASE_MEMORY_CONTAINER_OF_H

-#include <stddef.h>  // offsetof
-
 //----------------------------------------------------------------

 #define container_of(v, t, head) \
-    ((t *)((char *)(v) - offsetof(t, head)))
+    ((t *)((const char *)(v) - (const char *)&((t *) 0)->head))

 //----------------------------------------------------------------

--- a/base/memory/zalloc.h
+++ b/base/memory/zalloc.h
@@ -14,12 +14,16 @@
 #define BASE_MEMORY_ZALLOC_H

 #include <stdlib.h>
+#include <string.h>

 //----------------------------------------------------------------

 static inline void *zalloc(size_t len)
 {
-	return calloc(1, len);
+	void *ptr = malloc(len);
+	if (ptr)
+		memset(ptr, 0, len);
+	return ptr;
 }

 //----------------------------------------------------------------
--- a/conf/Makefile.in
+++ b/conf/Makefile.in
@@ -49,9 +49,8 @@ install_localconf: $(CONFLOCAL)
 	fi

 install_profiles: $(PROFILES)
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_DIR) $(profiledir)
-	$(Q) $(INSTALL_DATA) $(PROFILES) $(profiledir)/
+	$(INSTALL_DIR) $(profiledir)
+	$(INSTALL_DATA) $(PROFILES) $(profiledir)/

 install_lvm2: install_conf install_localconf install_profiles

--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -88,22 +88,6 @@ devices {
 	# 
 	external_device_info_source = "none"

-	# Configuration option devices/hints.
-	# Use a local file to remember which devices have PVs on them.
-	# Some commands will use this as an optimization to reduce device
-	# scanning, and will only scan the listed PVs. Removing the hint file
-	# will cause lvm to generate a new one. Disable hints if PVs will
-	# be copied onto devices using non-lvm commands, like dd.
-	# 
-	# Accepted values:
-	#   all
-	#     Use all hints.
-	#   none
-	#     Use no hints.
-	# 
-	# This configuration option has an automatic default value.
-	# hints = "all"
-
 	# Configuration option devices/preferred_names.
 	# Select which path name to display for a block device.
 	# If multiple path names exist for a block device, and LVM needs to
@@ -139,10 +123,11 @@ devices {
 	# then the device is accepted. Be careful mixing 'a' and 'r' patterns,
 	# as the combination might produce unexpected results (test changes.)
 	# Run vgscan after changing the filter to regenerate the cache.
+	# See the use_lvmetad comment for a special case regarding filters.
 	# 
 	# 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:
@@ -150,20 +135,32 @@ 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.
 	# Because devices/filter may be overridden from the command line, it is
-	# not suitable for system-wide device filtering, e.g. udev.
+	# not suitable for system-wide device filtering, e.g. udev and lvmetad.
 	# Use global_filter to hide devices from these LVM system components.
 	# 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/cache_dir.
+	# This setting is no longer used.
+	cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@"
+
+	# Configuration option devices/cache_file_prefix.
+	# This setting is no longer used.
+	cache_file_prefix = ""
+
+	# Configuration option devices/write_cache_state.
+	# This setting is no longer used.
+	write_cache_state = 1

 	# Configuration option devices/types.
 	# List of additional acceptable block device types.
@@ -182,53 +179,14 @@ devices {
 	# present on the system. sysfs must be part of the kernel and mounted.)
 	sysfs_scan = 1

-	# Configuration option devices/scan_lvs.
-	# Scan LVM LVs for layered PVs, allowing LVs to be used as PVs.
-	# When 1, LVM will detect PVs layered on LVs, and caution must be
-	# taken to avoid a host accessing a layered VG that may not belong
-	# to it, e.g. from a guest image. This generally requires excluding
-	# the LVs with device filters. Also, when this setting is enabled,
-	# every LVM command will scan every active LV on the system (unless
-	# filtered), which can cause performance problems on systems with
-	# many active LVs. When this setting is 0, LVM will not detect or
-	# use PVs that exist on LVs, and will not allow a PV to be created on
-	# an LV. The LVs are ignored using a built in device filter that
-	# identifies and excludes LVs.
-	scan_lvs = 0
-
 	# Configuration option devices/multipath_component_detection.
 	# Ignore devices that are components of DM multipath devices.
 	multipath_component_detection = 1

 	# Configuration option devices/md_component_detection.
-	# Enable detection and exclusion of MD component devices.
-	# An MD component device is a block device that MD uses as part
-	# of a software RAID virtual device. When an LVM PV is created
-	# on an MD device, LVM must only use the top level MD device as
-	# the PV, and should ignore the underlying component devices.
-	# In cases where the MD superblock is located at the end of the
-	# component devices, it is more difficult for LVM to consistently
-	# identify an MD component, see the md_component_checks setting.
+	# Ignore devices that are components of software RAID (md) devices.
 	md_component_detection = 1

-	# Configuration option devices/md_component_checks.
-	# The checks LVM should use to detect MD component devices.
-	# MD component devices are block devices used by MD software RAID.
-	# 
-	# Accepted values:
-	#   auto
-	#     LVM will skip scanning the end of devices when it has other
-	#     indications that the device is not an MD component.
-	#   start
-	#     LVM will only scan the start of devices for MD superblocks.
-	#     This does not incur extra I/O by LVM.
-	#   full
-	#     LVM will scan the start and end of devices for MD superblocks.
-	#     This requires an extra read at the end of devices.
-	# 
-	# This configuration option has an automatic default value.
-	# md_component_checks = "auto"
-
 	# Configuration option devices/fw_raid_component_detection.
 	# Ignore devices that are components of firmware RAID devices.
 	# LVM must use an external_device_info_source other than none for this
@@ -236,24 +194,19 @@ devices {
 	fw_raid_component_detection = 0

 	# Configuration option devices/md_chunk_alignment.
-	# Align the start of a PV data area with md device's stripe-width.
+	# Align PV data blocks with md device's stripe-width.
 	# This applies if a PV is placed directly on an md device.
-	# default_data_alignment will be overriden if it is not aligned
-	# with the value detected for this setting.
-	# This setting is overriden by data_alignment_detection,
-	# data_alignment, and the --dataalignment option.
 	md_chunk_alignment = 1

 	# Configuration option devices/default_data_alignment.
-	# Align the start of a PV data area with this number of MiB.
-	# Set to 1 for 1MiB, 2 for 2MiB, etc. Set to 0 to disable.
-	# This setting is overriden by data_alignment and the --dataalignment
-	# option.
+	# Default alignment of the start of a PV data area in MB.
+	# If set to 0, a value of 64KiB will be used.
+	# Set to 1 for 1MiB, 2 for 2MiB, etc.
 	# This configuration option has an automatic default value.
 	# default_data_alignment = 1

 	# Configuration option devices/data_alignment_detection.
-	# Align the start of a PV data area with sysfs io properties.
+	# Detect PV data alignment based on sysfs device information.
 	# The start of a PV data area will be a multiple of minimum_io_size or
 	# optimal_io_size exposed in sysfs. minimum_io_size is the smallest
 	# request the device can perform without incurring a read-modify-write
@@ -261,29 +214,27 @@ devices {
 	# preferred unit of receiving I/O, e.g. MD stripe width.
 	# minimum_io_size is used if optimal_io_size is undefined (0).
 	# If md_chunk_alignment is enabled, that detects the optimal_io_size.
-	# default_data_alignment and md_chunk_alignment will be overriden
-	# if they are not aligned with the value detected for this setting.
-	# This setting is overriden by data_alignment and the --dataalignment
-	# option.
+	# This setting takes precedence over md_chunk_alignment.
 	data_alignment_detection = 1

 	# Configuration option devices/data_alignment.
-	# Align the start of a PV data area with this number of KiB.
-	# When non-zero, this setting overrides default_data_alignment.
-	# Set to 0 to disable, in which case default_data_alignment
-	# is used to align the first PE in units of MiB.
-	# This setting is overriden by the --dataalignment option.
+	# Alignment of the start of a PV data area in KiB.
+	# If a PV is placed directly on an md device and md_chunk_alignment or
+	# data_alignment_detection are enabled, then this setting is ignored.
+	# Otherwise, md_chunk_alignment and data_alignment_detection are
+	# disabled if this is set. Set to 0 to use the default alignment or the
+	# page size, if larger.
 	data_alignment = 0

 	# Configuration option devices/data_alignment_offset_detection.
-	# Shift the start of an aligned PV data area based on sysfs information.
-	# After a PV data area is aligned, it will be shifted by the
+	# Detect PV data alignment offset based on sysfs device information.
+	# The start of a PV aligned data area will be shifted by the
 	# alignment_offset exposed in sysfs. This offset is often 0, but may
 	# be non-zero. Certain 4KiB sector drives that compensate for windows
 	# partitioning will have an alignment_offset of 3584 bytes (sector 7
 	# is the lowest aligned logical block, the 4KiB sectors start at
 	# LBA -1, and consequently sector 63 is aligned on a 4KiB boundary).
-	# This setting is overriden by the --dataalignmentoffset option.
+	# pvcreate --dataalignmentoffset will skip this detection.
 	data_alignment_offset_detection = 1

 	# Configuration option devices/ignore_suspended_devices.
@@ -311,6 +262,10 @@ devices {
 	# different way, making them a better choice for VG stacking.
 	ignore_lvm_mirrors = 1

+	# Configuration option devices/disable_after_error_count.
+	# This setting is no longer used.
+	disable_after_error_count = 0
+
 	# Configuration option devices/require_restorefile_with_uuid.
 	# Allow use of pvcreate --uuid without requiring --restorefile.
 	require_restorefile_with_uuid = 1
@@ -347,12 +302,6 @@ devices {
 	# Enabling this setting allows the VG to be used as usual even with
 	# uncertain devices.
 	allow_changes_with_duplicate_pvs = 0
-
-	# Configuration option devices/allow_mixed_block_sizes.
-	# Allow PVs in the same VG with different logical block sizes.
-	# When allowed, the user is responsible to ensure that an LV is
-	# using PVs with matching block sizes when necessary.
-	allow_mixed_block_sizes = 0
 }

 # Configuration section allocation.
@@ -387,7 +336,7 @@ allocation {
 	maximise_cling = 1

 	# Configuration option allocation/use_blkid_wiping.
-	# Use blkid to detect and erase existing signatures on new PVs and LVs.
+	# Use blkid to detect existing signatures on new PVs and LVs.
 	# The blkid library can detect more signatures than the native LVM
 	# detection code, but may take longer. LVM needs to be compiled with
 	# blkid wiping support for this setting to apply. LVM native detection
@@ -429,8 +378,7 @@ allocation {

 	# Configuration option allocation/cache_pool_metadata_require_separate_pvs.
 	# Cache pool metadata and data will always use different PVs.
-	# This configuration option has an automatic default value.
-	# cache_pool_metadata_require_separate_pvs = 0
+	cache_pool_metadata_require_separate_pvs = 0

 	# Configuration option allocation/cache_metadata_format.
 	# Sets default metadata format for new cache.
@@ -489,9 +437,8 @@ allocation {
 	# This configuration option does not have a default value defined.

 	# Configuration option allocation/thin_pool_metadata_require_separate_pvs.
-	# Thin pool metadata and data will always use different PVs.
-	# This configuration option has an automatic default value.
-	# thin_pool_metadata_require_separate_pvs = 0
+	# Thin pool metdata and data will always use different PVs.
+	thin_pool_metadata_require_separate_pvs = 0

 	# Configuration option allocation/thin_pool_zero.
 	# Thin pool data chunks are zeroed before they are first used.
@@ -528,11 +475,6 @@ allocation {
 	# This configuration option has an automatic default value.
 	# thin_pool_chunk_size_policy = "generic"

-	# Configuration option allocation/zero_metadata.
-	# Zero whole metadata area before use with thin or cache pool.
-	# This configuration option has an automatic default value.
-	# zero_metadata = 1
-
 	# Configuration option allocation/thin_pool_chunk_size.
 	# The minimal chunk size in KiB for thin pool volumes.
 	# Larger chunk sizes may improve performance for plain thin volumes,
@@ -561,19 +503,10 @@ allocation {
 	# This configuration option has an automatic default value.
 	# vdo_use_deduplication = 1

-	# Configuration option allocation/vdo_use_metadata_hints.
-	# Enables or disables whether VDO volume should tag its latency-critical
-	# writes with the REQ_SYNC flag. Some device mapper targets such as dm-raid5
-	# process writes with this flag at a higher priority.
-	# Default is enabled.
+	# Configuration option allocation/vdo_emulate_512_sectors.
+	# Specifies that the VDO volume is to emulate a 512 byte block device.
 	# This configuration option has an automatic default value.
-	# vdo_use_metadata_hints = 1
-
-	# Configuration option allocation/vdo_minimum_io_size.
-	# The minimum IO size for VDO volume to accept, in bytes.
-	# Valid values are 512 or 4096. The recommended and default value is 4096.
-	# This configuration option has an automatic default value.
-	# vdo_minimum_io_size = 4096
+	# vdo_emulate_512_sectors = 0

 	# Configuration option allocation/vdo_block_map_cache_size_mb.
 	# Specifies the amount of memory in MiB allocated for caching block map
@@ -584,10 +517,10 @@ allocation {
 	# vdo_block_map_cache_size_mb = 128

 	# Configuration option allocation/vdo_block_map_period.
-	# The speed with which the block map cache writes out modified block map pages.
-	# A smaller era length is likely to reduce the amount time spent rebuilding,
-	# at the cost of increased block map writes during normal operation.
-	# The maximum and recommended value is 16380; the minimum value is 1.
+	# Tunes the quantity of block map updates that can accumulate
+	# before cache pages are flushed to disk. The value must be
+	# at least 1 and less then 16380.
+	# A lower value means shorter recovery time but lower performance.
 	# This configuration option has an automatic default value.
 	# vdo_block_map_period = 16380

@@ -607,6 +540,22 @@ allocation {
 	# This configuration option has an automatic default value.
 	# vdo_index_memory_size_mb = 256

+	# Configuration option allocation/vdo_use_read_cache.
+	# Enables or disables the read cache within the VDO volume.
+	# The cache should be enabled if write workloads are expected
+	# to have high levels of deduplication, or for read intensive
+	# workloads of highly compressible data.
+	# This configuration option has an automatic default value.
+	# vdo_use_read_cache = 0
+
+	# Configuration option allocation/vdo_read_cache_size_mb.
+	# Specifies the extra VDO volume read cache size in MiB.
+	# This space is in addition to a system-defined minimum.
+	# The value must be less then 16TiB and 1.12 MiB of memory
+	# will be used per MiB of read cache specified, per bio thread.
+	# This configuration option has an automatic default value.
+	# vdo_read_cache_size_mb = 0
+
 	# Configuration option allocation/vdo_slab_size_mb.
 	# Specifies the size in MiB of the increment by which a VDO is grown.
 	# Using a smaller size constrains the total maximum physical size
@@ -628,7 +577,7 @@ allocation {
 	# Each additional thread after the first will use an additional 18MiB of RAM,
 	# plus 1.12 MiB of RAM per megabyte of configured read cache size.
 	# This configuration option has an automatic default value.
-	# vdo_bio_threads = 4
+	# vdo_bio_threads = 1

 	# Configuration option allocation/vdo_bio_rotation.
 	# Specifies the number of I/O operations to enqueue for each bio-submission
@@ -682,18 +631,6 @@ allocation {
 	#         Data which has not been flushed is not guaranteed to persist in this mode.
 	# This configuration option has an automatic default value.
 	# vdo_write_policy = "auto"
-
-	# Configuration option allocation/vdo_max_discard.
-	# Specified te maximum size of discard bio accepted, in 4096 byte blocks.
-	# I/O requests to a VDO volume are normally split into 4096-byte blocks,
-	# and processed up to 2048 at a time. However, discard requests to a VDO volume
-	# can be automatically split to a larger size, up to <max discard> 4096-byte blocks
-	# in a single bio, and are limited to 1500 at a time.
-	# Increasing this value may provide better overall performance, at the cost of
-	# increased latency for the individual discard requests.
-	# The default and minimum is 1. The maximum is UINT_MAX / 4096.
-	# This configuration option has an automatic default value.
-	# vdo_max_discard = 1
 }

 # Configuration section log.
@@ -784,8 +721,7 @@ log {

 	# Configuration option log/indent.
 	# Indent messages according to their severity.
-	# This configuration option has an automatic default value.
-	# indent = 0
+	indent = 1

 	# Configuration option log/command_names.
 	# Display the command name on each line of output.
@@ -808,23 +744,9 @@ log {
 	# Select log messages by class.
 	# Some debugging messages are assigned to a class and only appear in
 	# debug output if the class is listed here. Classes currently
-	# available: memory, devices, io, activation, allocation,
+	# available: memory, devices, io, activation, allocation, lvmetad,
 	# metadata, cache, locking, lvmpolld. Use "all" to see everything.
-	debug_classes = [ "memory", "devices", "io", "activation", "allocation", "metadata", "cache", "locking", "lvmpolld", "dbus" ]
-
-	# Configuration option log/debug_file_fields.
-	# The fields included in debug output written to log file.
-	# Use "all" to include everything (the default).
-	# This configuration option is advanced.
-	# This configuration option has an automatic default value.
-	# debug_file_fields = [ "time", "command", "fileline", "message" ]
-
-	# Configuration option log/debug_output_fields.
-	# The fields included in debug output written to stderr.
-	# Use "all" to include everything (the default).
-	# This configuration option is advanced.
-	# This configuration option has an automatic default value.
-	# debug_output_fields = [ "time", "command", "fileline", "message" ]
+	debug_classes = [ "memory", "devices", "io", "activation", "allocation", "lvmetad", "metadata", "cache", "locking", "lvmpolld", "dbus" ]
 }

 # Configuration section backup.
@@ -912,6 +834,23 @@ global {
 	# the error messages.
 	activation = 1

+	# Configuration option global/fallback_to_lvm1.
+	# This setting is no longer used.
+	# This configuration option has an automatic default value.
+	# fallback_to_lvm1 = 0
+
+	# Configuration option global/format.
+	# This setting is no longer used.
+	# This configuration option has an automatic default value.
+	# format = "lvm2"
+
+	# Configuration option global/format_libraries.
+	# This setting is no longer used.
+	# This configuration option does not have a default value defined.
+
+	# Configuration option global/segment_libraries.
+	# This configuration option does not have a default value defined.
+
 	# Configuration option global/proc.
 	# Location of proc filesystem.
 	# This configuration option is advanced.
@@ -921,10 +860,22 @@ global {
 	# Location of /etc system configuration directory.
 	etc = "@CONFDIR@"

+	# Configuration option global/locking_type.
+	# This setting is no longer used.
+	locking_type = 1
+
 	# Configuration option global/wait_for_locks.
 	# When disabled, fail if a lock request would block.
 	wait_for_locks = 1

+	# Configuration option global/fallback_to_clustered_locking.
+	# This setting is no longer used.
+	fallback_to_clustered_locking = 1
+
+	# Configuration option global/fallback_to_local_locking.
+	# This setting is no longer used.
+	fallback_to_local_locking = 1
+
 	# Configuration option global/locking_dir.
 	# Directory to use for LVM command file locks.
 	# Local non-LV directory that holds file-based locks while commands are
@@ -945,6 +896,11 @@ global {
 	# Search this directory first for shared libraries.
 	# This configuration option does not have a default value defined.

+	# Configuration option global/locking_library.
+	# This setting is no longer used.
+	# This configuration option has an automatic default value.
+	# locking_library = "liblvm2clusterlock.so"
+
 	# Configuration option global/abort_on_internal_errors.
 	# Abort a command that encounters an internal error.
 	# Treat any internal errors as fatal errors, aborting the process that
@@ -985,17 +941,6 @@ global {
 	# 
 	mirror_segtype_default = "@DEFAULT_MIRROR_SEGTYPE@"

-	# Configuration option global/support_mirrored_mirror_log.
-	# Enable mirrored 'mirror' log type for testing.
-	# 
-	# This type is deprecated to create or convert to but can
-	# be enabled to test that activation of existing mirrored
-	# logs and conversion to disk/core works.
-	# 
-	# Not supported for regular operation!
-	# This configuration option has an automatic default value.
-	# support_mirrored_mirror_log = 0
-
 	# Configuration option global/raid10_segtype_default.
 	# The segment type used by the -i -m combination.
 	# The --type raid10|mirror option overrides this setting.
@@ -1044,21 +989,41 @@ global {
 	# This configuration option has an automatic default value.
 	# lvdisplay_shows_full_device_path = 0

-	# Configuration option global/event_activation.
-	# Activate LVs based on system-generated device events.
-	# When a device appears on the system, a system-generated event runs
-	# the pvscan command to activate LVs if the new PV completes the VG.
-	# Use auto_activation_volume_list to select which LVs should be
-	# activated from these events (the default is all.)
-	# When event_activation is disabled, the system will generally run
-	# a direct activation command to activate LVs in complete VGs.
-	# This configuration option has an automatic default value.
-	# event_activation = 1
+	# Configuration option global/use_lvmetad.
+	# Use lvmetad to cache metadata and reduce disk scanning.
+	# When enabled (and running), lvmetad provides LVM commands with VG
+	# metadata and PV state. LVM commands then avoid reading this
+	# information from disks which can be slow. When disabled (or not
+	# running), LVM commands fall back to scanning disks to obtain VG
+	# metadata. lvmetad is kept updated via udev rules which must be set
+	# up for LVM to work correctly. (The udev rules should be installed
+	# by default.) Without a proper udev setup, changes in the system's
+	# block device configuration will be unknown to LVM, and ignored
+	# until a manual 'pvscan --cache' is run. If lvmetad was running
+	# while use_lvmetad was disabled, it must be stopped, use_lvmetad
+	# enabled, and then started. When using lvmetad, LV activation is
+	# switched to an automatic, event-based mode. In this mode, LVs are
+	# activated based on incoming udev events that inform lvmetad when
+	# PVs appear on the system. When a VG is complete (all PVs present),
+	# it is auto-activated. The auto_activation_volume_list setting
+	# controls which LVs are auto-activated (all by default.)
+	# When lvmetad is updated (automatically by udev events, or directly
+	# by pvscan --cache), devices/filter is ignored and all devices are
+	# scanned by default. lvmetad always keeps unfiltered information
+	# which is provided to LVM commands. Each LVM command then filters
+	# based on devices/filter. This does not apply to other, non-regexp,
+	# filtering settings: component filters such as multipath and MD
+	# are checked during pvscan --cache. To filter a device and prevent
+	# scanning from the LVM system entirely, including lvmetad, use
+	# devices/global_filter.
+	use_lvmetad = @DEFAULT_USE_LVMETAD@

-	# Configuration option global/use_aio.
-	# Use async I/O when reading and writing devices.
+	# Configuration option global/lvmetad_update_wait_time.
+	# Number of seconds a command will wait for lvmetad update to finish.
+	# After waiting for this period, a command will not use lvmetad, and
+	# will revert to disk scanning.
 	# This configuration option has an automatic default value.
-	# use_aio = 1
+	# lvmetad_update_wait_time = 10

 	# Configuration option global/use_lvmlockd.
 	# Use lvmlockd for locking among hosts using LVM on shared storage.
@@ -1252,16 +1217,6 @@ global {
 	# When enabled, an LVM command that changes PVs, changes VG metadata,
 	# or changes the activation state of an LV will send a notification.
 	notify_dbus = 1
-
-	# Configuration option global/io_memory_size.
-	# The amount of memory in KiB that LVM allocates to perform disk io.
-	# LVM performance may benefit from more io memory when there are many
-	# disks or VG metadata is large. Increasing this size may be necessary
-	# when a single copy of VG metadata is larger than the current setting.
-	# This value should usually not be decreased from the default; setting
-	# it too low can result in lvm failing to read VGs.
-	# This configuration option has an automatic default value.
-	# io_memory_size = 8192
 }

 # Configuration section activation.
@@ -1297,8 +1252,7 @@ activation {
 	# This enables additional checks (and if necessary, repairs) on entries
 	# in the device directory after udev has completed processing its
 	# events. Useful for diagnosing problems with LVM/udev interactions.
-	# This configuration option has an automatic default value.
-	# verify_udev_operations = 0
+	verify_udev_operations = 0

 	# Configuration option activation/retry_deactivation.
 	# Retry failed LV deactivation.
@@ -1323,27 +1277,23 @@ activation {
 	# When disabled, the striped target is used. The linear target is an
 	# optimised version of the striped target that only handles a single
 	# stripe.
-	# This configuration option has an automatic default value.
-	# use_linear_target = 1
+	use_linear_target = 1

 	# Configuration option activation/reserved_stack.
 	# Stack size in KiB to reserve for use while devices are suspended.
 	# Insufficent reserve risks I/O deadlock during device suspension.
-	# This configuration option has an automatic default value.
-	# reserved_stack = 64
+	reserved_stack = 64

 	# Configuration option activation/reserved_memory.
 	# Memory size in KiB to reserve for use while devices are suspended.
 	# Insufficent reserve risks I/O deadlock during device suspension.
-	# This configuration option has an automatic default value.
-	# reserved_memory = 8192
+	reserved_memory = 8192

 	# Configuration option activation/process_priority.
 	# Nice value used while devices are suspended.
 	# Use a high priority so that LVs are suspended
 	# for the shortest possible time.
-	# This configuration option has an automatic default value.
-	# process_priority = -18
+	process_priority = -18

 	# Configuration option activation/volume_list.
 	# Only LVs selected by this list are activated.
@@ -1460,8 +1410,7 @@ activation {
 	#   auto
 	#     Use default value chosen by kernel.
 	# 
-	# This configuration option has an automatic default value.
-	# readahead = "auto"
+	readahead = "auto"

 	# Configuration option activation/raid_fault_policy.
 	# Defines how a device failure in a RAID LV is handled.
@@ -1597,8 +1546,7 @@ activation {
 	# 8.4G, it is extended to 14.4G:
 	# vdo_pool_autoextend_threshold = 70
 	# 
-	# This configuration option has an automatic default value.
-	# vdo_pool_autoextend_threshold = 100
+	vdo_pool_autoextend_threshold = 100

 	# Configuration option activation/vdo_pool_autoextend_percent.
 	# Auto-extending a VDO pool adds this percent extra space.
@@ -1634,8 +1582,7 @@ activation {
 	# Use the old behavior of mlockall to pin all memory.
 	# Prior to version 2.02.62, LVM used mlockall() to pin the whole
 	# process's memory while activating devices.
-	# This configuration option has an automatic default value.
-	# use_mlockall = 0
+	use_mlockall = 0

 	# Configuration option activation/monitoring.
 	# Monitor LVs that are activated.
@@ -1650,8 +1597,7 @@ activation {
 	# intervals of this number of seconds. If this is set to 0 and there
 	# is only one thing to wait for, there are no progress reports, but
 	# the process is awoken immediately once the operation is complete.
-	# This configuration option has an automatic default value.
-	# polling_interval = 15
+	polling_interval = 15

 	# Configuration option activation/auto_set_activation_skip.
 	# Set the activation skip flag on new thin snapshot LVs.
@@ -1759,19 +1705,13 @@ activation {
 	# vgmetadatacopies = 0

 	# Configuration option metadata/pvmetadatasize.
-	# The default size of the metadata area in units of 512 byte sectors.
-	# The metadata area begins at an offset of the page size from the start
-	# of the device. The first PE is by default at 1 MiB from the start of
-	# the device. The space between these is the default metadata area size.
-	# The actual size of the metadata area may be larger than what is set
-	# here due to default_data_alignment making the first PE a MiB multiple.
-	# The metadata area begins with a 512 byte header and is followed by a
-	# circular buffer used for VG metadata text. The maximum size of the VG
-	# metadata is about half the size of the metadata buffer. VGs with large
-	# numbers of PVs or LVs, or VGs containing complex LV structures, may need
-	# additional space for VG metadata. The --metadatasize option overrides
-	# this setting.
-	# This configuration option does not have a default value defined.
+	# Approximate number of sectors to use for each metadata copy.
+	# VGs with large numbers of PVs or LVs, or VGs containing complex LV
+	# structures, may need additional space for VG metadata. The metadata
+	# areas are treated as circular buffers, so unused space becomes filled
+	# with an archive of the most recent previous versions of the metadata.
+	# This configuration option has an automatic default value.
+	# pvmetadatasize = 255

 	# Configuration option metadata/pvmetadataignore.
 	# Ignore metadata areas on a new PV.
@@ -1786,6 +1726,11 @@ activation {
 	# This configuration option is advanced.
 	# This configuration option has an automatic default value.
 	# stripesize = 64
+
+	# Configuration option metadata/dirs.
+	# This setting is no longer used.
+	# This configuration option is advanced.
+	# This configuration option does not have a default value defined.
 # }

 # Configuration section report.
@@ -2207,8 +2152,7 @@ dmeventd {
 	# failures. It removes failed devices from a volume group and
 	# reconfigures a mirror as necessary. If no mirror library is
 	# provided, mirrors are not monitored through dmeventd.
-	# This configuration option has an automatic default value.
-	# mirror_library = "libdevmapper-event-lvm2mirror.so"
+	mirror_library = "libdevmapper-event-lvm2mirror.so"

 	# Configuration option dmeventd/raid_library.
 	# This configuration option has an automatic default value.
@@ -2219,16 +2163,14 @@ dmeventd {
 	# libdevmapper-event-lvm2snapshot.so monitors the filling of snapshots
 	# and emits a warning through syslog when the usage exceeds 80%. The
 	# warning is repeated when 85%, 90% and 95% of the snapshot is filled.
-	# This configuration option has an automatic default value.
-	# snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+	snapshot_library = "libdevmapper-event-lvm2snapshot.so"

 	# Configuration option dmeventd/thin_library.
 	# The library dmeventd uses when monitoring a thin device.
 	# libdevmapper-event-lvm2thin.so monitors the filling of a pool
 	# and emits a warning through syslog when the usage exceeds 80%. The
 	# warning is repeated when 85%, 90% and 95% of the pool is filled.
-	# This configuration option has an automatic default value.
-	# thin_library = "libdevmapper-event-lvm2thin.so"
+	thin_library = "libdevmapper-event-lvm2thin.so"

 	# Configuration option dmeventd/thin_command.
 	# The plugin runs command with each 5% increment when thin-pool data volume
--- a/conf/vdo-small.profile
+++ b/conf/vdo-small.profile
@@ -1,24 +1,25 @@
 # Demo configuration for 'VDO' using less memory.
-# ~lvmconfig --type full | grep vdo
+#

 allocation {
-	vdo_use_compression=1
-	vdo_use_deduplication=1
-	vdo_use_metadata_hints=1
-	vdo_minimum_io_size=4096
-	vdo_block_map_cache_size_mb=128
-	vdo_block_map_period=16380
-	vdo_check_point_frequency=0
-	vdo_use_sparse_index=0
-	vdo_index_memory_size_mb=256
-	vdo_slab_size_mb=2048
-	vdo_ack_threads=1
-	vdo_bio_threads=1
-	vdo_bio_rotation=64
-	vdo_cpu_threads=2
-	vdo_hash_zone_threads=1
-	vdo_logical_threads=1
-	vdo_physical_threads=1
-	vdo_write_policy="auto"
-	vdo_max_discard=1
+	vdo_use_compression = 1
+	vdo_use_deduplication = 1
+	vdo_emulate_512_sectors = 0
+	vdo_block_map_cache_size_mb = 128
+	vdo_block_map_period = 16380
+	vdo_check_point_frequency = 0
+	vdo_use_sparse_index = 0
+	vdo_index_memory_size_mb = 256
+	vdo_use_read_cache = 0
+	vdo_read_cache_size_mb = 0
+	vdo_slab_size_mb = 2048
+
+	vdo_ack_threads = 1
+	vdo_bio_threads = 1
+	vdo_bio_rotation = 64
+	vdo_cpu_threads = 2
+	vdo_hash_zone_threads = 1
+	vdo_logical_threads = 1
+	vdo_physical_threads = 1
+	vdo_write_policy = "auto"
 }
--- a/412
+++ b/412
@@ -728,6 +728,7 @@ DEFAULT_PID_DIR
 DEFAULT_MIRROR_SEGTYPE
 DEFAULT_LOCK_DIR
 DEFAULT_DM_RUN_DIR
+DEFAULT_DATA_ALIGNMENT
 DEFAULT_CACHE_SUBDIR
 DEFAULT_BACKUP_SUBDIR
 DEFAULT_ARCHIVE_SUBDIR
@@ -742,7 +743,6 @@ CLDNOWHOLEARCHIVE
 CLDFLAGS
 CACHE
 BUILD_DMFILEMAPD
-BUILD_LOCKDDLM_CONTROL
 BUILD_LOCKDDLM
 BUILD_LOCKDSANLOCK
 BUILD_LVMLOCKD
@@ -753,8 +753,6 @@ BUILD_CMIRRORD
 BLKID_PC
 MODPROBE_CMD
 MSGFMT
-EDITLINE_LIBS
-EDITLINE_CFLAGS
 PYTHON3_CONFIG
 pkgpyexecdir
 pyexecdir
@@ -774,8 +772,6 @@ BLKID_LIBS
 BLKID_CFLAGS
 NOTIFY_DBUS_LIBS
 NOTIFY_DBUS_CFLAGS
-LOCKD_DLM_CONTROL_LIBS
-LOCKD_DLM_CONTROL_CFLAGS
 LOCKD_DLM_LIBS
 LOCKD_DLM_CFLAGS
 LOCKD_SANLOCK_LIBS
@@ -919,10 +915,7 @@ with_cache_restore
 enable_cache_check_needs_check
 with_vdo
 with_vdo_format
-with_writecache
-with_integrity
 enable_readline
-enable_editline
 enable_realtime
 enable_ocf
 with_ocfdir
@@ -939,7 +932,6 @@ enable_devmapper
 enable_lvmpolld
 enable_lvmlockd_sanlock
 enable_lvmlockd_dlm
-enable_lvmlockd_dlmcontrol
 enable_use_lvmlockd
 with_lvmlockd_pidfile
 enable_use_lvmpolld
@@ -963,7 +955,6 @@ enable_fsadm
 enable_blkdeactivate
 enable_dmeventd
 enable_selinux
-enable_blkzeroout
 enable_nls
 with_localedir
 with_confdir
@@ -982,6 +973,7 @@ with_default_archive_subdir
 with_default_backup_subdir
 with_default_cache_subdir
 with_default_locking_dir
+with_default_data_alignment
 with_interface
 '
      ac_precious_vars='build_alias
@@ -1009,8 +1001,6 @@ LOCKD_SANLOCK_CFLAGS
 LOCKD_SANLOCK_LIBS
 LOCKD_DLM_CFLAGS
 LOCKD_DLM_LIBS
-LOCKD_DLM_CONTROL_CFLAGS
-LOCKD_DLM_CONTROL_LIBS
 NOTIFY_DBUS_CFLAGS
 NOTIFY_DBUS_LIBS
 BLKID_CFLAGS
@@ -1019,9 +1009,7 @@ SYSTEMD_CFLAGS
 SYSTEMD_LIBS
 UDEV_CFLAGS
 UDEV_LIBS
-PYTHON
-EDITLINE_CFLAGS
-EDITLINE_LIBS'
+PYTHON'


 # Initialize some variables set by options.
@@ -1644,7 +1632,6 @@ Optional Features:
  --disable-cache_check_needs_check
                          required if cache_check version is < 0.5
  --disable-readline      disable readline support
-  --enable-editline       enable editline support
  --disable-realtime      disable realtime clock support
  --enable-ocf            enable Open Cluster Framework (OCF) compliant
                          resource agents
@@ -1657,8 +1644,6 @@ Optional Features:
  --enable-lvmlockd-sanlock
                          enable the LVM lock daemon using sanlock
  --enable-lvmlockd-dlm   enable the LVM lock daemon using dlm
-  --enable-lvmlockd-dlmcontrol
-                          enable lvmlockd remote refresh using libdlmcontrol
  --disable-use-lvmlockd  disable usage of LVM lock daemon
  --disable-use-lvmpolld  disable usage of LVM Poll Daemon
  --enable-dmfilemapd     enable the dmstats filemap daemon
@@ -1685,7 +1670,6 @@ Optional Features:
  --disable-blkdeactivate disable blkdeactivate
  --enable-dmeventd       enable the device-mapper event daemon
  --disable-selinux       disable selinux support
-  --disable-blkzeroout    do not use BLKZEROOUT for device zeroing
  --enable-nls            enable Native Language Support

 Optional Packages:
@@ -1724,16 +1708,14 @@ Optional Packages:
                          cache_restore tool: [autodetect]
  --with-vdo=TYPE         vdo support: internal/none [internal]
  --with-vdo-format=PATH  vdoformat tool: [autodetect]
-  --with-writecache=TYPE  writecache support: internal/none [internal]
-  --with-integrity=TYPE   integrity support: internal/none [internal]
  --with-ocfdir=DIR       install OCF files in
                          [PREFIX/lib/ocf/resource.d/lvm2]
  --with-default-pid-dir=PID_DIR
-                          default directory to keep PID files in [autodetect]
+                          Default directory to keep PID files in. [autodetect]
  --with-default-dm-run-dir=DM_RUN_DIR
-                          default DM run directory [autodetect]
+                          Default DM run directory. [autodetect]
  --with-default-run-dir=RUN_DIR
-                          default LVM run directory [autodetect_run_dir/lvm]
+                          Default LVM run directory. [autodetect_run_dir/lvm]
  --with-cmirrord-pidfile=PATH
                          cmirrord pidfile [PID_DIR/cmirrord.pid]
  --with-optimisation=OPT C optimisation flag [OPT=-O2]
@@ -1770,6 +1752,8 @@ Optional Packages:
                          default metadata cache subdir [cache]
  --with-default-locking-dir=DIR
                          default locking directory [autodetect_lock_dir/lvm]
+  --with-default-data-alignment=NUM
+                          set the default data alignment in MiB [1]
  --with-interface=IFACE  choose kernel interface (ioctl) [ioctl]

 Some influential environment variables:
@@ -1806,10 +1790,6 @@ Some influential environment variables:
              C compiler flags for LOCKD_DLM, overriding pkg-config
  LOCKD_DLM_LIBS
              linker flags for LOCKD_DLM, overriding pkg-config
-  LOCKD_DLM_CONTROL_CFLAGS
-              C compiler flags for LOCKD_DLM_CONTROL, overriding pkg-config
-  LOCKD_DLM_CONTROL_LIBS
-              linker flags for LOCKD_DLM_CONTROL, overriding pkg-config
  NOTIFY_DBUS_CFLAGS
              C compiler flags for NOTIFY_DBUS, overriding pkg-config
  NOTIFY_DBUS_LIBS
@@ -1824,10 +1804,6 @@ Some influential environment variables:
  UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
  UDEV_LIBS   linker flags for UDEV, overriding pkg-config
  PYTHON      the Python interpreter
-  EDITLINE_CFLAGS
-              C compiler flags for EDITLINE, overriding pkg-config
-  EDITLINE_LIBS
-              linker flags for EDITLINE, overriding pkg-config

 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3091,7 +3067,7 @@ if test -z "$CFLAGS"; then :
 fi
 case "$host_os" in
 	linux*)
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
+		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
 		# equivalent to -rdynamic
 		ELDFLAGS="-Wl,--export-dynamic"
 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -3103,7 +3079,6 @@ case "$host_os" in
 		BUILD_LVMPOLLD=no
 		LOCKDSANLOCK=no
 		LOCKDDLM=no
-		LOCKDDLM_CONTROL=no
 		ODIRECT=yes
 		DM_IOCTLS=yes
 		SELINUX=yes
@@ -3112,7 +3087,7 @@ case "$host_os" in
 		;;
 	darwin*)
 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
+		CLDFLAGS="$CLDFLAGS"
 		ELDFLAGS=
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
@@ -3124,9 +3099,6 @@ case "$host_os" in
 		FSADM=no
 		BLKDEACTIVATE=no
 		;;
-	*)
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
-		;;
 esac

 ################################################################################
@@ -6650,18 +6622,9 @@ fi



-
-
-$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _REENTRANT 1" >>confdefs.h
-
-
-
 ################################################################################
 for ac_func in ftruncate gethostname getpagesize gettimeofday localtime_r \
-  memchr memset mkdir mkfifo munmap nl_langinfo pselect realpath rmdir setenv \
+  memchr memset mkdir mkfifo munmap nl_langinfo realpath rmdir setenv \
  setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \
  strrchr strspn strstr strtol strtoul uname
 do :
@@ -6677,17 +6640,6 @@ else
 fi
 done

-for ac_func in prlimit
-do :
-  ac_fn_c_check_func "$LINENO" "prlimit" "ac_cv_func_prlimit"
-if test "x$ac_cv_func_prlimit" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PRLIMIT 1
-_ACEOF
-
-fi
-done
-
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
@@ -9598,7 +9550,7 @@ $as_echo_n "checking whether to include vdo... " >&6; }
 if test "${with_vdo+set}" = set; then :
  withval=$with_vdo; VDO=$withval
 else
-  VDO="internal"
+  VDO="none"
 fi


@@ -9750,56 +9702,6 @@ _ACEOF
 #                           VDO_LIB=$withval, VDO_LIB="/usr/lib")
 #AC_MSG_RESULT($VDO_LIB)

-################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include writecache" >&5
-$as_echo_n "checking whether to include writecache... " >&6; }
-
-# Check whether --with-writecache was given.
-if test "${with_writecache+set}" = set; then :
-  withval=$with_writecache; WRITECACHE=$withval
-else
-  WRITECACHE="internal"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WRITECACHE" >&5
-$as_echo "$WRITECACHE" >&6; }
-
-case "$WRITECACHE" in
- none) ;;
- internal)
-
-$as_echo "#define WRITECACHE_INTERNAL 1" >>confdefs.h
-
-	;;
- *) as_fn_error $? "--with-writecache parameter invalid" "$LINENO" 5 ;;
-esac
-
-################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include integrity" >&5
-$as_echo_n "checking whether to include integrity... " >&6; }
-
-# Check whether --with-integrity was given.
-if test "${with_integrity+set}" = set; then :
-  withval=$with_integrity; INTEGRITY=$withval
-else
-  INTEGRITY="internal"
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTEGRITY" >&5
-$as_echo "$INTEGRITY" >&6; }
-
-case "$INTEGRITY" in
- none) ;;
- internal)
-
-$as_echo "#define INTEGRITY_INTERNAL 1" >>confdefs.h
-
-	;;
- *) as_fn_error $? "--with-integrity parameter invalid" "$LINENO" 5 ;;
-esac
-
 ################################################################################
 # Check whether --enable-readline was given.
 if test "${enable_readline+set}" = set; then :
@@ -9809,15 +9711,6 @@ else
 fi


-################################################################################
-# Check whether --enable-editline was given.
-if test "${enable_editline+set}" = set; then :
-  enableval=$enable_editline; EDITLINE=$enableval
-else
-  EDITLINE=no
-fi
-
-
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable realtime support" >&5
 $as_echo_n "checking whether to enable realtime support... " >&6; }
@@ -11030,97 +10923,6 @@ $as_echo "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
 	BUILD_LVMLOCKD=yes
 fi

-################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockddlmcontrol" >&5
-$as_echo_n "checking whether to build lvmlockddlmcontrol... " >&6; }
-# Check whether --enable-lvmlockd-dlmcontrol was given.
-if test "${enable_lvmlockd_dlmcontrol+set}" = set; then :
-  enableval=$enable_lvmlockd_dlmcontrol; LOCKDDLM_CONTROL=$enableval
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM_CONTROL" >&5
-$as_echo "$LOCKDDLM_CONTROL" >&6; }
-
-BUILD_LOCKDDLM_CONTROL=$LOCKDDLM_CONTROL
-
-if test "$BUILD_LOCKDDLM_CONTROL" = yes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM_CONTROL" >&5
-$as_echo_n "checking for LOCKD_DLM_CONTROL... " >&6; }
-
-if test -n "$LOCKD_DLM_CONTROL_CFLAGS"; then
-    pkg_cv_LOCKD_DLM_CONTROL_CFLAGS="$LOCKD_DLM_CONTROL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdlmcontrol >= 3.2") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LOCKD_DLM_CONTROL_CFLAGS=`$PKG_CONFIG --cflags "libdlmcontrol >= 3.2" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LOCKD_DLM_CONTROL_LIBS"; then
-    pkg_cv_LOCKD_DLM_CONTROL_LIBS="$LOCKD_DLM_CONTROL_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdlmcontrol >= 3.2") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LOCKD_DLM_CONTROL_LIBS=`$PKG_CONFIG --libs "libdlmcontrol >= 3.2" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
-        else
-	        LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LOCKD_DLM_CONTROL_PKG_ERRORS" >&5
-
-	$bailout
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	$bailout
-else
-	LOCKD_DLM_CONTROL_CFLAGS=$pkg_cv_LOCKD_DLM_CONTROL_CFLAGS
-	LOCKD_DLM_CONTROL_LIBS=$pkg_cv_LOCKD_DLM_CONTROL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_LOCKD_DLM_CONTROL=yes
-fi
-
-$as_echo "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h
-
-	BUILD_LVMLOCKD=yes
-fi
-
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockd" >&5
 $as_echo_n "checking whether to build lvmlockd... " >&6; }
@@ -11836,6 +11638,7 @@ fi
 ################################################################################

 if test "$BUILD_LVMDBUSD" = yes; then
+	unset PYTHON PYTHON_CONFIG
 	unset am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_platform
 	unset am_cv_python_pythondir am_cv_python_version am_cv_python_pyexecdir
 	unset ac_cv_path_PYTHON_CONFIG ac_cv_path_ac_pt_PYTHON_CONFIG
@@ -11845,7 +11648,6 @@ if test "$BUILD_LVMDBUSD" = yes; then



-
        if test -n "$PYTHON"; then
      # If the user set $PYTHON, use it and don't search something else.
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3" >&5
@@ -11881,7 +11683,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
  $as_echo_n "(cached) " >&6
 else

-	for am_cv_pathless_PYTHON in  python3 python2 python 	python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 	python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0  none; do
+	for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -12710,61 +12512,6 @@ fi

 fi

-################################################################################
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKZEROOUT in sys/ioctl.h." >&5
-$as_echo_n "checking for BLKZEROOUT in sys/ioctl.h.... " >&6; }
-if ${ac_cv_have_blkzeroout+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/ioctl.h>
-#include <linux/fs.h>
-int bar(void) { return ioctl(0, BLKZEROOUT, 0); }
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_have_blkzeroout=yes
-else
-  ac_cv_have_blkzeroout=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_blkzeroout" >&5
-$as_echo "$ac_cv_have_blkzeroout" >&6; }
-
-
-# Check whether --enable-blkzeroout was given.
-if test "${enable_blkzeroout+set}" = set; then :
-  enableval=$enable_blkzeroout; BLKZEROOUT=$enableval
-else
-  BLKZEROOUT=yes
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use BLKZEROOUT for device zeroing" >&5
-$as_echo_n "checking whether to use BLKZEROOUT for device zeroing... " >&6; }
-if test "$BLKZEROOUT" = yes; then
-	if test $ac_cv_have_blkzeroout = yes; then :
-
-$as_echo "#define HAVE_BLKZEROOUT 1" >>confdefs.h
-
-else
-  BLKZEROOUT=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLKZEROOUT" >&5
-$as_echo "$BLKZEROOUT" >&6; }
-
-
 ################################################################################
 RT_LIBS=
 HAVE_REALTIME=no
@@ -12885,86 +12632,6 @@ fi
 done


-################################################################################
-if test "$EDITLINE" == yes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDITLINE" >&5
-$as_echo_n "checking for EDITLINE... " >&6; }
-
-if test -n "$EDITLINE_CFLAGS"; then
-    pkg_cv_EDITLINE_CFLAGS="$EDITLINE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EDITLINE_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$EDITLINE_LIBS"; then
-    pkg_cv_EDITLINE_LIBS="$EDITLINE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EDITLINE_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        EDITLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
-        else
-	        EDITLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$EDITLINE_PKG_ERRORS" >&5
-
-	as_fn_error $? "libedit could not be found which is required for the --enable-readline option." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "libedit could not be found which is required for the --enable-readline option." "$LINENO" 5
-
-else
-	EDITLINE_CFLAGS=$pkg_cv_EDITLINE_CFLAGS
-	EDITLINE_LIBS=$pkg_cv_EDITLINE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
-$as_echo "#define EDITLINE_SUPPORT 1" >>confdefs.h
-
-fi
-fi
-
 ################################################################################
 if test "$READLINE" != no; then
 	lvm_saved_libs=$LIBS
@@ -13403,28 +13070,6 @@ $as_echo_n "checking whether to enable readline... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
 $as_echo "$READLINE" >&6; }

-if test "$EDITLINE" = yes; then
-	for ac_header in editline/readline.h editline/history.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  hard_bailout
-fi
-
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable editline" >&5
-$as_echo_n "checking whether to enable editline... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EDITLINE" >&5
-$as_echo "$EDITLINE" >&6; }
-
 if test "$BUILD_CMIRRORD" = yes; then
 	for ac_func in atexit
 do :
@@ -13772,7 +13417,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF


-LVMCONFIG_PATH="$SBINDIR/lvmconfig"
+LVMCONFIG_PATH="$$BINDIR/lvmconfig"

 cat >>confdefs.h <<_ACEOF
 #define LVMCONFIG_PATH "$LVMCONFIG_PATH"
@@ -13915,6 +13560,21 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF


+################################################################################
+
+# Check whether --with-default-data-alignment was given.
+if test "${with_default_data_alignment+set}" = set; then :
+  withval=$with_default_data_alignment; DEFAULT_DATA_ALIGNMENT=$withval
+else
+  DEFAULT_DATA_ALIGNMENT=1
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_DATA_ALIGNMENT $DEFAULT_DATA_ALIGNMENT
+_ACEOF
+
+
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel interface choice" >&5
 $as_echo_n "checking for kernel interface choice... " >&6; }
@@ -14106,11 +13766,10 @@ _ACEOF



-


 ################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmeventd/plugins/vdo/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/lvm2-pvscan.service scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvmlockd.service scripts/lvmlocks.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmeventd/plugins/vdo/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile"

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14842,7 +14501,6 @@ do
    "libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;;
    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
    "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
-    "scripts/lvm2-pvscan.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2-pvscan.service" ;;
    "scripts/blkdeactivate.sh") CONFIG_FILES="$CONFIG_FILES scripts/blkdeactivate.sh" ;;
    "scripts/blk_availability_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_init_red_hat" ;;
    "scripts/blk_availability_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_systemd_red_hat.service" ;;
@@ -14855,10 +14513,10 @@ do
    "scripts/lvm2_lvmpolld_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmpolld_init_red_hat" ;;
    "scripts/lvm2_lvmpolld_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmpolld_systemd_red_hat.service" ;;
    "scripts/lvm2_lvmpolld_systemd_red_hat.socket") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmpolld_systemd_red_hat.socket" ;;
-    "scripts/lvmlockd.service") CONFIG_FILES="$CONFIG_FILES scripts/lvmlockd.service" ;;
-    "scripts/lvmlocks.service") CONFIG_FILES="$CONFIG_FILES scripts/lvmlocks.service" ;;
+    "scripts/lvm2_lvmlockd_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmlockd_systemd_red_hat.service" ;;
    "scripts/lvm2_monitoring_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_init_red_hat" ;;
    "scripts/lvm2_monitoring_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_monitoring_systemd_red_hat.service" ;;
+    "scripts/lvm2_pvscan_systemd_red_hat@.service") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_pvscan_systemd_red_hat@.service" ;;
    "scripts/lvm2_tmpfiles_red_hat.conf") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_tmpfiles_red_hat.conf" ;;
    "scripts/lvmdump.sh") CONFIG_FILES="$CONFIG_FILES scripts/lvmdump.sh" ;;
    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
@@ -15479,8 +15137,8 @@ $as_echo "$as_me: WARNING: You should install latest cache_check vsn 0.7.0 to us
 fi

 if test -n "$VDO_CONFIGURE_WARN"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!" >&5
-$as_echo "$as_me: WARNING: Unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!" >&5
+$as_echo "$as_me: WARNING: unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!" >&2;}
 fi


--- 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 -Wl,--version-script,.export.sym"
 		# equivalent to -rdynamic
 		ELDFLAGS="-Wl,--export-dynamic"
 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
@@ -42,7 +42,6 @@ case "$host_os" in
 		BUILD_LVMPOLLD=no
 		LOCKDSANLOCK=no
 		LOCKDDLM=no
-		LOCKDDLM_CONTROL=no
 		ODIRECT=yes
 		DM_IOCTLS=yes
 		SELINUX=yes
@@ -51,7 +50,7 @@ case "$host_os" in
 		;;
 	darwin*)
 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
+		CLDFLAGS="$CLDFLAGS"
 		ELDFLAGS=
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
@@ -63,9 +62,6 @@ case "$host_os" in
 		FSADM=no
 		BLKDEACTIVATE=no
 		;;
-	*)
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
-		;;
 esac

 ################################################################################
@@ -145,18 +141,12 @@ AC_TYPE_UINT64_T
 AX_GCC_BUILTIN([__builtin_clz])
 AX_GCC_BUILTIN([__builtin_clzll])

-
-AC_DEFINE([_GNU_SOURCE], 1, [Define to get access to GNU/Linux extension])
-AC_DEFINE([_REENTRANT], 1, [Define to use re-entrant thread safe versions])
-
-
 ################################################################################
 dnl -- Check for functions
 AC_CHECK_FUNCS([ftruncate gethostname getpagesize gettimeofday localtime_r \
-  memchr memset mkdir mkfifo munmap nl_langinfo pselect realpath rmdir setenv \
+  memchr memset mkdir mkfifo munmap nl_langinfo realpath rmdir setenv \
  setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \
  strrchr strspn strstr strtol strtoul uname], , [AC_MSG_ERROR(bailing out)])
-AC_CHECK_FUNCS([prlimit])
 AC_FUNC_ALLOCA
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_CHOWN
@@ -607,7 +597,7 @@ AC_MSG_CHECKING(whether to include vdo)
 AC_ARG_WITH(vdo,
 	    AC_HELP_STRING([--with-vdo=TYPE],
 			   [vdo support: internal/none [internal]]),
-			   VDO=$withval, VDO="internal")
+			   VDO=$withval, VDO="none")

 AC_MSG_RESULT($VDO)

@@ -649,54 +639,12 @@ AC_DEFINE_UNQUOTED([VDO_FORMAT_CMD], ["$VDO_FORMAT_CMD"],
 #                           VDO_LIB=$withval, VDO_LIB="/usr/lib") 
 #AC_MSG_RESULT($VDO_LIB)

-################################################################################
-dnl -- writecache inclusion type
-AC_MSG_CHECKING(whether to include writecache)
-AC_ARG_WITH(writecache,
-	    AC_HELP_STRING([--with-writecache=TYPE],
-			   [writecache support: internal/none [internal]]),
-			   WRITECACHE=$withval, WRITECACHE="internal")
-
-AC_MSG_RESULT($WRITECACHE)
-
-case "$WRITECACHE" in
- none) ;;
- internal) 
-	AC_DEFINE([WRITECACHE_INTERNAL], 1, [Define to 1 to include built-in support for writecache.])
-	;;
- *) AC_MSG_ERROR([--with-writecache parameter invalid]) ;;
-esac
-
-################################################################################
-dnl -- integrity inclusion type
-AC_MSG_CHECKING(whether to include integrity)
-AC_ARG_WITH(integrity,
-	    AC_HELP_STRING([--with-integrity=TYPE],
-			   [integrity support: internal/none [internal]]),
-			   INTEGRITY=$withval, INTEGRITY="internal")
-
-AC_MSG_RESULT($INTEGRITY)
-
-case "$INTEGRITY" in
- none) ;;
- internal)
-	AC_DEFINE([INTEGRITY_INTERNAL], 1, [Define to 1 to include built-in support for integrity.])
-	;;
- *) AC_MSG_ERROR([--with-integrity parameter invalid]) ;;
-esac
-
 ################################################################################
 dnl -- Disable readline
 AC_ARG_ENABLE([readline],
 	      AC_HELP_STRING([--disable-readline], [disable readline support]),
 	      READLINE=$enableval, READLINE=maybe)

-################################################################################
-dnl -- Disable editline
-AC_ARG_ENABLE([editline],
-	      AC_HELP_STRING([--enable-editline], [enable editline support]),
-	      EDITLINE=$enableval, EDITLINE=no)
-
 ################################################################################
 dnl -- Disable realtime clock support
 AC_MSG_CHECKING(whether to enable realtime support)
@@ -740,7 +688,7 @@ dnl -- Set up pidfile and run directory
 AH_TEMPLATE(DEFAULT_PID_DIR)
 AC_ARG_WITH(default-pid-dir,
 	    AC_HELP_STRING([--with-default-pid-dir=PID_DIR],
-			   [default directory to keep PID files in [autodetect]]),
+			   [Default directory to keep PID files in. [autodetect]]),
 	    DEFAULT_PID_DIR="$withval", DEFAULT_PID_DIR=$RUN_DIR)
 AC_DEFINE_UNQUOTED(DEFAULT_PID_DIR, ["$DEFAULT_PID_DIR"],
 		   [Default directory to keep PID files in.])
@@ -748,7 +696,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_PID_DIR, ["$DEFAULT_PID_DIR"],
 AH_TEMPLATE(DEFAULT_DM_RUN_DIR, [Name of default DM run directory.])
 AC_ARG_WITH(default-dm-run-dir,
 	    AC_HELP_STRING([--with-default-dm-run-dir=DM_RUN_DIR],
-			   [default DM run directory [autodetect]]),
+			   [ Default DM run directory. [autodetect]]),
 	    DEFAULT_DM_RUN_DIR="$withval", DEFAULT_DM_RUN_DIR=$RUN_DIR)
 AC_DEFINE_UNQUOTED(DEFAULT_DM_RUN_DIR, ["$DEFAULT_DM_RUN_DIR"],
 		   [Default DM run directory.])
@@ -756,7 +704,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_DM_RUN_DIR, ["$DEFAULT_DM_RUN_DIR"],
 AH_TEMPLATE(DEFAULT_RUN_DIR, [Name of default LVM run directory.])
 AC_ARG_WITH(default-run-dir,
 	    AC_HELP_STRING([--with-default-run-dir=RUN_DIR],
-			   [default LVM run directory [autodetect_run_dir/lvm]]),
+			   [Default LVM run directory. [autodetect_run_dir/lvm]]),
 	    DEFAULT_RUN_DIR="$withval", DEFAULT_RUN_DIR="$RUN_DIR/lvm")
 AC_DEFINE_UNQUOTED(DEFAULT_RUN_DIR, ["$DEFAULT_RUN_DIR"],
 		   [Default LVM run directory.])
@@ -942,24 +890,6 @@ if test "$BUILD_LOCKDDLM" = yes; then
 	BUILD_LVMLOCKD=yes
 fi

-################################################################################
-dnl -- Build lvmlockddlmcontrol
-AC_MSG_CHECKING(whether to build lvmlockddlmcontrol)
-AC_ARG_ENABLE(lvmlockd-dlmcontrol,
-	      AC_HELP_STRING([--enable-lvmlockd-dlmcontrol],
-			     [enable lvmlockd remote refresh using libdlmcontrol]),
-	      LOCKDDLM_CONTROL=$enableval)
-AC_MSG_RESULT($LOCKDDLM_CONTROL)
-
-BUILD_LOCKDDLM_CONTROL=$LOCKDDLM_CONTROL
-
-dnl -- Look for libdlmcontrol libraries
-if test "$BUILD_LOCKDDLM_CONTROL" = yes; then
-	PKG_CHECK_MODULES(LOCKD_DLM_CONTROL, libdlmcontrol >= 3.2, [HAVE_LOCKD_DLM_CONTROL=yes], $bailout)
-	AC_DEFINE([LOCKDDLM_CONTROL_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd dlm control option.])
-	BUILD_LVMLOCKD=yes
-fi
-
 ################################################################################
 dnl -- Build lvmlockd
 AC_MSG_CHECKING(whether to build lvmlockd)
@@ -1221,12 +1151,10 @@ AS_IF([test "$NOTIFYDBUS_SUPPORT" = yes && test "BUILD_LVMDBUSD" = yes],
 dnl -- Enable Python dbus library

 if test "$BUILD_LVMDBUSD" = yes; then
+	unset PYTHON PYTHON_CONFIG
 	unset am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_platform
 	unset am_cv_python_pythondir am_cv_python_version am_cv_python_pyexecdir
 	unset ac_cv_path_PYTHON_CONFIG ac_cv_path_ac_pt_PYTHON_CONFIG
-	m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[ python3 python2 python dnl
-	python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl
-	python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ])
 	AM_PATH_PYTHON([3])
 	PYTHON3=$PYTHON
 	test -z "$PYTHON3" && AC_MSG_ERROR([python3 is required for --enable-python3_bindings or --enable-dbus-service but cannot be found])
@@ -1354,33 +1282,6 @@ if test "$SELINUX" = yes; then
 		HAVE_SELINUX=no ])
 fi

-################################################################################
-dnl -- Check BLKZEROOUT support
-
-AC_CACHE_CHECK([for BLKZEROOUT in sys/ioctl.h.],
-	[ac_cv_have_blkzeroout],
-	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[#include <sys/ioctl.h>
-#include <linux/fs.h>
-int bar(void) { return ioctl(0, BLKZEROOUT, 0); }]
-	 )], [ac_cv_have_blkzeroout=yes], [ac_cv_have_blkzeroout=no])])
-
-
-AC_ARG_ENABLE(blkzeroout,
-	      AC_HELP_STRING([--disable-blkzeroout],
-			     [do not use BLKZEROOUT for device zeroing]),
-	      BLKZEROOUT=$enableval, BLKZEROOUT=yes)
-
-AC_MSG_CHECKING(whether to use BLKZEROOUT for device zeroing)
-if test "$BLKZEROOUT" = yes; then
-	AC_IF_YES(ac_cv_have_blkzeroout,
-		  AC_DEFINE(HAVE_BLKZEROOUT, 1,
-			    [Define if ioctl BLKZEROOUT can be used for device zeroing.]),
-		  BLKZEROOUT=no)
-fi
-AC_MSG_RESULT($BLKZEROOUT)
-
-
 ################################################################################
 dnl -- Check for realtime clock support
 RT_LIBS=
@@ -1414,16 +1315,6 @@ AC_IF_YES(ac_cv_stat_st_ctim,
 dnl -- Check for getopt
 AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))

-################################################################################
-dnl -- Check for editline
-if test "$EDITLINE" == yes; then
-	PKG_CHECK_MODULES([EDITLINE], [libedit], [
-		AC_DEFINE([EDITLINE_SUPPORT], 1,
-			[Define to 1 to include the LVM editline shell.])], AC_MSG_ERROR(
-[libedit could not be found which is required for the --enable-readline option.])
-	)
-fi
-
 ################################################################################
 dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
 if test "$READLINE" != no; then
@@ -1556,12 +1447,6 @@ fi
 AC_MSG_CHECKING(whether to enable readline)
 AC_MSG_RESULT($READLINE)

-if test "$EDITLINE" = yes; then
-	AC_CHECK_HEADERS(editline/readline.h editline/history.h,,hard_bailout)
-fi
-AC_MSG_CHECKING(whether to enable editline)
-AC_MSG_RESULT($EDITLINE)
-
 if test "$BUILD_CMIRRORD" = yes; then
 	AC_CHECK_FUNCS(atexit,,hard_bailout)
 fi
@@ -1609,7 +1494,7 @@ SBINDIR="$(eval echo $(eval echo $sbindir))"
 LVM_PATH="$SBINDIR/lvm"
 AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])

-LVMCONFIG_PATH="$SBINDIR/lvmconfig"
+LVMCONFIG_PATH="$$BINDIR/lvmconfig"
 AC_DEFINE_UNQUOTED(LVMCONFIG_PATH, ["$LVMCONFIG_PATH"], [Path to lvmconfig binary.])

 USRSBINDIR="$(eval echo $(eval echo $usrsbindir))"
@@ -1692,6 +1577,15 @@ AC_ARG_WITH(default-locking-dir,
 AC_DEFINE_UNQUOTED(DEFAULT_LOCK_DIR, ["$DEFAULT_LOCK_DIR"],
 		   [Name of default locking directory.])

+################################################################################
+dnl -- Setup default data alignment
+AC_ARG_WITH(default-data-alignment,
+	    AC_HELP_STRING([--with-default-data-alignment=NUM],
+			   [set the default data alignment in MiB [1]]),
+	    DEFAULT_DATA_ALIGNMENT=$withval, DEFAULT_DATA_ALIGNMENT=1)
+AC_DEFINE_UNQUOTED(DEFAULT_DATA_ALIGNMENT, [$DEFAULT_DATA_ALIGNMENT],
+		   [Default data alignment.])
+
 ################################################################################
 dnl -- which kernel interface to use (ioctl only)
 AC_MSG_CHECKING(for kernel interface choice)
@@ -1732,7 +1626,6 @@ AC_SUBST(BUILD_LVMPOLLD)
 AC_SUBST(BUILD_LVMLOCKD)
 AC_SUBST(BUILD_LOCKDSANLOCK)
 AC_SUBST(BUILD_LOCKDDLM)
-AC_SUBST(BUILD_LOCKDDLM_CONTROL)
 AC_SUBST(BUILD_DMFILEMAPD)
 AC_SUBST(CACHE)
 AC_SUBST(CFLAGS)
@@ -1753,6 +1646,7 @@ AC_SUBST(DEBUG)
 AC_SUBST(DEFAULT_ARCHIVE_SUBDIR)
 AC_SUBST(DEFAULT_BACKUP_SUBDIR)
 AC_SUBST(DEFAULT_CACHE_SUBDIR)
+AC_SUBST(DEFAULT_DATA_ALIGNMENT)
 AC_SUBST(DEFAULT_DM_RUN_DIR)
 AC_SUBST(DEFAULT_LOCK_DIR)
 AC_SUBST(DEFAULT_MIRROR_SEGTYPE)
@@ -1817,7 +1711,6 @@ AC_SUBST(QUORUM_CFLAGS)
 AC_SUBST(QUORUM_LIBS)
 AC_SUBST(RT_LIBS)
 AC_SUBST(READLINE_LIBS)
-AC_SUBST(EDITLINE_LIBS)
 AC_SUBST(REPLICATORS)
 AC_SUBST(SACKPT_CFLAGS)
 AC_SUBST(SACKPT_LIBS)
@@ -1914,7 +1807,6 @@ libdm/dm-tools/Makefile
 libdm/libdevmapper.pc
 man/Makefile
 po/Makefile
-scripts/lvm2-pvscan.service
 scripts/blkdeactivate.sh
 scripts/blk_availability_init_red_hat
 scripts/blk_availability_systemd_red_hat.service
@@ -1927,10 +1819,10 @@ scripts/lvm2_lvmdbusd_systemd_red_hat.service
 scripts/lvm2_lvmpolld_init_red_hat
 scripts/lvm2_lvmpolld_systemd_red_hat.service
 scripts/lvm2_lvmpolld_systemd_red_hat.socket
-scripts/lvmlockd.service
-scripts/lvmlocks.service
+scripts/lvm2_lvmlockd_systemd_red_hat.service
 scripts/lvm2_monitoring_init_red_hat
 scripts/lvm2_monitoring_systemd_red_hat.service
+scripts/lvm2_pvscan_systemd_red_hat@.service
 scripts/lvm2_tmpfiles_red_hat.conf
 scripts/lvmdump.sh
 scripts/Makefile
@@ -1953,7 +1845,7 @@ AS_IF([test -n "$CACHE_CHECK_VERSION_WARN"],
      [AC_MSG_WARN([You should install latest cache_check vsn 0.7.0 to use lvm2 cache metadata format 2])])

 AS_IF([test -n "$VDO_CONFIGURE_WARN"],
-      [AC_MSG_WARN([Unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!])])
+      [AC_MSG_WARN([unrecognized 'vdoformat' tool is REQUIRED for VDO logical volume creation!])])


 AS_IF([test "$ODIRECT" != yes],
--- a/coverity/coverity_model.c
+++ b/coverity/coverity_model.c
@@ -46,7 +46,6 @@ const char *find_config_tree_str(struct cmd_context *cmd, int id, struct profile
 	return "STRING";
 }

-/*
 struct logical_volume *origin_from_cow(const struct logical_volume *lv)
 {
 	if (lv)
@@ -54,7 +53,6 @@ struct logical_volume *origin_from_cow(const struct logical_volume *lv)

 	__coverity_panic__();
 }
-*/

 /* simple_memccpy() from glibc */
 void *memccpy(void *dest, const void *src, int c, size_t n)
--- a/daemons/cmirrord/Makefile.in
+++ b/daemons/cmirrord/Makefile.in
@@ -28,11 +28,9 @@ LMLIBS += $(CPG_LIBS)
 CFLAGS += $(CPG_CFLAGS) $(EXTRA_EXEC_CFLAGS)
 LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)

-cmirrord: $(OBJECTS)
-	@echo "    [CC] $@"
-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
-		$(LMLIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS)
+cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
+		$(LVMLIBS) $(LMLIBS) $(INTERNAL_LIBS) $(LIBS)

 install: $(TARGETS)
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord
+	$(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord
--- a/daemons/cmirrord/cluster.c
+++ b/daemons/cmirrord/cluster.c
@@ -17,7 +17,6 @@
 #include "link_mon.h"
 #include "local.h"
 #include "lib/mm/xlate.h"
-#include "base/memory/zalloc.h"

 /* FIXME: remove this and the code */
 #define CMIRROR_HAS_CHECKPOINT 0
@@ -403,12 +402,13 @@ static struct checkpoint_data *prepare_checkpoint(struct clog_cpg *entry,
 		return NULL;
 	}

-	new = zalloc(sizeof(*new));
+	new = malloc(sizeof(*new));
 	if (!new) {
 		LOG_ERROR("Unable to create checkpoint data for %u",
 			  cp_requester);
 		return NULL;
 	}
+	memset(new, 0, sizeof(*new));
 	new->requester = cp_requester;
 	strncpy(new->uuid, entry->name.value, entry->name.length);

@@ -643,12 +643,13 @@ static int export_checkpoint(struct checkpoint_data *cp)
 	rq_size += RECOVERING_REGION_SECTION_SIZE;
 	rq_size += cp->bitmap_size * 2; /* clean|sync_bits */

-	rq = zalloc(rq_size);
+	rq = malloc(rq_size);
 	if (!rq) {
 		LOG_ERROR("export_checkpoint: "
 			  "Unable to allocate transfer structs");
 		return -ENOMEM;
 	}
+	memset(rq, 0, rq_size);

 	dm_list_init(&rq->u.list);
 	rq->u_rq.request_type = DM_ULOG_CHECKPOINT_READY;
@@ -1620,11 +1621,12 @@ int create_cluster_cpg(char *uuid, uint64_t luid)
 			return -EEXIST;
 		}

-	new = zalloc(sizeof(*new));
+	new = malloc(sizeof(*new));
 	if (!new) {
 		LOG_ERROR("Unable to allocate memory for clog_cpg");
 		return -ENOMEM;
 	}
+	memset(new, 0, sizeof(*new));
 	dm_list_init(&new->list);
 	new->lowest_id = 0xDEAD;
 	dm_list_init(&new->startup_list);
--- a/daemons/cmirrord/cluster.h
+++ b/daemons/cmirrord/cluster.h
@@ -12,8 +12,8 @@
 #ifndef _LVM_CLOG_CLUSTER_H
 #define _LVM_CLOG_CLUSTER_H

-#include "libdm/libdevmapper.h"
-#include "libdm/misc/dm-log-userspace.h"
+#include "device_mapper/misc/dm-log-userspace.h"
+#include "device_mapper/all.h"

 #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */
 #define DM_ULOG_CHECKPOINT_READY 21
--- a/daemons/cmirrord/functions.h
+++ b/daemons/cmirrord/functions.h
@@ -12,8 +12,7 @@
 #ifndef _LVM_CLOG_FUNCTIONS_H
 #define _LVM_CLOG_FUNCTIONS_H

-#include "libdm/libdevmapper.h"
-#include "libdm/misc/dm-log-userspace.h"
+#include "device_mapper/misc/dm-log-userspace.h"
 #include "cluster.h"

 #define LOG_RESUMED   1
--- a/daemons/cmirrord/logging.h
+++ b/daemons/cmirrord/logging.h
@@ -13,6 +13,9 @@
 #ifndef _LVM_CLOG_LOGGING_H
 #define _LVM_CLOG_LOGGING_H

+#define _GNU_SOURCE
+
+#include "configure.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <syslog.h>
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -57,16 +57,14 @@ all: device-mapper
 device-mapper: $(TARGETS)

 CFLAGS_dmeventd.o += $(EXTRA_EXEC_CFLAGS)
-LIBS += $(PTHREAD_LIBS) -L$(top_builddir)/libdm -ldevmapper
+LIBS += $(PTHREAD_LIBS)

 dmeventd: $(LIB_SHARED) dmeventd.o
-	@echo "    [CC] $@"
-	$(Q) $(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \
-		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) -lm
+	$(CC) $(CFLAGS) -L. $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \
+		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(INTERNAL_LIBS) $(LIBS) -lm

 dmeventd.static: $(LIB_STATIC) dmeventd.o
-	@echo "    [CC] $@"
-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
+	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS)

 ifeq ("@PKGCONFIG@", "yes")
@@ -82,28 +80,23 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
 endif

 install_include: $(srcdir)/libdevmapper-event.h
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
+	$(INSTALL_DATA) -D $< $(includedir)/$(<F)

 install_pkgconfig: libdevmapper-event.pc
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper-event.pc
+	$(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper-event.pc

 install_lib_dynamic: install_lib_shared

 install_lib_static: $(LIB_STATIC)
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
+	$(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)

 install_lib: $(INSTALL_LIB_TARGETS)

 install_dmeventd_dynamic: dmeventd
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
+	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

 install_dmeventd_static: dmeventd.static
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
+	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)

 install_dmeventd: $(INSTALL_DMEVENTD_TARGETS)

--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -16,12 +16,14 @@
 * dmeventd - dm event daemon to monitor active mapped devices
 */

+#include "device_mapper/misc/dmlib.h"
+#include "base/memory/zalloc.h"
+#include "device_mapper/misc/dm-logging.h"

-#include "libdevmapper-event.h"
+#include "daemons/dmeventd/libdevmapper-event.h"
 #include "dmeventd.h"

-#include "libdm/misc/dm-logging.h"
-#include "base/memory/zalloc.h"
+#include "tools/tool.h"

 #include <dlfcn.h>
 #include <pthread.h>
@@ -33,8 +35,6 @@
 #include <signal.h>
 #include <arpa/inet.h>		/* for htonl, ntohl */
 #include <fcntl.h>		/* for musl libc */
-#include <unistd.h>
-#include <syslog.h>

 #ifdef __linux__
 /*
@@ -62,6 +62,8 @@

 #endif

+#include <syslog.h>
+
 #define DM_SIGNALED_EXIT  1
 #define DM_SCHEDULED_EXIT 2
 static volatile sig_atomic_t _exit_now = 0;	/* set to '1' when signal is given to exit */
@@ -752,7 +754,7 @@ static void _exit_timeout(void *unused __attribute__((unused)))
 static void *_timeout_thread(void *unused __attribute__((unused)))
 {
 	struct thread_status *thread;
-	struct timespec timeout, real_time;
+	struct timespec timeout;
 	time_t curr_time;
 	int ret;

@@ -763,16 +765,7 @@ static void *_timeout_thread(void *unused __attribute__((unused)))
 	while (!dm_list_empty(&_timeout_registry)) {
 		timeout.tv_sec = 0;
 		timeout.tv_nsec = 0;
-#ifndef HAVE_REALTIME
 		curr_time = time(NULL);
-#else
-		if (clock_gettime(CLOCK_REALTIME, &real_time)) {
-			log_error("Failed to read clock_gettime().");
-			break;
-		}
-		/* 10ms back to the future */
-		curr_time = real_time.tv_sec + ((real_time.tv_nsec > (1000000000 - 10000000)) ? 1 : 0);
-#endif

 		dm_list_iterate_items_gen(thread, &_timeout_registry, timeout_list) {
 			if (thread->next_time <= curr_time) {
@@ -1494,34 +1487,37 @@ static int _client_read(struct dm_event_fifos *fifos,
 		t.tv_usec = 0;
 		ret = select(fifos->client + 1, &fds, NULL, NULL, &t);

-		if (!ret && bytes)
-			continue; /* trying to finish read */
+		if (!ret && !bytes)	/* nothing to read */
+			return 0;

-		if (ret <= 0)	/* nothing to read */
-			goto bad;
+		if (!ret)	/* trying to finish read */
+			continue;
+
+		if (ret < 0)	/* error */
+			return 0;

 		ret = read(fifos->client, buf + bytes, size - bytes);
 		bytes += ret > 0 ? ret : 0;
-		if (!msg->data && (bytes == 2 * sizeof(uint32_t))) {
+		if (header && (bytes == 2 * sizeof(uint32_t))) {
 			msg->cmd = ntohl(header[0]);
+			size = msg->size = ntohl(header[1]);
 			bytes = 0;
-
-			if (!(size = msg->size = ntohl(header[1])))
-				break;
-
-			if (!(buf = msg->data = malloc(msg->size)))
-				goto bad;
+			if (!size)
+				break; /* No data -> error */
+			buf = msg->data = malloc(msg->size);
+			if (!buf)
+				break; /* No mem -> error */
+			header = 0;
 		}
 	}

-	if (bytes == size)
-		return 1;
+	if (bytes != size) {
+		free(msg->data);
+		msg->data = NULL;
+		return 0;
+	}

-bad:
-	free(msg->data);
-	msg->data = NULL;
-
-	return 0;
+	return 1;
 }

 /*
@@ -1751,8 +1747,7 @@ static void _init_thread_signals(void)
 	sigdelset(&my_sigset, SIGHUP);
 	sigdelset(&my_sigset, SIGQUIT);

-	if (pthread_sigmask(SIG_BLOCK, &my_sigset, NULL))
-		log_sys_error("pthread_sigmask", "SIG_BLOCK");
+	pthread_sigmask(SIG_BLOCK, &my_sigset, NULL);
 }

 /*
@@ -2028,8 +2023,8 @@ static int _reinstate_registrations(struct dm_event_fifos *fifos)
 static void _restart_dmeventd(void)
 {
 	struct dm_event_fifos fifos = {
-		.client = -1,
 		.server = -1,
+		.client = -1,
 		/* FIXME Make these either configurable or depend directly on dmeventd_path */
 		.client_path = DM_EVENT_FIFO_CLIENT,
 		.server_path = DM_EVENT_FIFO_SERVER
@@ -2243,8 +2238,7 @@ int main(int argc, char *argv[])

 	_init_thread_signals();

-	if (pthread_mutex_init(&_global_mutex, NULL))
-		exit(EXIT_FAILURE);
+	pthread_mutex_init(&_global_mutex, NULL);

 	if (!_systemd_activation && !_open_fifos(&fifos))
 		exit(EXIT_FIFO_FAILURE);
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -12,11 +12,11 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include "libdevmapper-event.h"
-#include "dmeventd.h"
-#include "libdm/misc/dm-logging.h"
+#include "device_mapper/misc/dmlib.h"
 #include "base/memory/zalloc.h"
-
+#include "device_mapper/misc/dm-logging.h"
+#include "daemons/dmeventd/libdevmapper-event.h"
+#include "dmeventd.h"
 #include "lib/misc/intl.h"

 #include <fcntl.h>
@@ -237,16 +237,16 @@ static int _daemon_read(struct dm_event_fifos *fifos,
 			ret = select(fifos->server + 1, &fds, NULL, NULL, &tval);
 			if (ret < 0 && errno != EINTR) {
 				log_error("Unable to read from event server.");
-				goto bad;
+				return 0;
 			}
 			if ((ret == 0) && (i > 4) && !bytes) {
 				log_error("No input from event server.");
-				goto bad;
+				return 0;
 			}
 		}
 		if (ret < 1) {
 			log_error("Unable to read from event server.");
-			goto bad;
+			return 0;
 		}

 		ret = read(fifos->server, buf + bytes, size);
@@ -255,32 +255,25 @@ static int _daemon_read(struct dm_event_fifos *fifos,
 				continue;

 			log_error("Unable to read from event server.");
-			goto bad;
+			return 0;
 		}

 		bytes += ret;
-		if (!msg->data && (bytes == 2 * sizeof(uint32_t))) {
+		if (header && (bytes == 2 * sizeof(uint32_t))) {
 			msg->cmd = ntohl(header[0]);
+			msg->size = ntohl(header[1]);
+			buf = msg->data = malloc(msg->size);
+			size = msg->size;
 			bytes = 0;
-
-			if (!(size = msg->size = ntohl(header[1])))
-				break;
-
-			if (!(buf = msg->data = malloc(msg->size))) {
-				log_error("Unable to allocate message data.");
-				return 0;
-			}
+			header = 0;
 		}
 	}

-	if (bytes == size)
-		return 1;
-
-bad:
-	free(msg->data);
-	msg->data = NULL;
-
-	return 0;
+	if (bytes != size) {
+		free(msg->data);
+		msg->data = NULL;
+	}
+	return bytes == size;
 }

 /* Write message to daemon. */
@@ -615,8 +608,8 @@ static int _do_event(int cmd, char *dmeventd_path, struct dm_event_daemon_messag
 {
 	int ret;
 	struct dm_event_fifos fifos = {
-		.client = -1,
 		.server = -1,
+		.client = -1,
 		/* FIXME Make these either configurable or depend directly on dmeventd_path */
 		.client_path = DM_EVENT_FIFO_CLIENT,
 		.server_path = DM_EVENT_FIFO_SERVER
--- a/daemons/dmeventd/libdevmapper-event.h
+++ b/daemons/dmeventd/libdevmapper-event.h
@@ -21,7 +21,6 @@
 #ifndef LIB_DMEVENT_H
 #define LIB_DMEVENT_H

-#include <stdarg.h>
 #include <stdint.h>

 /*
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -16,7 +16,6 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

 CLDFLAGS += -L$(top_builddir)/tools
-LIBS += $(DMEVENT_LIBS) $(PTHREAD_LIBS) @LVM2CMD_LIB@

 SOURCES = dmeventd_lvm.c

@@ -25,6 +24,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)

 include $(top_builddir)/make.tmpl

+LIBS += @LVM2CMD_LIB@ $(INTERNAL_LIBS) $(PTHREAD_LIBS)
+
 install_lvm2: install_lib_shared

 install: install_lvm2
--- a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c
+++ b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c
@@ -31,13 +31,6 @@ static pthread_mutex_t _register_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int _register_count = 0;
 static struct dm_pool *_mem_pool = NULL;
 static void *_lvm_handle = NULL;
-static DM_LIST_INIT(_env_registry);
-
-struct env_data {
-	struct dm_list list;
-	const char *cmd;
-	const char *data;
-};

 DM_EVENT_LOG_FN("#lvm")

@@ -71,7 +64,7 @@ int dmeventd_lvm2_init(void)
 	if (!_lvm_handle) {
 		lvm2_log_fn(_lvm2_print_log);

-		if (!(_lvm_handle = lvm2_init_threaded()))
+		if (!(_lvm_handle = lvm2_init()))
 			goto out;

 		/*
@@ -107,7 +100,6 @@ void dmeventd_lvm2_exit(void)
 		lvm2_run(_lvm_handle, "_memlock_dec");
 		dm_pool_destroy(_mem_pool);
 		_mem_pool = NULL;
-		dm_list_init(&_env_registry);
 		lvm2_exit(_lvm_handle);
 		_lvm_handle = NULL;
 		log_debug("lvm plugin exited.");
@@ -132,8 +124,6 @@ int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
 	static char _internal_prefix[] =  "_dmeventd_";
 	char *vg = NULL, *lv = NULL, *layer;
 	int r;
-	struct env_data *env_data;
-	const char *env = NULL;

 	if (!dm_split_lvm_name(mem, device, &vg, &lv, &layer)) {
 		log_error("Unable to determine VG name from %s.",
@@ -147,36 +137,18 @@ int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
 		*layer = '\0';

 	if (!strncmp(cmd, _internal_prefix, sizeof(_internal_prefix) - 1)) {
-		/* check if ENVVAR wasn't already resolved */
-		dm_list_iterate_items(env_data, &_env_registry)
-			if (!strcmp(cmd, env_data->cmd)) {
-				env = env_data->data;
-				break;
-			}
+		dmeventd_lvm2_lock();
+		/* output of internal command passed via env var */
+		if (!dmeventd_lvm2_run(cmd))
+			cmd = NULL;
+		else if ((cmd = getenv(cmd)))
+			cmd = dm_pool_strdup(mem, cmd); /* copy with lock */
+		dmeventd_lvm2_unlock();

-		if (!env) {
-			/* run lvm2 command to find out setting value */
-			dmeventd_lvm2_lock();
-			if (!dmeventd_lvm2_run(cmd) ||
-			    !(env = getenv(cmd))) {
-				dmeventd_lvm2_unlock();
-				log_error("Unable to find configured command.");
-				return 0;
-			}
-			/* output of internal command passed via env var */
-			env = dm_pool_strdup(_mem_pool, env); /* copy with lock */
-			dmeventd_lvm2_unlock();
-			if (!env ||
-			    !(env_data = dm_pool_zalloc(_mem_pool, sizeof(*env_data))) ||
-			    !(env_data->cmd = dm_pool_strdup(_mem_pool, cmd))) {
-				log_error("Unable to allocate env memory.");
-				return 0;
-			}
-			env_data->data = env;
-			/* add to ENVVAR registry */
-			dm_list_add(&_env_registry, &env_data->list);
+		if (!cmd) {
+			log_error("Unable to find configured command.");
+			return 0;
 		}
-		cmd = env;
 	}

 	r = dm_snprintf(buffer, size, "%s %s/%s", cmd, vg, lv);
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -16,8 +16,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
-LIBS += -ldevmapper-event-lvm2

 SOURCES = dmeventd_mirror.c

@@ -30,6 +30,8 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow

 include $(top_builddir)/make.tmpl

+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
+
 install_lvm2: install_dm_plugin

 install: install_lvm2
--- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
+++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
@@ -13,8 +13,8 @@
 */

 #include "lib/misc/lib.h"
-#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
 #include "daemons/dmeventd/libdevmapper-event.h"
+#include "dmeventd_lvm.h"
 #include "lib/activate/activate.h"

 /* FIXME Reformat to 80 char lines. */
--- a/daemons/dmeventd/plugins/raid/Makefile.in
+++ b/daemons/dmeventd/plugins/raid/Makefile.in
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
-LIBS += -ldevmapper-event-lvm2

 SOURCES = dmeventd_raid.c

@@ -29,6 +29,8 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow

 include $(top_builddir)/make.tmpl

+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
+
 install_lvm2: install_dm_plugin

 install: install_lvm2
--- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c
+++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
@@ -13,9 +13,9 @@
 */

 #include "lib/misc/lib.h"
-#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
-#include "daemons/dmeventd/libdevmapper-event.h"
 #include "lib/config/defaults.h"
+#include "dmeventd_lvm.h"
+#include "daemons/dmeventd/libdevmapper-event.h"

 /* Hold enough elements for the mximum number of RAID images */
 #define	RAID_DEVS_ELEMS	((DEFAULT_RAID_MAX_IMAGES + 63) / 64)
@@ -76,17 +76,14 @@ static int _process_raid_event(struct dso_state *state, char *params, const char
 	}

 	if (dead) {
-		/*
-		 * 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->warned && status->insync_regions < status->total_regions) {
-			state->warned = 1;
-			log_warn("WARNING: waiting for resynchronization to finish "
-				 "before initiating repair on RAID device %s.", device);
-			/* Fall through to allow lvconvert to run. */
+		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 */
 		}

 		if (state->failed)
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -16,8 +16,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
-LIBS += -ldevmapper-event-lvm2

 SOURCES = dmeventd_snapshot.c

@@ -26,6 +26,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)

 include $(top_builddir)/make.tmpl

+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
+
 install_lvm2: install_dm_plugin

 install: install_lvm2
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -13,7 +13,7 @@
 */

 #include "lib/misc/lib.h"
-#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
+#include "dmeventd_lvm.h"
 #include "daemons/dmeventd/libdevmapper-event.h"

 #include <sys/sysmacros.h>
@@ -175,7 +175,6 @@ void process_event(struct dm_task *dmt,
 	const char *device = dm_task_get_name(dmt);
 	int percent;
 	struct dm_info info;
-	int ret;

 	/* No longer monitoring, waiting for remove */
 	if (!state->percent_check)
@@ -206,8 +205,7 @@ void process_event(struct dm_task *dmt,
 		/* Maybe configurable ? */
 		_remove(dm_task_get_uuid(dmt));
 #endif
-		if ((ret = pthread_kill(pthread_self(), SIGALRM)) && (ret != ESRCH))
-			log_sys_error("pthread_kill", "self");
+		pthread_kill(pthread_self(), SIGALRM);
 		goto out;
 	}

@@ -215,8 +213,7 @@ void process_event(struct dm_task *dmt,
 		/* TODO eventually recognize earlier when room is enough */
 		log_info("Dropping monitoring of fully provisioned snapshot %s.",
 			 device);
-		if ((ret = pthread_kill(pthread_self(), SIGALRM)) && (ret != ESRCH))
-			log_sys_error("pthread_kill", "self");
+		pthread_kill(pthread_self(), SIGALRM);
 		goto out;
 	}

--- a/daemons/dmeventd/plugins/thin/Makefile.in
+++ b/daemons/dmeventd/plugins/thin/Makefile.in
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
-LIBS += -ldevmapper-event-lvm2

 SOURCES = dmeventd_thin.c

@@ -29,6 +29,8 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow

 include $(top_builddir)/make.tmpl

+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
+
 install_lvm2: install_dm_plugin

 install: install_lvm2
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -13,7 +13,7 @@
 */

 #include "lib/misc/lib.h"
-#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
+#include "dmeventd_lvm.h"
 #include "daemons/dmeventd/libdevmapper-event.h"

 #include <sys/wait.h>
@@ -286,7 +286,7 @@ void process_event(struct dm_task *dmt,
 		if (state->fails++ <= state->max_fails) {
 			log_debug("Postponing frequently failing policy (%u <= %u).",
 				  state->fails - 1, state->max_fails);
-			goto out;
+			return;
 		}
 		if (state->max_fails < MAX_FAILS)
 			state->max_fails <<= 1;
--- a/daemons/dmeventd/plugins/vdo/Makefile.in
+++ b/daemons/dmeventd/plugins/vdo/Makefile.in
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
-LIBS += -ldevmapper-event-lvm2

 SOURCES = dmeventd_vdo.c

@@ -29,6 +29,8 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow

 include $(top_builddir)/make.tmpl

+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
+
 install_lvm2: install_dm_plugin

 install: install_lvm2
--- a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
+++ b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
@@ -13,16 +13,9 @@
 */

 #include "lib/misc/lib.h"
-#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
+#include "dmeventd_lvm.h"
 #include "daemons/dmeventd/libdevmapper-event.h"
-
-/*
- * Use parser from new device_mapper library.
- * Although during compilation we can see dm_vdo_status_parse()
- * in runtime we are linked agains systems libdm 'older' library
- * which does not provide this symbol and plugin fails to load
- */
-#include "device_mapper/vdo/status.c"
+#include "device_mapper/vdo/target.h"

 #include <sys/wait.h>
 #include <stdarg.h>
@@ -252,7 +245,7 @@ void process_event(struct dm_task *dmt,
 		if (state->fails++ <= state->max_fails) {
 			log_debug("Postponing frequently failing policy (%u <= %u).",
 				  state->fails - 1, state->max_fails);
-			goto out;
+			return;
 		}
 		if (state->max_fails < MAX_FAILS)
 			state->max_fails <<= 1;
@@ -260,7 +253,8 @@ void process_event(struct dm_task *dmt,
 	} else
 		state->max_fails = 1; /* Reset on success */

-	if (needs_policy)
+	/* FIXME: ATM nothing can be done, drop 0, once it becomes useful */
+	if (0 && needs_policy)
 		_use_policy(dmt, state);
 out:
 	if (vdop.status)
--- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in
@@ -23,10 +23,11 @@ LVMDBUS_SRCDIR_FILES = \
 	cfg.py \
 	cmdhandler.py \
 	fetch.py \
+	__init__.py \
 	job.py \
 	loader.py \
-	lv.py \
 	main.py \
+	lv.py \
 	manager.py \
 	objectmanager.py \
 	pv.py \
@@ -34,8 +35,7 @@ LVMDBUS_SRCDIR_FILES = \
 	state.py \
 	udevwatch.py \
 	utils.py \
-	vg.py \
-	__init__.py
+	vg.py

 LVMDBUS_BUILDDIR_FILES = \
 	lvmdb.py \
@@ -51,18 +51,17 @@ include $(top_builddir)/make.tmpl
 .PHONY: install_lvmdbusd

 all:
-	$(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)
+	test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)

 install_lvmdbusd:
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_DIR) $(sbindir)
-	$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
-	$(Q) $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir)
-	$(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir))
-	$(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir)
-	$(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
-	$(Q) $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__
-	$(Q) $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co]
+	$(INSTALL_DIR) $(sbindir)
+	$(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
+	$(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir)
+	(cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir))
+	$(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir)
+	PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
+	$(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__
+	$(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co]

 install_lvm2: install_lvmdbusd

--- a/daemons/lvmdbusd/automatedproperties.py
+++ b/daemons/lvmdbusd/automatedproperties.py
@@ -155,7 +155,7 @@ class AutomatedProperties(dbus.service.Object):
 		# through all dbus objects as some don't have a search method, like
 		# 'Manager' object.
 		if not self._ap_search_method:
-			return 0
+			return

 		search = self.lvm_id
 		if search_key:
--- a/daemons/lvmdbusd/cfg.py
+++ b/daemons/lvmdbusd/cfg.py
@@ -47,11 +47,9 @@ BUS_NAME = os.getenv('LVM_DBUS_NAME', 'com.redhat.lvmdbus1')
 BASE_INTERFACE = 'com.redhat.lvmdbus1'
 PV_INTERFACE = BASE_INTERFACE + '.Pv'
 VG_INTERFACE = BASE_INTERFACE + '.Vg'
-VG_VDO_INTERFACE = BASE_INTERFACE + '.VgVdo'
 LV_INTERFACE = BASE_INTERFACE + '.Lv'
 LV_COMMON_INTERFACE = BASE_INTERFACE + '.LvCommon'
 THIN_POOL_INTERFACE = BASE_INTERFACE + '.ThinPool'
-VDO_POOL_INTERFACE = BASE_INTERFACE + '.VdoPool'
 CACHE_POOL_INTERFACE = BASE_INTERFACE + '.CachePool'
 LV_CACHED = BASE_INTERFACE + '.CachedLv'
 SNAPSHOT_INTERFACE = BASE_INTERFACE + '.Snapshot'
@@ -63,7 +61,6 @@ PV_OBJ_PATH = BASE_OBJ_PATH + '/Pv'
 VG_OBJ_PATH = BASE_OBJ_PATH + '/Vg'
 LV_OBJ_PATH = BASE_OBJ_PATH + '/Lv'
 THIN_POOL_PATH = BASE_OBJ_PATH + "/ThinPool"
-VDO_POOL_PATH = BASE_OBJ_PATH + "/VdoPool"
 CACHE_POOL_PATH = BASE_OBJ_PATH + "/CachePool"
 HIDDEN_LV_PATH = BASE_OBJ_PATH + "/HiddenLv"
 MANAGER_OBJ_PATH = BASE_OBJ_PATH + '/Manager'
@@ -74,7 +71,6 @@ pv_id = itertools.count()
 vg_id = itertools.count()
 lv_id = itertools.count()
 thin_id = itertools.count()
-vdo_id = itertools.count()
 cache_pool_id = itertools.count()
 job_id = itertools.count()
 hidden_lv = itertools.count()
@@ -83,9 +79,6 @@ hidden_lv = itertools.count()
 load = None
 event = None

-# Boolean to denote if lvm supports VDO integration
-vdo_support = False
-
 # Global cached state
 db = None

@@ -94,13 +87,3 @@ blackbox = None

 # RequestEntry ctor
 create_request_entry = None
-
-
-def exit_daemon():
-    """
-    Exit the daemon cleanly
-    :return:
-    """
-    if run and loop:
-        run.value = 0
-        loop.quit()
--- a/daemons/lvmdbusd/cmdhandler.py
+++ b/daemons/lvmdbusd/cmdhandler.py
@@ -67,7 +67,7 @@ class LvmFlightRecorder(object):
 		with cmd_lock:
 			if len(self.queue):
 				log_error("LVM dbus flight recorder START")
-				for c in reversed(self.queue):
+				for c in self.queue:
 					log_error(str(c))
 				log_error("LVM dbus flight recorder END")

@@ -217,10 +217,7 @@ def options_to_cli_args(options):
 		else:
 			rc.append("--%s" % k)
 		if v != "":
-			if isinstance(v, int):
-				rc.append(str(int(v)))
-			else:
-				rc.append(str(v))
+			rc.append(str(v))
 	return rc


@@ -266,10 +263,10 @@ def lv_tag(lv_name, add, rm, tag_options):
 	return _tag('lvchange', lv_name, add, rm, tag_options)


-def vg_rename(vg_uuid, new_name, rename_options):
+def vg_rename(vg, new_name, rename_options):
 	cmd = ['vgrename']
 	cmd.extend(options_to_cli_args(rename_options))
-	cmd.extend([vg_uuid, new_name])
+	cmd.extend([vg, new_name])
 	return call(cmd)


@@ -283,7 +280,7 @@ def vg_remove(vg_name, remove_options):
 def vg_lv_create(vg_name, create_options, name, size_bytes, pv_dests):
 	cmd = ['lvcreate']
 	cmd.extend(options_to_cli_args(create_options))
-	cmd.extend(['--size', '%dB' % size_bytes])
+	cmd.extend(['--size', str(size_bytes) + 'B'])
 	cmd.extend(['--name', name, vg_name, '--yes'])
 	pv_dest_ranges(cmd, pv_dests)
 	return call(cmd)
@@ -295,7 +292,7 @@ def vg_lv_snapshot(vg_name, snapshot_options, name, size_bytes):
 	cmd.extend(["-s"])

 	if size_bytes != 0:
-		cmd.extend(['--size', '%dB' % size_bytes])
+		cmd.extend(['--size', str(size_bytes) + 'B'])

 	cmd.extend(['--name', name, vg_name])
 	return call(cmd)
@@ -306,9 +303,9 @@ def _vg_lv_create_common_cmd(create_options, size_bytes, thin_pool):
 	cmd.extend(options_to_cli_args(create_options))

 	if not thin_pool:
-		cmd.extend(['--size', '%dB' % size_bytes])
+		cmd.extend(['--size', str(size_bytes) + 'B'])
 	else:
-		cmd.extend(['--thin', '--size', '%dB' % size_bytes])
+		cmd.extend(['--thin', '--size', str(size_bytes) + 'B'])

 	cmd.extend(['--yes'])
 	return cmd
@@ -323,10 +320,10 @@ def vg_lv_create_linear(vg_name, create_options, name, size_bytes, thin_pool):
 def vg_lv_create_striped(vg_name, create_options, name, size_bytes,
 							num_stripes, stripe_size_kb, thin_pool):
 	cmd = _vg_lv_create_common_cmd(create_options, size_bytes, thin_pool)
-	cmd.extend(['--stripes', str(int(num_stripes))])
+	cmd.extend(['--stripes', str(num_stripes)])

 	if stripe_size_kb != 0:
-		cmd.extend(['--stripesize', str(int(stripe_size_kb))])
+		cmd.extend(['--stripesize', str(stripe_size_kb)])

 	cmd.extend(['--name', name, vg_name])
 	return call(cmd)
@@ -339,13 +336,13 @@ def _vg_lv_create_raid(vg_name, create_options, name, raid_type, size_bytes,
 	cmd.extend(options_to_cli_args(create_options))

 	cmd.extend(['--type', raid_type])
-	cmd.extend(['--size', '%dB' % size_bytes])
+	cmd.extend(['--size', str(size_bytes) + 'B'])

 	if num_stripes != 0:
-		cmd.extend(['--stripes', str(int(num_stripes))])
+		cmd.extend(['--stripes', str(num_stripes)])

 	if stripe_size_kb != 0:
-		cmd.extend(['--stripesize', str(int(stripe_size_kb))])
+		cmd.extend(['--stripesize', str(stripe_size_kb)])

 	cmd.extend(['--name', name, vg_name, '--yes'])
 	return call(cmd)
@@ -366,8 +363,8 @@ def vg_lv_create_mirror(
 	cmd.extend(options_to_cli_args(create_options))

 	cmd.extend(['--type', 'mirror'])
-	cmd.extend(['--mirrors', str(int(num_copies))])
-	cmd.extend(['--size', '%dB' % size_bytes])
+	cmd.extend(['--mirrors', str(num_copies)])
+	cmd.extend(['--size', str(size_bytes) + 'B'])
 	cmd.extend(['--name', name, vg_name, '--yes'])
 	return call(cmd)

@@ -388,24 +385,6 @@ def vg_create_thin_pool(md_full_name, data_full_name, create_options):
 	return call(cmd)


-def vg_create_vdo_pool_lv_and_lv(vg_name, pool_name, lv_name, data_size,
-									virtual_size, create_options):
-	cmd = ['lvcreate']
-	cmd.extend(options_to_cli_args(create_options))
-	cmd.extend(['-y', '--type', 'vdo', '-n', lv_name,
-				'-L', '%dB' % data_size, '-V', '%dB' % virtual_size,
-				"%s/%s" % (vg_name, pool_name)])
-	return call(cmd)
-
-
-def vg_create_vdo_pool(pool_full_name, lv_name, virtual_size, create_options):
-	cmd = ['lvconvert']
-	cmd.extend(options_to_cli_args(create_options))
-	cmd.extend(['--type', 'vdo-pool', '-n', lv_name, '--force', '-y',
-				'-V', '%dB' % virtual_size, pool_full_name])
-	return call(cmd)
-
-
 def lv_remove(lv_path, remove_options):
 	cmd = ['lvremove']
 	cmd.extend(options_to_cli_args(remove_options))
@@ -439,7 +418,7 @@ def lv_resize(lv_full_name, size_change, pv_dests,
 def lv_lv_create(lv_full_name, create_options, name, size_bytes):
 	cmd = ['lvcreate']
 	cmd.extend(options_to_cli_args(create_options))
-	cmd.extend(['--virtualsize', '%dB' % size_bytes, '-T'])
+	cmd.extend(['--virtualsize', str(size_bytes) + 'B', '-T'])
 	cmd.extend(['--name', name, lv_full_name, '--yes'])
 	return call(cmd)

@@ -453,15 +432,6 @@ def lv_cache_lv(cache_pool_full_name, lv_full_name, cache_options):
 	return call(cmd)


-def lv_writecache_lv(cache_lv_full_name, lv_full_name, cache_options):
-	# lvconvert --type writecache --cachevol VG/CacheLV VG/OriginLV
-	cmd = ['lvconvert']
-	cmd.extend(options_to_cli_args(cache_options))
-	cmd.extend(['-y', '--type', 'writecache', '--cachevol',
-				cache_lv_full_name, lv_full_name])
-	return call(cmd)
-
-
 def lv_detach_cache(lv_full_name, detach_options, destroy_cache):
 	cmd = ['lvconvert']
 	if destroy_cache:
@@ -477,28 +447,6 @@ def lv_detach_cache(lv_full_name, detach_options, destroy_cache):
 	return call(cmd)


-def lv_vdo_compression(lv_path, enable, comp_options):
-	cmd = ['lvchange', '--compression']
-	if enable:
-		cmd.append('y')
-	else:
-		cmd.append('n')
-	cmd.extend(options_to_cli_args(comp_options))
-	cmd.append(lv_path)
-	return call(cmd)
-
-
-def lv_vdo_deduplication(lv_path, enable, dedup_options):
-	cmd = ['lvchange', '--deduplication']
-	if enable:
-		cmd.append('y')
-	else:
-		cmd.append('n')
-	cmd.extend(options_to_cli_args(dedup_options))
-	cmd.append(lv_path)
-	return call(cmd)
-
-
 def supports_json():
 	cmd = ['help']
 	rc, out, err = call(cmd)
@@ -511,16 +459,6 @@ def supports_json():
 	return False


-def supports_vdo():
-	cmd = ['segtypes']
-	rc, out, err = call(cmd)
-	if rc == 0:
-		if "vdo" in out:
-			log_debug("We have VDO support")
-			return True
-	return False
-
-
 def lvm_full_report_json():
 	pv_columns = ['pv_name', 'pv_uuid', 'pv_fmt', 'pv_size', 'pv_free',
 					'pv_used', 'dev_size', 'pv_mda_size', 'pv_mda_free',
@@ -548,22 +486,6 @@ def lvm_full_report_json():

 	lv_seg_columns = ['seg_pe_ranges', 'segtype', 'lv_uuid']

-	if cfg.vdo_support:
-		lv_columns.extend(
-			['vdo_operating_mode', 'vdo_compression_state', 'vdo_index_state',
-				'vdo_used_size', 'vdo_saving_percent']
-		)
-
-		lv_seg_columns.extend(
-			['vdo_compression', 'vdo_deduplication',
-				'vdo_use_metadata_hints', 'vdo_minimum_io_size',
-				'vdo_block_map_cache_size', 'vdo_block_map_era_length',
-				'vdo_use_sparse_index', 'vdo_index_memory_size',
-				'vdo_slab_size', 'vdo_ack_threads', 'vdo_bio_threads',
-				'vdo_bio_rotation', 'vdo_cpu_threads', 'vdo_hash_zone_threads',
-				'vdo_logical_threads', 'vdo_physical_threads',
-				'vdo_max_discard', 'vdo_write_policy', 'vdo_header_size'])
-
 	cmd = _dc('fullreport', [
 		'-a',		# Need hidden too
 		'--configreport', 'pv', '-o', ','.join(pv_columns),
@@ -575,8 +497,7 @@ def lvm_full_report_json():
 	])

 	rc, out, err = call(cmd)
-	# When we have an exported vg the exit code of lvs or fullreport will be 5
-	if rc == 0 or rc == 5:
+	if rc == 0:
 		# With the current implementation, if we are using the shell then we
 		# are using JSON and JSON is returned back to us as it was parsed to
 		# figure out if we completed OK or not
@@ -634,7 +555,7 @@ def pv_resize(device, size_bytes, create_options):
 	cmd.extend(options_to_cli_args(create_options))

 	if size_bytes != 0:
-		cmd.extend(['--yes', '--setphysicalvolumesize', '%dB' % size_bytes])
+		cmd.extend(['--yes', '--setphysicalvolumesize', str(size_bytes) + 'B'])

 	cmd.extend([device])
 	return call(cmd)
@@ -730,12 +651,12 @@ def vg_allocation_policy(vg_name, policy, policy_options):


 def vg_max_pv(vg_name, number, max_options):
-	return _vg_value_set(vg_name, ['--maxphysicalvolumes', str(int(number))],
+	return _vg_value_set(vg_name, ['--maxphysicalvolumes', str(number)],
 							max_options)


 def vg_max_lv(vg_name, number, max_options):
-	return _vg_value_set(vg_name, ['-l', str(int(number))], max_options)
+	return _vg_value_set(vg_name, ['-l', str(number)], max_options)


 def vg_uuid_gen(vg_name, ignore, options):
@@ -777,7 +698,6 @@ def activate_deactivate(op, name, activate, control_flags, options):
 		op += 'n'

 	cmd.append(op)
-	cmd.append("-y")
 	cmd.append(name)
 	return call(cmd)

--- a/daemons/lvmdbusd/fetch.py
+++ b/daemons/lvmdbusd/fetch.py
@@ -14,7 +14,6 @@ from . import cfg
 from .utils import MThreadRunner, log_debug, log_error
 import threading
 import queue
-import time
 import traceback


@@ -29,26 +28,11 @@ def _main_thread_load(refresh=True, emit_signal=True):
 		refresh=refresh,
 		emit_signal=emit_signal,
 		cache_refresh=False)[1]
-
-	lv_changes = load_lvs(
+	num_total_changes += load_lvs(
 		refresh=refresh,
 		emit_signal=emit_signal,
 		cache_refresh=False)[1]

-	num_total_changes += lv_changes
-
-	# When the LVs change it can cause another change in the VGs which is
-	# missed if we don't scan through the VGs again.  We could achieve this
-	# the other way and re-scan the LVs, but in general there are more LVs than
-	# VGs, thus this should be more efficient.  This happens when a LV interface
-	# changes causing the dbus object representing it to be removed and
-	# recreated.
-	if refresh and lv_changes > 0:
-		num_total_changes += load_vgs(
-			refresh=refresh,
-			emit_signal=emit_signal,
-			cache_refresh=False)[1]
-
 	return num_total_changes


@@ -98,8 +82,6 @@ class StateUpdate(object):

 	@staticmethod
 	def update_thread(obj):
-		exception_count = 0
-
 		queued_requests = []
 		while cfg.run.value != 0:
 			# noinspection PyBroadException
@@ -154,26 +136,12 @@ class StateUpdate(object):
 				# wake up if we get an exception
 				queued_requests = []

-				# We retrieved OK, clear exception count
-				exception_count = 0
-
 			except queue.Empty:
 				pass
-			except Exception as e:
+			except Exception:
 				st = traceback.format_exc()
 				log_error("update_thread exception: \n%s" % st)
 				cfg.blackbox.dump()
-				exception_count += 1
-				if exception_count >= 5:
-					for i in queued_requests:
-						i.set_result(e)
-
-					log_error("Too many errors in update_thread, exiting daemon")
-					cfg.exit_daemon()
-
-				else:
-					# Slow things down when encountering errors
-					time.sleep(1)

 	def __init__(self):
 		self.lock = threading.RLock()
--- a/daemons/lvmdbusd/lv.py
+++ b/daemons/lvmdbusd/lv.py
@@ -10,22 +10,20 @@
 from .automatedproperties import AutomatedProperties

 from . import utils
-from .utils import vg_obj_path_generate, log_error, _handle_execute
+from .utils import vg_obj_path_generate
 import dbus
 from . import cmdhandler
 from . import cfg
 from .cfg import LV_INTERFACE, THIN_POOL_INTERFACE, SNAPSHOT_INTERFACE, \
-	LV_COMMON_INTERFACE, CACHE_POOL_INTERFACE, LV_CACHED, VDO_POOL_INTERFACE
+	LV_COMMON_INTERFACE, CACHE_POOL_INTERFACE, LV_CACHED
 from .request import RequestEntry
-from .utils import n, n32, d
+from .utils import n, n32
 from .loader import common
 from .state import State
 from . import background
 from .utils import round_size, mt_remove_dbus_objects
 from .job import JobState

-import traceback
-

 # Try and build a key for a LV, so that we sort the LVs with least dependencies
 # first.  This may be error prone because of the flexibility LVM
@@ -74,66 +72,23 @@ def lvs_state_retrieve(selection, cache_refresh=True):
 	lvs = sorted(cfg.db.fetch_lvs(selection), key=get_key)

 	for l in lvs:
-		if cfg.vdo_support:
-			rc.append(LvStateVdo(
-				l['lv_uuid'], l['lv_name'],
-				l['lv_path'], n(l['lv_size']),
-				l['vg_name'],
-				l['vg_uuid'], l['pool_lv_uuid'],
-				l['pool_lv'], l['origin_uuid'], l['origin'],
-				n32(l['data_percent']), l['lv_attr'],
-				l['lv_tags'], l['lv_active'], l['data_lv'],
-				l['metadata_lv'], l['segtype'], l['lv_role'],
-				l['lv_layout'],
-				n32(l['snap_percent']),
-				n32(l['metadata_percent']),
-				n32(l['copy_percent']),
-				n32(l['sync_percent']),
-				n(l['lv_metadata_size']),
-				l['move_pv'],
-				l['move_pv_uuid'],
-				l['vdo_operating_mode'],
-				l['vdo_compression_state'],
-				l['vdo_index_state'],
-				n(l['vdo_used_size']),
-				d(l['vdo_saving_percent']),
-				l['vdo_compression'],
-				l['vdo_deduplication'],
-				l['vdo_use_metadata_hints'],
-				n32(l['vdo_minimum_io_size']),
-				n(l['vdo_block_map_cache_size']),
-				n32(l['vdo_block_map_era_length']),
-				l['vdo_use_sparse_index'],
-				n(l['vdo_index_memory_size']),
-				n(l['vdo_slab_size']),
-				n32(l['vdo_ack_threads']),
-				n32(l['vdo_bio_threads']),
-				n32(l['vdo_bio_rotation']),
-				n32(l['vdo_cpu_threads']),
-				n32(l['vdo_hash_zone_threads']),
-				n32(l['vdo_logical_threads']),
-				n32(l['vdo_physical_threads']),
-				n32(l['vdo_max_discard']),
-				l['vdo_write_policy'],
-				n32(l['vdo_header_size'])))
-		else:
-			rc.append(LvState(
-				l['lv_uuid'], l['lv_name'],
-				l['lv_path'], n(l['lv_size']),
-				l['vg_name'],
-				l['vg_uuid'], l['pool_lv_uuid'],
-				l['pool_lv'], l['origin_uuid'], l['origin'],
-				n32(l['data_percent']), l['lv_attr'],
-				l['lv_tags'], l['lv_active'], l['data_lv'],
-				l['metadata_lv'], l['segtype'], l['lv_role'],
-				l['lv_layout'],
-				n32(l['snap_percent']),
-				n32(l['metadata_percent']),
-				n32(l['copy_percent']),
-				n32(l['sync_percent']),
-				n(l['lv_metadata_size']),
-				l['move_pv'],
-				l['move_pv_uuid']))
+		rc.append(LvState(
+			l['lv_uuid'], l['lv_name'],
+			l['lv_path'], n(l['lv_size']),
+			l['vg_name'],
+			l['vg_uuid'], l['pool_lv_uuid'],
+			l['pool_lv'], l['origin_uuid'], l['origin'],
+			n32(l['data_percent']), l['lv_attr'],
+			l['lv_tags'], l['lv_active'], l['data_lv'],
+			l['metadata_lv'], l['segtype'], l['lv_role'],
+			l['lv_layout'],
+			n32(l['snap_percent']),
+			n32(l['metadata_percent']),
+			n32(l['copy_percent']),
+			n32(l['sync_percent']),
+			n(l['lv_metadata_size']),
+			l['move_pv'],
+			l['move_pv_uuid']))
 	return rc


@@ -237,8 +192,6 @@ class LvState(State):
 	def _object_type_create(self):
 		if self.Attr[0] == 't':
 			return LvThinPool
-		elif self.Attr[0] == 'd':
-			return LvVdoPool
 		elif self.Attr[0] == 'C':
 			if 'pool' in self.layout:
 				return LvCachePool
@@ -265,34 +218,6 @@ class LvState(State):
 		return (klass, path_method)


-class LvStateVdo(LvState):
-
-	def __init__(self, Uuid, Name, Path, SizeBytes,
-					vg_name, vg_uuid, pool_lv_uuid, PoolLv,
-					origin_uuid, OriginLv, DataPercent, Attr, Tags, active,
-					data_lv, metadata_lv, segtypes, role, layout, SnapPercent,
-					MetaDataPercent, CopyPercent, SyncPercent,
-					MetaDataSizeBytes, move_pv, move_pv_uuid,
-					vdo_operating_mode, vdo_compression_state, vdo_index_state,
-					vdo_used_size,vdo_saving_percent,vdo_compression,
-					vdo_deduplication,vdo_use_metadata_hints,
-					vdo_minimum_io_size,vdo_block_map_cache_size,
-					vdo_block_map_era_length,vdo_use_sparse_index,
-					vdo_index_memory_size,vdo_slab_size,vdo_ack_threads,
-					vdo_bio_threads,vdo_bio_rotation,vdo_cpu_threads,
-					vdo_hash_zone_threads,vdo_logical_threads,
-					vdo_physical_threads,vdo_max_discard,
-					vdo_write_policy,vdo_header_size):
-		super(LvStateVdo, self).__init__(Uuid, Name, Path, SizeBytes,
-					vg_name, vg_uuid, pool_lv_uuid, PoolLv,
-					origin_uuid, OriginLv, DataPercent, Attr, Tags, active,
-					data_lv, metadata_lv, segtypes, role, layout, SnapPercent,
-					MetaDataPercent, CopyPercent, SyncPercent,
-					MetaDataSizeBytes, move_pv, move_pv_uuid)
-
-		utils.init_class_from_arguments(self, "vdo_", snake_to_pascal=True)
-
-
 # noinspection PyPep8Naming
@utils.dbus_property(LV_COMMON_INTERFACE, 'Uuid', 's')
@utils.dbus_property(LV_COMMON_INTERFACE, 'Name', 's')
@@ -348,7 +273,13 @@ class LvCommon(AutomatedProperties):

 	@staticmethod
 	def handle_execute(rc, out, err):
-		_handle_execute(rc, out, err, LV_INTERFACE)
+		if rc == 0:
+			cfg.load()
+		else:
+			# Need to work on error handling, need consistent
+			raise dbus.exceptions.DBusException(
+				LV_INTERFACE,
+				'Exit code %s, stderr = %s' % (str(rc), err))

 	@staticmethod
 	def validate_dbus_object(lv_uuid, lv_name):
@@ -360,22 +291,6 @@ class LvCommon(AutomatedProperties):
 				(lv_uuid, lv_name))
 		return dbo

-	def attr_struct(self, index, type_map, default='undisclosed'):
-		try:
-			if self.state.Attr[index] not in type_map:
-				log_error("LV %s %s with lv_attr %s, lv_attr[%d] = "
-					"'%s' is not known" %
-					(self.Uuid, self.Name, self.Attr, index,
-					self.state.Attr[index]))
-
-			return dbus.Struct((self.state.Attr[index],
-				type_map.get(self.state.Attr[index], default)),
-								signature="(ss)")
-		except BaseException:
-			st = traceback.format_exc()
-			log_error("attr_struct: \n%s" % st)
-			return dbus.Struct(('?', 'Unavailable'), signature="(ss)")
-
 	@property
 	def VolumeType(self):
 		type_map = {'C': 'Cache', 'm': 'mirrored',
@@ -388,16 +303,17 @@ class LvCommon(AutomatedProperties):
 					'l': 'mirror log device', 'c': 'under conversion',
 					'V': 'thin Volume', 't': 'thin pool', 'T': 'Thin pool data',
 					'e': 'raid or pool metadata or pool metadata spare',
-					'd': 'vdo pool', 'D': 'vdo pool data', 'g': 'integrity',
 					'-': 'Unspecified'}
-		return self.attr_struct(0, type_map)
+		return dbus.Struct((self.state.Attr[0], type_map[self.state.Attr[0]]),
+						signature="as")

 	@property
 	def Permissions(self):
 		type_map = {'w': 'writable', 'r': 'read-only',
 					'R': 'Read-only activation of non-read-only volume',
 					'-': 'Unspecified'}
-		return self.attr_struct(1, type_map)
+		return dbus.Struct((self.state.Attr[1], type_map[self.state.Attr[1]]),
+						signature="(ss)")

 	@property
 	def AllocationPolicy(self):
@@ -406,7 +322,8 @@ class LvCommon(AutomatedProperties):
 					'i': 'inherited', 'I': 'inherited locked',
 					'l': 'cling', 'L': 'cling locked',
 					'n': 'normal', 'N': 'normal locked', '-': 'Unspecified'}
-		return self.attr_struct(2, type_map)
+		return dbus.Struct((self.state.Attr[2], type_map[self.state.Attr[2]]),
+						signature="(ss)")

 	@property
 	def FixedMinor(self):
@@ -414,20 +331,15 @@ class LvCommon(AutomatedProperties):

 	@property
 	def State(self):
-		type_map = {'a': 'active',
-					's': 'suspended',
-					'I': 'Invalid snapshot',
+		type_map = {'a': 'active', 's': 'suspended', 'I': 'Invalid snapshot',
 					'S': 'invalid Suspended snapshot',
 					'm': 'snapshot merge failed',
 					'M': 'suspended snapshot (M)erge failed',
 					'd': 'mapped device present without  tables',
 					'i': 'mapped device present with inactive table',
-					'h': 'historical',
-					'c': 'check needed suspended thin-pool',
-					'C': 'check needed',
-					'X': 'unknown',
-					'-': 'Unspecified'}
-		return self.attr_struct(4, type_map)
+					'X': 'unknown', '-': 'Unspecified'}
+		return dbus.Struct((self.state.Attr[4], type_map[self.state.Attr[4]]),
+						signature="(ss)")

 	@property
 	def TargetType(self):
@@ -443,18 +355,11 @@ class LvCommon(AutomatedProperties):

 	@property
 	def Health(self):
-		type_map = {'p': 'partial',
-					'r': 'refresh needed',
-					'm': 'mismatches',
-					'w': 'writemostly',
-					'X': 'unknown',
-					'-': 'unspecified',
-					's': 'reshaping',
-					'F': 'failed',
-					'D': 'Data space',
-					'R': 'Remove',
-					'M': 'Metadata'}
-		return self.attr_struct(8, type_map)
+		type_map = {'p': 'partial', 'r': 'refresh',
+					'm': 'mismatches', 'w': 'writemostly',
+					'X': 'X unknown', '-': 'Unspecified'}
+		return dbus.Struct((self.state.Attr[8], type_map[self.state.Attr[8]]),
+					signature="(ss)")

 	@property
 	def SkipActivation(self):
@@ -524,7 +429,8 @@ class Lv(LvCommon):
 		# Make sure we have a dbus object representing it
 		LvCommon.validate_dbus_object(lv_uuid, lv_name)
 		# Remove the LV, if successful then remove from the model
-		LvCommon.handle_execute(*cmdhandler.lv_remove(lv_name, remove_options))
+		rc, out, err = cmdhandler.lv_remove(lv_name, remove_options)
+		LvCommon.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -544,8 +450,9 @@ class Lv(LvCommon):
 		# Make sure we have a dbus object representing it
 		LvCommon.validate_dbus_object(lv_uuid, lv_name)
 		# Rename the logical volume
-		LvCommon.handle_execute(*cmdhandler.lv_rename(lv_name, new_name,
-												rename_options))
+		rc, out, err = cmdhandler.lv_rename(lv_name, new_name,
+											rename_options)
+		LvCommon.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -594,11 +501,13 @@ class Lv(LvCommon):
 				remainder = space % 512
 				optional_size = space + 512 - remainder

-		LvCommon.handle_execute(*cmdhandler.vg_lv_snapshot(
-			lv_name, snapshot_options,name, optional_size))
+		rc, out, err = cmdhandler.vg_lv_snapshot(
+			lv_name, snapshot_options, name, optional_size)
+		LvCommon.handle_execute(rc, out, err)
 		full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
 		return cfg.om.get_object_path_by_lvm_id(full_name)

+
 	@dbus.service.method(
 		dbus_interface=LV_INTERFACE,
 		in_signature='stia{sv}',
@@ -634,8 +543,9 @@ class Lv(LvCommon):
 				pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))

 		size_change = new_size_bytes - dbo.SizeBytes
-		LvCommon.handle_execute(*cmdhandler.lv_resize(
-			dbo.lvm_id, size_change,pv_dests, resize_options))
+		rc, out, err = cmdhandler.lv_resize(dbo.lvm_id, size_change,
+											pv_dests, resize_options)
+		LvCommon.handle_execute(rc, out, err)
 		return "/"

 	@dbus.service.method(
@@ -670,8 +580,9 @@ class Lv(LvCommon):
 								options):
 		# Make sure we have a dbus object representing it
 		LvCommon.validate_dbus_object(uuid, lv_name)
-		LvCommon.handle_execute(*cmdhandler.activate_deactivate(
-			'lvchange', lv_name, activate, control_flags, options))
+		rc, out, err = cmdhandler.activate_deactivate(
+			'lvchange', lv_name, activate, control_flags, options)
+		LvCommon.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -705,8 +616,9 @@ class Lv(LvCommon):
 	def _add_rm_tags(uuid, lv_name, tags_add, tags_del, tag_options):
 		# Make sure we have a dbus object representing it
 		LvCommon.validate_dbus_object(uuid, lv_name)
-		LvCommon.handle_execute(*cmdhandler.lv_tag(
-			lv_name, tags_add, tags_del, tag_options))
+		rc, out, err = cmdhandler.lv_tag(
+			lv_name, tags_add, tags_del, tag_options)
+		LvCommon.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -743,152 +655,6 @@ class Lv(LvCommon):
 			cb, cbe, return_tuple=False)
 		cfg.worker_q.put(r)

-	@staticmethod
-	def _writecache_lv(lv_uuid, lv_name, lv_object_path, cache_options):
-		# Make sure we have a dbus object representing it
-		dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
-
-		# Make sure we have dbus object representing lv to cache
-		lv_to_cache = cfg.om.get_object_by_path(lv_object_path)
-
-		if lv_to_cache:
-			fcn = lv_to_cache.lv_full_name()
-			rc, out, err = cmdhandler.lv_writecache_lv(
-				dbo.lv_full_name(), fcn, cache_options)
-			if rc == 0:
-				# When we cache an LV, the cache pool and the lv that is getting
-				# cached need to be removed from the object manager and
-				# re-created as their interfaces have changed!
-				mt_remove_dbus_objects((dbo, lv_to_cache))
-				cfg.load()
-
-				lv_converted = cfg.om.get_object_path_by_lvm_id(fcn)
-			else:
-				raise dbus.exceptions.DBusException(
-					LV_INTERFACE,
-					'Exit code %s, stderr = %s' % (str(rc), err))
-		else:
-			raise dbus.exceptions.DBusException(
-				LV_INTERFACE, 'LV to cache with object path %s not present!' %
-				lv_object_path)
-		return lv_converted
-
-	@dbus.service.method(
-		dbus_interface=LV_INTERFACE,
-		in_signature='oia{sv}',
-		out_signature='(oo)',
-		async_callbacks=('cb', 'cbe'))
-	def WriteCacheLv(self, lv_object, tmo, cache_options, cb, cbe):
-		r = RequestEntry(
-			tmo, Lv._writecache_lv,
-			(self.Uuid, self.lvm_id, lv_object,
-			cache_options), cb, cbe)
-		cfg.worker_q.put(r)
-
-
-# noinspection PyPep8Naming
-@utils.dbus_property(VDO_POOL_INTERFACE, 'OperatingMode', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'CompressionState', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'IndexState', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'UsedSize', 't')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'SavingPercent', 'd')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'Compression', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'Deduplication', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'UseMetadataHints', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'MinimumIoSize', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'BlockMapCacheSize', "t")
-@utils.dbus_property(VDO_POOL_INTERFACE, 'BlockMapEraLength', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'UseSparseIndex', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'IndexMemorySize', 't')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'SlabSize', 't')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'AckThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'BioThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'BioRotation', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'CpuThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'HashZoneThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'LogicalThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'PhysicalThreads', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'MaxDiscard', 'u')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'WritePolicy', 's')
-@utils.dbus_property(VDO_POOL_INTERFACE, 'HeaderSize', 'u')
-class LvVdoPool(Lv):
-	_DataLv_meta = ("o", VDO_POOL_INTERFACE)
-
-	def __init__(self, object_path, object_state):
-		super(LvVdoPool, self).__init__(object_path, object_state)
-		self.set_interface(VDO_POOL_INTERFACE)
-		self._data_lv, _ = self._get_data_meta()
-
-	@property
-	def DataLv(self):
-		return dbus.ObjectPath(self._data_lv)
-
-	@staticmethod
-	def _enable_disable_compression(pool_uuid, pool_name, enable, comp_options):
-		# Make sure we have a dbus object representing it
-		LvCommon.validate_dbus_object(pool_uuid, pool_name)
-		# Rename the logical volume
-		LvCommon.handle_execute(*cmdhandler.lv_vdo_compression(
-			pool_name, enable, comp_options))
-		return '/'
-
-	@dbus.service.method(
-		dbus_interface=VDO_POOL_INTERFACE,
-		in_signature='ia{sv}',
-		out_signature='o',
-		async_callbacks=('cb', 'cbe'))
-	def EnableCompression(self, tmo, comp_options, cb, cbe):
-		r = RequestEntry(
-			tmo, LvVdoPool._enable_disable_compression,
-			(self.Uuid, self.lvm_id, True, comp_options),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-
-	@dbus.service.method(
-	dbus_interface=VDO_POOL_INTERFACE,
-	in_signature='ia{sv}',
-	out_signature='o',
-	async_callbacks=('cb', 'cbe'))
-	def DisableCompression(self, tmo, comp_options, cb, cbe):
-		r = RequestEntry(
-			tmo, LvVdoPool._enable_disable_compression,
-			(self.Uuid, self.lvm_id, False, comp_options),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-
-	@staticmethod
-	def _enable_disable_deduplication(pool_uuid, pool_name, enable, dedup_options):
-		# Make sure we have a dbus object representing it
-		LvCommon.validate_dbus_object(pool_uuid, pool_name)
-		# Rename the logical volume
-		LvCommon.handle_execute(*cmdhandler.lv_vdo_deduplication(
-			pool_name, enable, dedup_options))
-		return '/'
-
-	@dbus.service.method(
-		dbus_interface=VDO_POOL_INTERFACE,
-		in_signature='ia{sv}',
-		out_signature='o',
-		async_callbacks=('cb', 'cbe'))
-	def EnableDeduplication(self, tmo, dedup_options, cb, cbe):
-		r = RequestEntry(
-			tmo, LvVdoPool._enable_disable_deduplication,
-			(self.Uuid, self.lvm_id, True, dedup_options),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-
-	@dbus.service.method(
-	dbus_interface=VDO_POOL_INTERFACE,
-	in_signature='ia{sv}',
-	out_signature='o',
-	async_callbacks=('cb', 'cbe'))
-	def DisableDeduplication(self, tmo, dedup_options, cb, cbe):
-		r = RequestEntry(
-			tmo, LvVdoPool._enable_disable_deduplication,
-			(self.Uuid, self.lvm_id, False, dedup_options),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-

 # noinspection PyPep8Naming
 class LvThinPool(Lv):
@@ -912,8 +678,10 @@ class LvThinPool(Lv):
 	def _lv_create(lv_uuid, lv_name, name, size_bytes, create_options):
 		# Make sure we have a dbus object representing it
 		dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
-		LvCommon.handle_execute(*cmdhandler.lv_lv_create(
-			lv_name, create_options, name, size_bytes))
+
+		rc, out, err = cmdhandler.lv_lv_create(
+			lv_name, create_options, name, size_bytes)
+		LvCommon.handle_execute(rc, out, err)
 		full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
 		return cfg.om.get_object_path_by_lvm_id(full_name)

--- a/daemons/lvmdbusd/lvm_shell_proxy.py.in
+++ b/daemons/lvmdbusd/lvm_shell_proxy.py.in
@@ -220,10 +220,7 @@ class LVMShellProxy(object):

 		# Parse the report to see what happened
 		if 'log' in report_json:
-			ret_code = int(report_json['log'][-1:][0]['log_ret_code'])
-			# If we have an exported vg we get a log_ret_code == 5 when
-			# we do a 'fullreport'
-			if (ret_code == 1) or (ret_code == 5 and argv[0] == 'fullreport'):
+			if report_json['log'][-1:][0]['log_ret_code'] == '1':
 				rc = 0
 			else:
 				error_msg = self.get_error_msg()
--- a/daemons/lvmdbusd/lvmdb.py.in
+++ b/daemons/lvmdbusd/lvmdb.py.in
@@ -20,7 +20,7 @@ from lvmdbusd.utils import log_debug, log_error


 class DataStore(object):
-	def __init__(self, usejson=True, vdo_support=False):
+	def __init__(self, usejson=True):
 		self.pvs = {}
 		self.vgs = {}
 		self.lvs = {}
@@ -43,8 +43,6 @@ class DataStore(object):
 		else:
 			self.json = usejson

-		self.vdo_support = vdo_support
-
 	@staticmethod
 	def _insert_record(table, key, record, allowed_multiple):
 		if key in table:
@@ -143,22 +141,13 @@ class DataStore(object):

 	@staticmethod
 	def _parse_vgs(_vgs):
-		vgs = sorted(_vgs, key=lambda vk: vk['vg_uuid'])
+		vgs = sorted(_vgs, key=lambda vk: vk['vg_name'])

 		c_vgs = OrderedDict()
 		c_lookup = {}

 		for i in vgs:
-			vg_name = i['vg_name']
-
-			# Lvm allows duplicate vg names.  When this occurs, each subsequent
-			# matching VG name will be called vg_name:vg_uuid.  Note: ':' is an
-			# invalid character for lvm VG names
-			if vg_name in c_lookup:
-				vg_name = "%s:%s" % (vg_name, i['vg_uuid'])
-				i['vg_name'] = vg_name
-
-			c_lookup[vg_name] = i['vg_uuid']
+			c_lookup[i['vg_name']] = i['vg_uuid']
 			DataStore._insert_record(c_vgs, i['vg_uuid'], i, [])

 		return c_vgs, c_lookup
@@ -173,22 +162,13 @@ class DataStore(object):
 				tmp_vg.extend(r['vg'])

 		# Sort for consistent output, however this is optional
-		vgs = sorted(tmp_vg, key=lambda vk: vk['vg_uuid'])
+		vgs = sorted(tmp_vg, key=lambda vk: vk['vg_name'])

 		c_vgs = OrderedDict()
 		c_lookup = {}

 		for i in vgs:
-			vg_name = i['vg_name']
-
-			# Lvm allows duplicate vg names.  When this occurs, each subsequent
-			# matching VG name will be called vg_name:vg_uuid.  Note: ':' is an
-			# invalid character for lvm VG names
-			if vg_name in c_lookup:
-				vg_name = "%s:%s" % (vg_name, i['vg_uuid'])
-				i['vg_name'] = vg_name
-
-			c_lookup[vg_name] = i['vg_uuid']
+			c_lookup[i['vg_name']] = i['vg_uuid']
 			c_vgs[i['vg_uuid']] = i

 		return c_vgs, c_lookup
@@ -243,7 +223,8 @@ class DataStore(object):

 		return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup)

-	def _parse_lvs_json(self, _all):
+	@staticmethod
+	def _parse_lvs_json(_all):

 		c_lvs = OrderedDict()
 		c_lv_full_lookup = {}
@@ -263,13 +244,8 @@ class DataStore(object):
 				if 'seg' in r:
 					for s in r['seg']:
 						r = c_lvs[s['lv_uuid']]
-						r.setdefault('seg_pe_ranges', []).\
-							append(s['seg_pe_ranges'])
+						r.setdefault('seg_pe_ranges', []).append(s['seg_pe_ranges'])
 						r.setdefault('segtype', []).append(s['segtype'])
-						if self.vdo_support:
-							for seg_key, seg_val in s.items():
-								if seg_key.startswith("vdo_"):
-									r[seg_key] = seg_val

 		return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup)

@@ -545,10 +521,6 @@ if __name__ == "__main__":
 	for v in ds.vgs.values():
 		pp.pprint(v)

-	print("VG name to UUID")
-	for k, v in ds.vg_name_to_uuid.items():
-		print("%s: %s" % (k, v))
-
 	print("LVS")
 	for v in ds.lvs.values():
 		pp.pprint(v)
--- a/daemons/lvmdbusd/main.py
+++ b/daemons/lvmdbusd/main.py
@@ -29,7 +29,7 @@ from .utils import log_debug, log_error
 import argparse
 import os
 import sys
-from .cmdhandler import LvmFlightRecorder, supports_vdo
+from .cmdhandler import LvmFlightRecorder
 from .request import RequestEntry


@@ -44,10 +44,10 @@ def process_request():
 		try:
 			req = cfg.worker_q.get(True, 5)
 			log_debug(
-				"Method start: %s with args %s (callback = %s)" %
-				(str(req.method), str(req.arguments), str(req.cb)))
+				"Running method: %s with args %s" %
+				(str(req.method), str(req.arguments)))
 			req.run_cmd()
-			log_debug("Method complete: %s" % str(req.method))
+			log_debug("Method complete ")
 		except queue.Empty:
 			pass
 		except Exception:
@@ -127,14 +127,6 @@ def main():
 		log_error("You cannot specify --lvmshell and --nojson")
 		sys.exit(1)

-	# We will dynamically add interfaces which support vdo if it
-	# exists.
-	cfg.vdo_support = supports_vdo()
-
-	if cfg.vdo_support and not cfg.args.use_json:
-		log_error("You cannot specify --nojson when lvm has VDO support")
-		sys.exit(1)
-
 	# List of threads that we start up
 	thread_list = []

@@ -155,12 +147,12 @@ def main():
 	cfg.om = Lvm(BASE_OBJ_PATH)
 	cfg.om.register_object(Manager(MANAGER_OBJ_PATH))

-	cfg.db = lvmdb.DataStore(cfg.args.use_json, cfg.vdo_support)
+	cfg.db = lvmdb.DataStore(cfg.args.use_json)

 	# Using a thread to process requests, we cannot hang the dbus library
 	# thread that is handling the dbus interface
-	thread_list.append(
-		threading.Thread(target=process_request, name='process_request'))
+	thread_list.append(threading.Thread(target=process_request,
+										name='process_request'))

 	# Have a single thread handling updating lvm and the dbus model so we
 	# don't have multiple threads doing this as the same time
--- a/daemons/lvmdbusd/manager.py
+++ b/daemons/lvmdbusd/manager.py
@@ -27,7 +27,7 @@ class Manager(AutomatedProperties):

 	@property
 	def Version(self):
-		return dbus.String('1.1.0')
+		return dbus.String('1.0.0')

 	@staticmethod
 	def handle_execute(rc, out, err):
@@ -107,10 +107,10 @@ class Manager(AutomatedProperties):
 		rc = cfg.load(log=False)

 		if rc != 0:
-			utils.log_debug('Manager.Refresh - exit %d %d' % (rc, lc),
+			utils.log_debug('Manager.Refresh - exit %d' % (rc),
 							'bg_black', 'fg_light_red')
 		else:
-			utils.log_debug('Manager.Refresh - exit %d %d' % (rc, lc))
+			utils.log_debug('Manager.Refresh - exit %d' % (rc))
 		return rc + lc

 	@dbus.service.method(
@@ -164,8 +164,6 @@ class Manager(AutomatedProperties):
 		return the object path in O(1) time.

 		:param key: The lookup value
-		:param cb:	dbus python call back parameter, not client visible
-		:param cbe:	dbus python error call back parameter, not client visible
 		:return: Return the object path.  If object not found you will get '/'
 		"""
 		r = RequestEntry(-1, Manager._lookup_by_lvm_id, (key,), cb, cbe, False)
--- a/daemons/lvmdbusd/objectmanager.py
+++ b/daemons/lvmdbusd/objectmanager.py
@@ -189,8 +189,8 @@ class ObjectManager(AutomatedProperties):
 			path = dbus_object.dbus_object_path()
 			interfaces = dbus_object.interface()

-			# print('UN-Registering object path %s for %s' %
-			#		(path, dbus_object.lvm_id))
+			# print 'UN-Registering object path %s for %s' % \
+			#      (path, dbus_object.lvm_id)

 			self._lookup_remove(path)

@@ -240,19 +240,39 @@ class ObjectManager(AutomatedProperties):
 				return lookup_rc
 			return '/'

-	def _id_verify(self, path, uuid, lvm_id):
+	def _uuid_verify(self, path, uuid, lvm_id):
 		"""
-		Ensure our lookups are correct
+		Ensure uuid is present for a successful lvm_id lookup
 		NOTE: Internal call, assumes under object manager lock
 		:param path: 		Path to object we looked up
-		:param uuid: 		uuid lookup
-		:param lvm_id:		lvm_id lookup
+		:param uuid: 		lvm uuid to verify
+		:param lvm_id:		lvm_id used to find object
 		:return: None
 		"""
-		# There is no durable non-changeable name in lvm
+		# This gets called when we found an object based on lvm_id, ensure
+		# uuid is correct too, as they can change. There is no durable
+		# non-changeable name in lvm
 		if lvm_id != uuid:
-			obj = self.get_object_by_path(path)
-			self._lookup_add(obj, path, lvm_id, uuid)
+			if uuid and uuid not in self._id_to_object_path:
+				obj = self.get_object_by_path(path)
+				self._lookup_add(obj, path, lvm_id, uuid)
+
+	def _lvm_id_verify(self, path, uuid, lvm_id):
+		"""
+		Ensure lvm_id is present for a successful uuid lookup
+		NOTE: Internal call, assumes under object manager lock
+		:param path: 		Path to object we looked up
+		:param uuid: 		uuid used to find object
+		:param lvm_id:		lvm_id to verify
+		:return: None
+		"""
+		# This gets called when we found an object based on uuid, ensure
+		# lvm_id is correct too, as they can change.  There is no durable
+		# non-changeable name in lvm
+		if lvm_id != uuid:
+			if lvm_id and lvm_id not in self._id_to_object_path:
+				obj = self.get_object_by_path(path)
+				self._lookup_add(obj, path, lvm_id, uuid)

 	def _id_lookup(self, the_id):
 		path = None
@@ -319,22 +339,22 @@ class ObjectManager(AutomatedProperties):
 				# Lets check for the uuid first
 				path = self._id_lookup(uuid)
 				if path:
-					# Ensure table lookups are correct
-					self._id_verify(path, uuid, lvm_id)
+					# Verify the lvm_id is sane
+					self._lvm_id_verify(path, uuid, lvm_id)
 				else:
 					# Unable to find by UUID, lets lookup by lvm_id
 					path = self._id_lookup(lvm_id)
 					if path:
-						# Ensure table lookups are correct
-						self._id_verify(path, uuid, lvm_id)
+						# Verify the uuid is sane
+						self._uuid_verify(path, uuid, lvm_id)
 					else:
 						# We have exhausted all lookups, let's create if we can
 						if path_create:
 							path = path_create()
 							self._lookup_add(None, path, lvm_id, uuid)

-			# print('get_object_path_by_lvm_id(%s, %s, %s): return %s' %
-			#	(uuid, lvm_id, str(path_create), path))
+			# print('get_object_path_by_lvm_id(%s, %s, %s, %s: return %s' %
+			# 	   (uuid, lvm_id, str(path_create), str(gen_new), path))

 			return path

--- a/daemons/lvmdbusd/pv.py
+++ b/daemons/lvmdbusd/pv.py
@@ -14,7 +14,7 @@ import dbus
 from .cfg import PV_INTERFACE
 from . import cmdhandler
 from .utils import vg_obj_path_generate, n, pv_obj_path_generate, \
-	lv_object_path_method, _handle_execute
+	lv_object_path_method
 from .loader import common
 from .request import RequestEntry
 from .state import State
@@ -138,12 +138,19 @@ class Pv(AutomatedProperties):
 		# Remove the PV, if successful then remove from the model
 		# Make sure we have a dbus object representing it
 		Pv.validate_dbus_object(pv_uuid, pv_name)
-		Pv.handle_execute(*cmdhandler.pv_remove(pv_name, remove_options))
+		rc, out, err = cmdhandler.pv_remove(pv_name, remove_options)
+		Pv.handle_execute(rc, out, err)
 		return '/'

 	@staticmethod
 	def handle_execute(rc, out, err):
-		return _handle_execute(rc, out, err, PV_INTERFACE)
+		if rc == 0:
+			cfg.load()
+		else:
+			# Need to work on error handling, need consistent
+			raise dbus.exceptions.DBusException(
+				PV_INTERFACE,
+				'Exit code %s, stderr = %s' % (str(rc), err))

 	@staticmethod
 	def validate_dbus_object(pv_uuid, pv_name):
@@ -171,8 +178,10 @@ class Pv(AutomatedProperties):
 	def _resize(pv_uuid, pv_name, new_size_bytes, resize_options):
 		# Make sure we have a dbus object representing it
 		Pv.validate_dbus_object(pv_uuid, pv_name)
-		Pv.handle_execute(*cmdhandler.pv_resize(pv_name, new_size_bytes,
-												resize_options))
+
+		rc, out, err = cmdhandler.pv_resize(pv_name, new_size_bytes,
+												resize_options)
+		Pv.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -191,8 +200,9 @@ class Pv(AutomatedProperties):
 	def _allocation_enabled(pv_uuid, pv_name, yes_no, allocation_options):
 		# Make sure we have a dbus object representing it
 		Pv.validate_dbus_object(pv_uuid, pv_name)
-		Pv.handle_execute(*cmdhandler.pv_allocatable(pv_name, yes_no,
-														allocation_options))
+		rc, out, err = cmdhandler.pv_allocatable(
+			pv_name, yes_no, allocation_options)
+		Pv.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
--- a/daemons/lvmdbusd/utils.py
+++ b/daemons/lvmdbusd/utils.py
@@ -26,15 +26,6 @@ import signal
 STDOUT_TTY = os.isatty(sys.stdout.fileno())


-def _handle_execute(rc, out, err, interface):
-	if rc == 0:
-		cfg.load()
-	else:
-		# Need to work on error handling, need consistent
-		raise dbus.exceptions.DBusException(
-			interface, 'Exit code %s, stderr = %s' % (str(rc), err))
-
-
 def rtype(dbus_type):
 	"""
 	Decorator making sure that the decorated function returns a value of
@@ -66,20 +57,8 @@ def n32(v):
 	return int(float(v))


-@rtype(dbus.Double)
-def d(v):
-	if not v:
-		return 0.0
-	return float(v)
-
-
-def _snake_to_pascal(s):
-	return ''.join(x.title() for x in s.split('_'))
-
-
 # noinspection PyProtectedMember
-def init_class_from_arguments(
-		obj_instance, begin_suffix=None, snake_to_pascal=False):
+def init_class_from_arguments(obj_instance):
 	for k, v in list(sys._getframe(1).f_locals.items()):
 		if k != 'self':
 			nt = k
@@ -90,17 +69,8 @@ def init_class_from_arguments(
 			cur = getattr(obj_instance, nt, v)

 			# print 'Init class %s = %s' % (nt, str(v))
-			if not (cur and len(str(cur)) and (v is None or len(str(v))) == 0)\
-					and (begin_suffix is None or nt.startswith(begin_suffix)):
-
-				if begin_suffix and nt.startswith(begin_suffix):
-					name = nt[len(begin_suffix):]
-					if snake_to_pascal:
-						name = _snake_to_pascal(name)
-
-					setattr(obj_instance, name, v)
-				else:
-					setattr(obj_instance, nt, v)
+			if not (cur and len(str(cur)) and (v is None or len(str(v))) == 0):
+				setattr(obj_instance, nt, v)


 def get_properties(f):
@@ -368,8 +338,6 @@ def lv_object_path_method(name, meta):
 		return _hidden_lv_obj_path_generate
 	elif meta[0][0] == 't':
 		return _thin_pool_obj_path_generate
-	elif meta[0][0] == 'd':
-		return _vdo_pool_object_path_generate
 	elif meta[0][0] == 'C' and 'pool' in meta[1]:
 		return _cache_pool_obj_path_generate

@@ -387,10 +355,6 @@ def _thin_pool_obj_path_generate():
 	return cfg.THIN_POOL_PATH + "/%d" % next(cfg.thin_id)


-def _vdo_pool_object_path_generate():
-	return cfg.VDO_POOL_PATH + "/%d" % next(cfg.vdo_id)
-
-
 def _cache_pool_obj_path_generate():
 	return cfg.CACHE_POOL_PATH + "/%d" % next(cfg.cache_pool_id)

@@ -482,7 +446,7 @@ _ALLOWABLE_CH_SET = set(_ALLOWABLE_CH)
 _ALLOWABLE_VG_LV_CH = string.ascii_letters + string.digits + '.-_+'
 _ALLOWABLE_VG_LV_CH_SET = set(_ALLOWABLE_VG_LV_CH)
 _LV_NAME_RESERVED = ("_cdata", "_cmeta", "_corig", "_mimage", "_mlog",
-	"_pmspare", "_rimage", "_rmeta", "_tdata", "_tmeta", "_vorigin", "_vdata")
+	"_pmspare", "_rimage", "_rmeta", "_tdata", "_tmeta", "_vorigin")

 # Tags can have the characters, based on the code
 # a-zA-Z0-9._-+/=!:&#
--- a/daemons/lvmdbusd/vg.py
+++ b/daemons/lvmdbusd/vg.py
@@ -10,11 +10,10 @@
 from .automatedproperties import AutomatedProperties

 from . import utils
-from .utils import pv_obj_path_generate, vg_obj_path_generate, n, \
-	_handle_execute
+from .utils import pv_obj_path_generate, vg_obj_path_generate, n
 import dbus
 from . import cfg
-from .cfg import VG_INTERFACE, VG_VDO_INTERFACE
+from .cfg import VG_INTERFACE
 from . import cmdhandler
 from .request import RequestEntry
 from .loader import common
@@ -47,29 +46,24 @@ def vgs_state_retrieve(selection, cache_refresh=True):

 def load_vgs(vg_specific=None, object_path=None, refresh=False,
 		emit_signal=False, cache_refresh=True):
-	return common(vgs_state_retrieve, (Vg, VgVdo, ), vg_specific, object_path, refresh,
+	return common(vgs_state_retrieve, (Vg,), vg_specific, object_path, refresh,
 					emit_signal, cache_refresh)


 # noinspection PyPep8Naming,PyUnresolvedReferences,PyUnusedLocal
 class VgState(State):
-
-	@property
-	def internal_name(self):
-		return self.Name
-
 	@property
 	def lvm_id(self):
-		return self.internal_name
+		return self.Name

 	def identifiers(self):
-		return (self.Uuid, self.internal_name)
+		return (self.Uuid, self.Name)

 	def _lv_paths_build(self):
 		rc = []
 		for lv in cfg.db.lvs_in_vg(self.Uuid):
 			(lv_name, meta, lv_uuid) = lv
-			full_name = "%s/%s" % (self.internal_name, lv_name)
+			full_name = "%s/%s" % (self.Name, lv_name)

 			gen = utils.lv_object_path_method(lv_name, meta)

@@ -98,12 +92,8 @@ class VgState(State):
 	def create_dbus_object(self, path):
 		if not path:
 			path = cfg.om.get_object_path_by_uuid_lvm_id(
-				self.Uuid, self.internal_name, vg_obj_path_generate)
-
-		if cfg.vdo_support:
-			return VgVdo(path, self)
-		else:
-			return Vg(path, self)
+				self.Uuid, self.Name, vg_obj_path_generate)
+		return Vg(path, self)

 	# noinspection PyMethodMayBeStatic
 	def creation_signature(self):
@@ -112,6 +102,7 @@ class VgState(State):

 # noinspection PyPep8Naming
@utils.dbus_property(VG_INTERFACE, 'Uuid', 's')
+@utils.dbus_property(VG_INTERFACE, 'Name', 's')
@utils.dbus_property(VG_INTERFACE, 'Fmt', 's')
@utils.dbus_property(VG_INTERFACE, 'SizeBytes', 't', 0)
@utils.dbus_property(VG_INTERFACE, 'FreeBytes', 't', 0)
@@ -144,7 +135,6 @@ class Vg(AutomatedProperties):
 	_AllocNormal_meta = ('b', VG_INTERFACE)
 	_AllocAnywhere_meta = ('b', VG_INTERFACE)
 	_Clustered_meta = ('b', VG_INTERFACE)
-	_Name_meta = ('s', VG_INTERFACE)

 	# noinspection PyUnusedLocal,PyPep8Naming
 	def __init__(self, object_path, object_state):
@@ -159,7 +149,13 @@ class Vg(AutomatedProperties):

 	@staticmethod
 	def handle_execute(rc, out, err):
-		return _handle_execute(rc, out, err, VG_INTERFACE)
+		if rc == 0:
+			cfg.load()
+		else:
+			# Need to work on error handling, need consistent
+			raise dbus.exceptions.DBusException(
+				VG_INTERFACE,
+				'Exit code %s, stderr = %s' % (str(rc), err))

 	@staticmethod
 	def validate_dbus_object(vg_uuid, vg_name):
@@ -175,8 +171,9 @@ class Vg(AutomatedProperties):
 	def _rename(uuid, vg_name, new_name, rename_options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_rename(
-			uuid, new_name, rename_options))
+		rc, out, err = cmdhandler.vg_rename(
+			vg_name, new_name, rename_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -195,7 +192,8 @@ class Vg(AutomatedProperties):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
 		# Remove the VG, if successful then remove from the model
-		Vg.handle_execute(*cmdhandler.vg_remove(vg_name, remove_options))
+		rc, out, err = cmdhandler.vg_remove(vg_name, remove_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -211,13 +209,14 @@ class Vg(AutomatedProperties):
 	@staticmethod
 	def _change(uuid, vg_name, change_options):
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_change(change_options, vg_name))
+		rc, out, err = cmdhandler.vg_change(change_options, vg_name)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	# TODO: This should be broken into a number of different methods
 	# instead of having one method that takes a hash for parameters.  Some of
 	# the changes that vgchange does works on entire system, not just a
-	# specific vg, thus that should be in the Manager interface.
+	# specfic vg, thus that should be in the Manager interface.
 	@dbus.service.method(
 		dbus_interface=VG_INTERFACE,
 		in_signature='ia{sv}',
@@ -247,8 +246,9 @@ class Vg(AutomatedProperties):
 						VG_INTERFACE,
 						'PV Object path not found = %s!' % pv_op)

-		Vg.handle_execute(*cmdhandler.vg_reduce(
-			vg_name, missing, pv_devices, reduce_options))
+		rc, out, err = cmdhandler.vg_reduce(vg_name, missing, pv_devices,
+											reduce_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -278,8 +278,9 @@ class Vg(AutomatedProperties):
 					VG_INTERFACE, 'PV Object path not found = %s!' % i)

 		if len(extend_devices):
-			Vg.handle_execute(*cmdhandler.vg_extend(
-				vg_name, extend_devices, extend_options))
+			rc, out, err = cmdhandler.vg_extend(vg_name, extend_devices,
+												extend_options)
+			Vg.handle_execute(rc, out, err)
 		else:
 			raise dbus.exceptions.DBusException(
 				VG_INTERFACE, 'No pv_object_paths provided!')
@@ -333,8 +334,10 @@ class Vg(AutomatedProperties):

 				pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))

-		Vg.handle_execute(*cmdhandler.vg_lv_create(
-			vg_name, create_options, name, size_bytes, pv_dests))
+		rc, out, err = cmdhandler.vg_lv_create(
+			vg_name, create_options, name, size_bytes, pv_dests)
+
+		Vg.handle_execute(rc, out, err)
 		return Vg.fetch_new_lv(vg_name, name)

 	@dbus.service.method(
@@ -372,8 +375,11 @@ class Vg(AutomatedProperties):
 			thin_pool, create_options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_lv_create_linear(
-			vg_name, create_options, name, size_bytes, thin_pool))
+
+		rc, out, err = cmdhandler.vg_lv_create_linear(
+			vg_name, create_options, name, size_bytes, thin_pool)
+
+		Vg.handle_execute(rc, out, err)
 		return Vg.fetch_new_lv(vg_name, name)

 	@dbus.service.method(
@@ -395,9 +401,10 @@ class Vg(AutomatedProperties):
 			stripe_size_kb, thin_pool, create_options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_lv_create_striped(
+		rc, out, err = cmdhandler.vg_lv_create_striped(
 			vg_name, create_options, name, size_bytes,
-			num_stripes, stripe_size_kb, thin_pool))
+			num_stripes, stripe_size_kb, thin_pool)
+		Vg.handle_execute(rc, out, err)
 		return Vg.fetch_new_lv(vg_name, name)

 	@dbus.service.method(
@@ -422,8 +429,9 @@ class Vg(AutomatedProperties):
 			num_copies, create_options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_lv_create_mirror(
-			vg_name, create_options, name, size_bytes, num_copies))
+		rc, out, err = cmdhandler.vg_lv_create_mirror(
+			vg_name, create_options, name, size_bytes, num_copies)
+		Vg.handle_execute(rc, out, err)
 		return Vg.fetch_new_lv(vg_name, name)

 	@dbus.service.method(
@@ -446,9 +454,10 @@ class Vg(AutomatedProperties):
 						num_stripes, stripe_size_kb, create_options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_lv_create_raid(
+		rc, out, err = cmdhandler.vg_lv_create_raid(
 			vg_name, create_options, name, raid_type, size_bytes,
-			num_stripes, stripe_size_kb))
+			num_stripes, stripe_size_kb)
+		Vg.handle_execute(rc, out, err)
 		return Vg.fetch_new_lv(vg_name, name)

 	@dbus.service.method(
@@ -546,8 +555,9 @@ class Vg(AutomatedProperties):
 				raise dbus.exceptions.DBusException(
 					VG_INTERFACE, 'PV object path = %s not found' % p)

-		Vg.handle_execute(*cmdhandler.pv_tag(
-			pv_devices, tags_add, tags_del, tag_options))
+		rc, out, err = cmdhandler.pv_tag(
+			pv_devices, tags_add, tags_del, tag_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -588,8 +598,9 @@ class Vg(AutomatedProperties):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)

-		Vg.handle_execute(*cmdhandler.vg_tag(
-			vg_name, tags_add, tags_del, tag_options))
+		rc, out, err = cmdhandler.vg_tag(
+			vg_name, tags_add, tags_del, tag_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -628,7 +639,8 @@ class Vg(AutomatedProperties):
 	def _vg_change_set(uuid, vg_name, method, value, options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*method(vg_name, value, options))
+		rc, out, err = method(vg_name, value, options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -688,8 +700,9 @@ class Vg(AutomatedProperties):
 								options):
 		# Make sure we have a dbus object representing it
 		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.activate_deactivate(
-			'vgchange', vg_name, activate, control_flags, options))
+		rc, out, err = cmdhandler.activate_deactivate(
+			'vgchange', vg_name, activate, control_flags, options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -716,12 +729,6 @@ class Vg(AutomatedProperties):
 				cb, cbe, return_tuple=False)
 		cfg.worker_q.put(r)

-	@property
-	def Name(self):
-		if ':' in self.state.Name:
-			return self.state.Name.split(':')[0]
-		return self.state.Name
-
 	@property
 	def Tags(self):
 		return utils.parse_tags(self.state.tags)
@@ -777,71 +784,3 @@ class Vg(AutomatedProperties):
 	@property
 	def Clustered(self):
 		return self._attribute(5, 'c')
-
-
-class VgVdo(Vg):
-
-	# noinspection PyUnusedLocal,PyPep8Naming
-	def __init__(self, object_path, object_state):
-		super(VgVdo, self).__init__(object_path, vgs_state_retrieve)
-		self.set_interface(VG_VDO_INTERFACE)
-		self._object_path = object_path
-		self.state = object_state
-
-	@staticmethod
-	def _lv_vdo_pool_create_with_lv(uuid, vg_name, pool_name, lv_name,
-									data_size, virtual_size, create_options):
-		Vg.validate_dbus_object(uuid, vg_name)
-		Vg.handle_execute(*cmdhandler.vg_create_vdo_pool_lv_and_lv(
-			vg_name, pool_name, lv_name, data_size, virtual_size,
-			create_options))
-		return Vg.fetch_new_lv(vg_name, pool_name)
-
-	@dbus.service.method(
-		dbus_interface=VG_VDO_INTERFACE,
-		in_signature='ssttia{sv}',
-		out_signature='(oo)',
-		async_callbacks=('cb', 'cbe'))
-	def CreateVdoPoolandLv(self, pool_name, lv_name, data_size, virtual_size,
-							tmo, create_options, cb, cbe):
-		utils.validate_lv_name(VG_VDO_INTERFACE, self.Name, pool_name)
-		utils.validate_lv_name(VG_VDO_INTERFACE, self.Name, lv_name)
-
-		r = RequestEntry(tmo, VgVdo._lv_vdo_pool_create_with_lv,
-							(self.state.Uuid, self.state.lvm_id,
-							pool_name, lv_name, round_size(data_size),
-							round_size(virtual_size),
-							create_options), cb, cbe)
-		cfg.worker_q.put(r)
-
-	@staticmethod
-	def _vdo_pool_create(uuid, vg_name, pool_lv, name, virtual_size, create_options):
-		Vg.validate_dbus_object(uuid, vg_name)
-
-		# Retrieve the full name of the pool lv
-		pool = cfg.om.get_object_by_path(pool_lv)
-		if not pool:
-			msg = 'LV with object path %s not present!' % \
-					(pool_lv)
-			raise dbus.exceptions.DBusException(VG_VDO_INTERFACE, msg)
-
-		Vg.handle_execute(*cmdhandler.vg_create_vdo_pool(
-			pool.lv_full_name(), name, virtual_size,
-			create_options))
-		return Vg.fetch_new_lv(vg_name, pool.Name)
-
-	@dbus.service.method(
-		dbus_interface=VG_VDO_INTERFACE,
-		in_signature='ostia{sv}',
-		out_signature='(oo)',
-		async_callbacks=('cb', 'cbe'))
-	def CreateVdoPool(self, pool_lv, name, virtual_size,
-						tmo, create_options, cb, cbe):
-		utils.validate_lv_name(VG_VDO_INTERFACE, self.Name, name)
-
-		r = RequestEntry(tmo, VgVdo._vdo_pool_create,
-							(self.state.Uuid, self.state.lvm_id,
-							pool_lv, name,
-							round_size(virtual_size),
-							create_options), cb, cbe)
-		cfg.worker_q.put(r)
--- a/daemons/lvmlockd/Makefile.in
+++ b/daemons/lvmlockd/Makefile.in
@@ -15,8 +15,6 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

-USE_SD_NOTIFY=yes
-
 SOURCES = lvmlockd-core.c

 ifeq ("@BUILD_LOCKDSANLOCK@", "yes")
@@ -27,7 +25,6 @@ endif
 ifeq ("@BUILD_LOCKDDLM@", "yes")
  SOURCES += lvmlockd-dlm.c
  LOCK_LIBS += -ldlm_lt
-  LOCK_LIBS += -ldlmcontrol
 endif

 SOURCES2 = lvmlockctl.c
@@ -43,28 +40,18 @@ INCLUDES += -I$(top_srcdir)/libdaemon/server
 LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
 LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_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 $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS)

 lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a
-	@echo "    [CC] $@"
-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS)

 install_lvmlockd: lvmlockd
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
+	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

 install_lvmlockctl: lvmlockctl
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
+	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

 install_lvm2: install_lvmlockd install_lvmlockctl

--- a/daemons/lvmlockd/lvmlockctl.c
+++ b/daemons/lvmlockd/lvmlockctl.c
@@ -24,7 +24,7 @@
 static int quit = 0;
 static int info = 0;
 static int dump = 0;
-static int wait_opt = 1;
+static int wait_opt = 0;
 static int force_opt = 0;
 static int kill_vg = 0;
 static int drop_vg = 0;
@@ -280,12 +280,13 @@ static void format_info_line(char *line, char *r_name, char *r_type)

 static void format_info(void)
 {
-	char line[MAX_LINE] = { 0 };
-	char r_name[MAX_NAME+1] = { 0 };
-	char r_type[MAX_NAME+1] = { 0 };
+	char line[MAX_LINE];
+	char r_name[MAX_NAME+1];
+	char r_type[MAX_NAME+1];
 	int i, j;

 	j = 0;
+	memset(line, 0, sizeof(line));

 	for (i = 0; i < dump_len; i++) {
 		line[j++] = dump_buf[i];
@@ -325,8 +326,6 @@ static int _lvmlockd_result(daemon_reply reply, int *result)
 {
 	int reply_result;

-	*result = NO_LOCKD_RESULT;
-
 	if (reply.error) {
 		log_error("lvmlockd_result reply error %d", reply.error);
 		return 0;
@@ -338,7 +337,7 @@ static int _lvmlockd_result(daemon_reply reply, int *result)
 	}

 	reply_result = daemon_reply_int(reply, "op_result", NO_LOCKD_RESULT);
-	if (reply_result == NO_LOCKD_RESULT) {
+	if (reply_result == -1000) {
 		log_error("lvmlockd_result no op_result");
 		return 0;
 	}
--- a/daemons/lvmlockd/lvmlockd-client.h
+++ b/daemons/lvmlockd/lvmlockd-client.h
@@ -14,7 +14,6 @@
 #include "libdaemon/client/daemon-client.h"

 #define LVMLOCKD_SOCKET DEFAULT_RUN_DIR "/lvmlockd.socket"
-#define LVMLOCKD_ADOPT_FILE DEFAULT_RUN_DIR "/lvmlockd.adopt"

 /* Wrappers to open/close connection */

@@ -23,9 +22,9 @@ static inline daemon_handle lvmlockd_open(const char *sock)
 	daemon_info lvmlockd_info = {
 		.path = "lvmlockd",
 		.socket = sock ?: LVMLOCKD_SOCKET,
-		.autostart = 0,
 		.protocol = "lvmlockd",
 		.protocol_version = 1,
+		.autostart = 0
 	};

 	return daemon_open(lvmlockd_info);
@@ -33,7 +32,7 @@ static inline daemon_handle lvmlockd_open(const char *sock)

 static inline void lvmlockd_close(daemon_handle h)
 {
-	daemon_close(h);
+	return daemon_close(h);
 }

 /*
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -8,6 +8,10 @@
 * of the GNU Lesser General Public License v.2.1.
 */

+#define _XOPEN_SOURCE 500  /* pthread */
+#define _ISOC99_SOURCE
+#define _REENTRANT
+
 #include "tools/tool.h"

 #include "libdaemon/client/daemon-io.h"
@@ -31,15 +35,9 @@
 #include <sys/utsname.h>
 #include <sys/un.h>

-#ifdef USE_SD_NOTIFY
-#include <systemd/sd-daemon.h>
-#endif
-
 #define EXTERN
 #include "lvmlockd-internal.h"

-static int str_to_mode(const char *str);
-
 /*
 * Basic operation of lvmlockd
 *
@@ -144,8 +142,6 @@ static const char *lvmlockd_protocol = "lvmlockd";
 static const int lvmlockd_protocol_version = 1;
 static int daemon_quit;
 static int adopt_opt;
-static uint32_t adopt_update_count;
-static const char *adopt_file;

 /*
 * We use a separate socket for dumping daemon info.
@@ -409,11 +405,12 @@ struct lockspace *alloc_lockspace(void)
 {
 	struct lockspace *ls;

-	if (!(ls = zalloc(sizeof(struct lockspace)))) {
+	if (!(ls = malloc(sizeof(struct lockspace)))) {
 		log_error("out of memory for lockspace");
 		return NULL;
 	}

+	memset(ls, 0, sizeof(struct lockspace));
 	INIT_LIST_HEAD(&ls->actions);
 	INIT_LIST_HEAD(&ls->resources);
 	pthread_mutex_init(&ls->mutex, NULL);
@@ -506,10 +503,6 @@ static struct lock *alloc_lock(void)

 static void free_action(struct action *act)
 {
-	if (act->path) {
-		free(act->path);
-		act->path = NULL;
-	}
 	pthread_mutex_lock(&unused_struct_mutex);
 	if (unused_action_count >= MAX_UNUSED_ACTION) {
 		free(act);
@@ -733,8 +726,6 @@ static const char *op_str(int x)
 		return "rename_final";
 	case LD_OP_RUNNING_LM:
 		return "running_lm";
-	case LD_OP_QUERY_LOCK:
-		return "query_lock";
 	case LD_OP_FIND_FREE_LOCK:
 		return "find_free_lock";
 	case LD_OP_KILL_VG:
@@ -747,8 +738,6 @@ static const char *op_str(int x)
 		return "dump_info";
 	case LD_OP_BUSY:
 		return "busy";
-	case LD_OP_REFRESH_LV:
-		return "refresh_lv";
 	default:
 		return "op_unknown";
 	};
@@ -815,144 +804,6 @@ int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsi
 	return 0;
 }

-/*
- * Write new info when a command exits if that command has acquired a new LV
- * lock.  If the command has released an LV lock we don't bother updating the
- * info.  When adopting, we eliminate any LV lock adoptions if there is no dm
- * device for that LV.  If lvmlockd is terminated after acquiring but before
- * writing this file, those LV locks would not be adopted on restart.
- */
-
-#define ADOPT_VERSION_MAJOR 1
-#define ADOPT_VERSION_MINOR 0
-
-static void write_adopt_file(void)
-{
-	struct lockspace *ls;
-	struct resource *r;
-	struct lock *lk;
-	time_t t;
-	FILE *fp;
-
-	if (!(fp = fopen(adopt_file, "w")))
-		return;
-
-	adopt_update_count++;
-
-	t = time(NULL);
-	fprintf(fp, "lvmlockd adopt_version %u.%u pid %d updates %u %s",
-		ADOPT_VERSION_MAJOR, ADOPT_VERSION_MINOR, getpid(), adopt_update_count, ctime(&t));
-
-	pthread_mutex_lock(&lockspaces_mutex);
-	list_for_each_entry(ls, &lockspaces, list) {
-		if (ls->lm_type == LD_LM_DLM && !strcmp(ls->name, gl_lsname_dlm))
-			continue;
-		fprintf(fp, "VG: %38s %s %s %s\n",
-			ls->vg_uuid, ls->vg_name, lm_str(ls->lm_type), ls->vg_args);
-		list_for_each_entry(r, &ls->resources, list) {
-			if (r->type != LD_RT_LV)
-				continue;
-			if ((r->mode != LD_LK_EX) && (r->mode != LD_LK_SH))
-				continue;
-			list_for_each_entry(lk, &r->locks, list) {
-				fprintf(fp, "LV: %38s %s %s %s %u\n",
-					ls->vg_uuid, r->name, r->lv_args, mode_str(r->mode), r->version);
-			}
-		}
-	}
-	pthread_mutex_unlock(&lockspaces_mutex);
-
-	fflush(fp);
-	fclose(fp);
-}
-
-static int read_adopt_file(struct list_head *vg_lockd)
-{
-	char adopt_line[512];
-	char vg_uuid[72];
-	char lm_type_str[16];
-	char mode[8];
-	struct lockspace *ls, *ls2;
-	struct resource *r;
-	FILE *fp;
-
-	if (MAX_ARGS != 64 || MAX_NAME != 64)
-		return -1;
-
-	if (!(fp = fopen(adopt_file, "r")))
-		return 0;
-
-	while (fgets(adopt_line, sizeof(adopt_line), fp)) {
-		if (adopt_line[0] == '#')
-			continue;
-		else if (!strncmp(adopt_line, "lvmlockd", 8)) {
-			unsigned int v_major = 0, v_minor = 0;
-			if ((sscanf(adopt_line, "lvmlockd adopt_version %u.%u", &v_major, &v_minor) != 2) ||
-			    (v_major != ADOPT_VERSION_MAJOR))
-				goto fail;
-
-		} else if (!strncmp(adopt_line, "VG:", 3)) {
-			if (!(ls = alloc_lockspace()))
-				goto fail;
-
-			memset(vg_uuid, 0, sizeof(vg_uuid));
-
-			if (sscanf(adopt_line, "VG: %63s %64s %16s %64s",
-				   vg_uuid, ls->vg_name, lm_type_str, ls->vg_args) != 4) {
-				goto fail;
-			}
-
-			memcpy(ls->vg_uuid, vg_uuid, 64);
-
-			if ((ls->lm_type = str_to_lm(lm_type_str)) < 0)
-				goto fail;
-
-			list_add(&ls->list, vg_lockd);
-
-		} else if (!strncmp(adopt_line, "LV:", 3)) {
-			if (!(r = alloc_resource()))
-				goto fail;
-
-			r->type = LD_RT_LV;
-
-			memset(vg_uuid, 0, sizeof(vg_uuid));
-
-			if (sscanf(adopt_line, "LV: %64s %64s %s %8s %u",
-				   vg_uuid, r->name, r->lv_args, mode, &r->version) != 5) {
-				goto fail;
-			}
-
-			if ((r->adopt_mode = str_to_mode(mode)) == LD_LK_IV)
-				goto fail;
-
-			if (ls && !memcmp(ls->vg_uuid, vg_uuid, 64)) {
-				list_add(&r->list, &ls->resources);
-				r = NULL;
-			} else {
-				list_for_each_entry(ls2, vg_lockd, list) {
-					if (memcmp(ls2->vg_uuid, vg_uuid, 64))
-						continue;
-					list_add(&r->list, &ls2->resources);
-					r = NULL;
-					break;
-				}
-			}
-
-			if (r) {
-				log_error("No lockspace found for resource %s vg_uuid %s", r->name, vg_uuid);
-				goto fail;
-			}
-		}
-	}
-
-	fclose(fp);
-	return 0;
-
-fail:
-	fclose(fp);
-	return -1;
-}
-
 /*
 * These are few enough that arrays of function pointers can
 * be avoided.
@@ -1074,12 +925,12 @@ static void lm_rem_resource(struct lockspace *ls, struct resource *r)
 		lm_rem_resource_sanlock(ls, r);
 }

-static int lm_find_free_lock(struct lockspace *ls, uint64_t *free_offset, int *sector_size, int *align_size)
+static int lm_find_free_lock(struct lockspace *ls, uint64_t *free_offset)
 {
 	if (ls->lm_type == LD_LM_DLM)
 		return 0;
 	else if (ls->lm_type == LD_LM_SANLOCK)
-		return lm_find_free_lock_sanlock(ls, free_offset, sector_size, align_size);
+		return lm_find_free_lock_sanlock(ls, free_offset);
 	return -1;
 }

@@ -1964,9 +1815,9 @@ static void res_process(struct lockspace *ls, struct resource *r,
 			add_client_result(act);
 		} else {
 			/* persistent lock is sh, transient request is ex */
+			/* FIXME: can we remove this case? do a convert here? */
 			log_debug("res_process %s existing persistent lock new transient", r->name);
 			r->last_client_id = act->client_id;
-			act->flags |= LD_AF_SH_EXISTS;
 			act->result = -EEXIST;
 			list_del(&act->list);
 			add_client_result(act);
@@ -2346,7 +2197,6 @@ static int process_op_during_kill(struct action *act)
 	case LD_OP_UPDATE:
 	case LD_OP_RENAME_BEFORE:
 	case LD_OP_RENAME_FINAL:
-	case LD_OP_QUERY_LOCK:
 	case LD_OP_FIND_FREE_LOCK:
 		return 0;
 	};
@@ -2372,7 +2222,7 @@ static void *lockspace_thread_main(void *arg_in)
 	struct action *act_op_free = NULL;
 	struct list_head tmp_act;
 	struct list_head act_close;
-	char tmp_name[MAX_NAME+5];
+	char tmp_name[MAX_NAME+1];
 	int free_vg = 0;
 	int drop_vg = 0;
 	int error = 0;
@@ -2571,31 +2421,13 @@ static void *lockspace_thread_main(void *arg_in)
 				break;
 			}

-			if (act->op == LD_OP_QUERY_LOCK) {
-				r = find_resource_act(ls, act, 0);
-				if (!r)
-					act->result = -ENOENT;
-				else {
-					act->result = 0;
-					act->mode = r->mode;
-				}
-				list_del(&act->list);
-				add_client_result(act);
-				continue;
-			}
-
 			if (act->op == LD_OP_FIND_FREE_LOCK && act->rt == LD_RT_VG) {
 				uint64_t free_offset = 0;
-				int sector_size = 0;
-				int align_size = 0;
-
 				log_debug("S %s find free lock", ls->name);
-				rv = lm_find_free_lock(ls, &free_offset, &sector_size, &align_size);
-				log_debug("S %s find free lock %d offset %llu sector_size %d align_size %d",
-					  ls->name, rv, (unsigned long long)free_offset, sector_size, align_size);
+				rv = lm_find_free_lock(ls, &free_offset);
+				log_debug("S %s find free lock %d offset %llu",
+					  ls->name, rv, (unsigned long long)free_offset);
 				ls->free_lock_offset = free_offset;
-				ls->free_lock_sector_size = sector_size;
-				ls->free_lock_align_size = align_size;
 				list_del(&act->list);
 				act->result = rv;
 				add_client_result(act);
@@ -2766,10 +2598,8 @@ out_act:
 	 * blank or fill it with garbage, but instead set it to REM:<name>
 	 * to make it easier to follow progress of freeing is via log_debug.
 	 */
-	memset(tmp_name, 0, sizeof(tmp_name));
-	memcpy(tmp_name, "REM:", 4);
-	strncpy(tmp_name+4, ls->name, sizeof(tmp_name)-4);
-	memcpy(ls->name, tmp_name, sizeof(ls->name));
+	dm_strncpy(tmp_name, ls->name, sizeof(tmp_name));
+	snprintf(ls->name, sizeof(ls->name), "REM:%s", tmp_name);
 	pthread_mutex_unlock(&lockspaces_mutex);

 	/* worker_thread will join this thread, and free the ls */
@@ -2909,9 +2739,6 @@ static int add_lockspace_thread(const char *ls_name,
 		if (ls2->thread_stop) {
 			log_debug("add_lockspace_thread %s exists and stopping", ls->name);
 			rv = -EAGAIN;
-		} else if (!ls2->create_fail && !ls2->create_done) {
-			log_debug("add_lockspace_thread %s exists and starting", ls->name);
-			rv = -ESTARTING;
 		} else {
 			log_debug("add_lockspace_thread %s exists", ls->name);
 			rv = -EEXIST;
@@ -3153,7 +2980,7 @@ static int count_lockspace_starting(uint32_t client_id)

 	pthread_mutex_lock(&lockspaces_mutex);
 	list_for_each_entry(ls, &lockspaces, list) {
-		if (client_id && (ls->start_client_id != client_id))
+		if (ls->start_client_id != client_id)
 			continue;

 		if (!ls->create_done && !ls->create_fail) {
@@ -3406,8 +3233,6 @@ static int work_init_lv(struct action *act)
 	char vg_args[MAX_ARGS+1];
 	char lv_args[MAX_ARGS+1];
 	uint64_t free_offset = 0;
-	int sector_size = 0;
-	int align_size = 0;
 	int lm_type = 0;
 	int rv = 0;

@@ -3423,8 +3248,6 @@ static int work_init_lv(struct action *act)
 		lm_type = ls->lm_type;
 		memcpy(vg_args, ls->vg_args, MAX_ARGS);
 		free_offset = ls->free_lock_offset;
-		sector_size = ls->free_lock_sector_size;
-		align_size = ls->free_lock_align_size;
 	}
 	pthread_mutex_unlock(&lockspaces_mutex);

@@ -3441,7 +3264,7 @@ static int work_init_lv(struct action *act)

 	if (lm_type == LD_LM_SANLOCK) {
 		rv = lm_init_lv_sanlock(ls_name, act->vg_name, act->lv_uuid,
-					vg_args, lv_args, sector_size, align_size, free_offset);
+					vg_args, lv_args, free_offset);

 		memcpy(act->lv_args, lv_args, MAX_ARGS);
 		return rv;
@@ -3558,7 +3381,7 @@ static void *worker_thread_main(void *arg_in)
 			add_client_result(act);

 		} else if (act->op == LD_OP_START_WAIT) {
-			act->result = count_lockspace_starting(0);
+			act->result = count_lockspace_starting(act->client_id);
 			if (!act->result)
 				add_client_result(act);
 			else
@@ -3571,15 +3394,6 @@ static void *worker_thread_main(void *arg_in)
 			else
 				list_add(&act->list, &delayed_list);

-		} else if (act->op == LD_OP_REFRESH_LV) {
-			log_debug("work refresh_lv %s %s", act->lv_uuid, act->path);
-			rv = lm_refresh_lv_start_dlm(act);
-			if (rv < 0) {
-				act->result = rv;
-				add_client_result(act);
-			} else
-				list_add(&act->list, &delayed_list);
-
 		} else {
 			log_error("work unknown op %d", act->op);
 			act->result = -EINVAL;
@@ -3601,7 +3415,7 @@ static void *worker_thread_main(void *arg_in)
 		list_for_each_entry_safe(act, safe, &delayed_list, list) {
 			if (act->op == LD_OP_START_WAIT) {
 				log_debug("work delayed start_wait for client %u", act->client_id);
-				act->result = count_lockspace_starting(0);
+				act->result = count_lockspace_starting(act->client_id);
 				if (!act->result) {
 					list_del(&act->list);
 					add_client_result(act);
@@ -3615,19 +3429,6 @@ static void *worker_thread_main(void *arg_in)
 					act->result = 0;
 					add_client_result(act);
 				}
-
-			} else if (act->op == LD_OP_REFRESH_LV) {
-				log_debug("work delayed refresh_lv");
-				rv = lm_refresh_lv_check_dlm(act);
-				if (!rv) {
-					list_del(&act->list);
-					act->result = 0;
-					add_client_result(act);
-				} else if ((rv < 0) && (rv != -EAGAIN)) {
-					list_del(&act->list);
-					act->result = rv;
-					add_client_result(act);
-				}
 			}
 		}

@@ -3833,9 +3634,6 @@ static int client_send_result(struct client *cl, struct action *act)
 	if ((act->flags & LD_AF_WARN_GL_REMOVED) || gl_vg_removed)
 		strcat(result_flags, "WARN_GL_REMOVED,");
 	
-	if (act->flags & LD_AF_SH_EXISTS)
-		strcat(result_flags, "SH_EXISTS,");
-
 	if (act->op == LD_OP_INIT) {
 		/*
 		 * init is a special case where lock args need
@@ -3864,20 +3662,6 @@ static int client_send_result(struct client *cl, struct action *act)
 					  "result_flags = %s", result_flags[0] ? result_flags : "none",
 					  NULL);

-	} else if (act->op == LD_OP_QUERY_LOCK) {
-
-		log_debug("send %s[%d] cl %u %s %s rv %d mode %d",
-			  cl->name[0] ? cl->name : "client", cl->pid, cl->id,
-			  op_str(act->op), rt_str(act->rt),
-			  act->result, act->mode);
-
-		res = daemon_reply_simple("OK",
-					  "op = " FMTd64, (int64_t)act->op,
-					  "op_result = " FMTd64, (int64_t) act->result,
-					  "lock_type = %s", lm_str(act->lm_type),
-					  "mode = %s", mode_str(act->mode),
-					  NULL);
-
 	} else if (act->op == LD_OP_DUMP_LOG || act->op == LD_OP_DUMP_INFO) {
 		/*
 		 * lvmlockctl creates the unix socket then asks us to write to it.
@@ -4208,16 +3992,6 @@ static int str_to_op_rt(const char *req_name, int *op, int *rt)
 		*rt = 0;
 		return 0;
 	}
-	if (!strcmp(req_name, "query_lock_vg")) {
-		*op = LD_OP_QUERY_LOCK;
-		*rt = LD_RT_VG;
-		return 0;
-	}
-	if (!strcmp(req_name, "query_lock_lv")) {
-		*op = LD_OP_QUERY_LOCK;
-		*rt = LD_RT_LV;
-		return 0;
-	}
 	if (!strcmp(req_name, "find_free_lock")) {
 		*op = LD_OP_FIND_FREE_LOCK;
 		*rt = LD_RT_VG;
@@ -4233,11 +4007,6 @@ static int str_to_op_rt(const char *req_name, int *op, int *rt)
 		*rt = LD_RT_VG;
 		return 0;
 	}
-	if (!strcmp(req_name, "refresh_lv")) {
-		*op = LD_OP_REFRESH_LV;
-		*rt = 0;
-		return 0;
-	}
 out:
 	return -1;
 }
@@ -4599,7 +4368,6 @@ static void client_recv_action(struct client *cl)
 	const char *vg_name;
 	const char *vg_uuid;
 	const char *vg_sysid;
-	const char *path;
 	const char *str;
 	int64_t val;
 	uint32_t opts = 0;
@@ -4686,7 +4454,6 @@ static void client_recv_action(struct client *cl)
 	opts = str_to_opts(str);
 	str = daemon_request_str(req, "vg_lock_type", NULL);
 	lm = str_to_lm(str);
-	path = daemon_request_str(req, "path", NULL);

 	if (cl_pid && cl_pid != cl->pid)
 		log_error("client recv bad message pid %d client %d", cl_pid, cl->pid);
@@ -4719,9 +4486,6 @@ static void client_recv_action(struct client *cl)
 	act->flags = opts;
 	act->lm_type = lm;

-	if (path)
-		act->path = strdup(path);
-
 	if (vg_name && strcmp(vg_name, "none"))
 		strncpy(act->vg_name, vg_name, MAX_NAME);

@@ -4798,7 +4562,6 @@ static void client_recv_action(struct client *cl)
 	case LD_OP_STOP_ALL:
 	case LD_OP_RENAME_FINAL:
 	case LD_OP_RUNNING_LM:
-	case LD_OP_REFRESH_LV:
 		add_work_action(act);
 		rv = 0;
 		break;
@@ -4808,7 +4571,6 @@ static void client_recv_action(struct client *cl)
 	case LD_OP_DISABLE:
 	case LD_OP_FREE:
 	case LD_OP_RENAME_BEFORE:
-	case LD_OP_QUERY_LOCK:
 	case LD_OP_FIND_FREE_LOCK:
 	case LD_OP_KILL_VG:
 	case LD_OP_DROP_VG:
@@ -4831,7 +4593,6 @@ static void *client_thread_main(void *arg_in)
 	struct client *cl;
 	struct action *act;
 	struct action *act_un;
-	uint32_t lock_acquire_count = 0, lock_acquire_written = 0;
 	int rv;

 	while (1) {
@@ -4863,9 +4624,6 @@ static void *client_thread_main(void *arg_in)
 				rv = -1;
 			}

-			if (act->flags & LD_AF_LV_LOCK)
-				lock_acquire_count++;
-
 			/*
 			 * The client failed after we acquired an LV lock for
 			 * it, but before getting this reply saying it's done.
@@ -4887,11 +4645,6 @@ static void *client_thread_main(void *arg_in)
 			continue;
 		}

-		if (adopt_opt && (lock_acquire_count > lock_acquire_written)) {
-			lock_acquire_written = lock_acquire_count;
-			write_adopt_file();
-		}
-
 		/*
 		 * Queue incoming actions for lockspace threads
 		 */
@@ -4965,8 +4718,6 @@ static void *client_thread_main(void *arg_in)
 			pthread_mutex_unlock(&client_mutex);
 	}
 out:
-	if (adopt_opt && lock_acquire_written)
-		unlink(adopt_file);
 	return NULL;
 }

@@ -4999,6 +4750,180 @@ static void close_client_thread(void)
 		log_error("pthread_join client_thread error %d", perrno);
 }

+/*
+ * Get a list of all VGs with a lockd type (sanlock|dlm).
+ * We'll match this list against a list of existing lockspaces that are
+ * found in the lock manager.
+ *
+ * For each of these VGs, also create a struct resource on ls->resources to
+ * represent each LV in the VG that uses a lock.  For each of these LVs
+ * that are active, we'll attempt to adopt a lock.
+ */
+
+static int get_lockd_vgs(struct list_head *vg_lockd)
+{
+	/* FIXME: get VGs some other way */
+	return -1;
+#if 0
+	struct list_head update_vgs;
+	daemon_reply reply;
+	struct dm_config_node *cn;
+	struct dm_config_node *metadata;
+	struct dm_config_node *md_cn;
+	struct dm_config_node *lv_cn;
+	struct lockspace *ls, *safe;
+	struct resource *r;
+	const char *vg_name;
+	const char *vg_uuid;
+	const char *lv_uuid;
+	const char *lock_type;
+	const char *lock_args;
+	char find_str_path[PATH_MAX];
+	int rv = 0;
+
+	INIT_LIST_HEAD(&update_vgs);
+
+	reply = send_lvmetad("vg_list", "token = %s", "skip", NULL);
+
+	if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
+		log_error("vg_list from lvmetad failed %d", reply.error);
+		rv = -EINVAL;
+		goto destroy;
+	}
+
+	if (!(cn = dm_config_find_node(reply.cft->root, "volume_groups"))) {
+		log_error("get_lockd_vgs no vgs");
+		rv = -EINVAL;
+		goto destroy;
+	}
+
+	/* create an update_vgs list of all vg uuids */
+
+	for (cn = cn->child; cn; cn = cn->sib) {
+		vg_uuid = cn->key;
+
+		if (!(ls = alloc_lockspace())) {
+			rv = -ENOMEM;
+			break;
+		}
+
+		strncpy(ls->vg_uuid, vg_uuid, 64);
+		list_add_tail(&ls->list, &update_vgs);
+		log_debug("get_lockd_vgs %s", vg_uuid);
+	}
+ destroy:
+	daemon_reply_destroy(reply);
+
+	if (rv < 0)
+		goto out;
+
+	/* get vg_name and lock_type for each vg uuid entry in update_vgs */
+
+	list_for_each_entry(ls, &update_vgs, list) {
+		reply = send_lvmetad("vg_lookup",
+				     "token = %s", "skip",
+				     "uuid = %s", ls->vg_uuid,
+				     NULL);
+
+		if (reply.error || strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
+			log_error("vg_lookup from lvmetad failed %d", reply.error);
+			rv = -EINVAL;
+			goto next;
+		}
+
+		vg_name = daemon_reply_str(reply, "name", NULL);
+		if (!vg_name) {
+			log_error("get_lockd_vgs %s no name", ls->vg_uuid);
+			rv = -EINVAL;
+			goto next;
+		}
+
+		strncpy(ls->vg_name, vg_name, MAX_NAME);
+
+		metadata = dm_config_find_node(reply.cft->root, "metadata");
+		if (!metadata) {
+			log_error("get_lockd_vgs %s name %s no metadata",
+				  ls->vg_uuid, ls->vg_name);
+			rv = -EINVAL;
+			goto next;
+		}
+
+		lock_type = dm_config_find_str(metadata, "metadata/lock_type", NULL);
+		ls->lm_type = str_to_lm(lock_type);
+
+		if ((ls->lm_type != LD_LM_SANLOCK) && (ls->lm_type != LD_LM_DLM)) {
+			log_debug("get_lockd_vgs %s not lockd type", ls->vg_name);
+			continue;
+		}
+
+		lock_args = dm_config_find_str(metadata, "metadata/lock_args", NULL);
+		if (lock_args)
+			strncpy(ls->vg_args, lock_args, MAX_ARGS);
+
+		log_debug("get_lockd_vgs %s lock_type %s lock_args %s",
+			  ls->vg_name, lock_type, lock_args ?: "none");
+
+		/*
+		 * Make a record (struct resource) of each lv that uses a lock.
+		 * For any lv that uses a lock, we'll check if the lv is active
+		 * and if so try to adopt a lock for it.
+		 */
+
+		for (md_cn = metadata->child; md_cn; md_cn = md_cn->sib) {
+			if (strcmp(md_cn->key, "logical_volumes"))
+				continue;
+
+			for (lv_cn = md_cn->child; lv_cn; lv_cn = lv_cn->sib) {
+				snprintf(find_str_path, PATH_MAX, "%s/lock_args", lv_cn->key);
+				lock_args = dm_config_find_str(lv_cn, find_str_path, NULL);
+				if (!lock_args)
+					continue;
+
+				snprintf(find_str_path, PATH_MAX, "%s/id", lv_cn->key);
+				lv_uuid = dm_config_find_str(lv_cn, find_str_path, NULL);
+
+				if (!lv_uuid) {
+					log_error("get_lock_vgs no lv id for name %s", lv_cn->key);
+					continue;
+				}
+
+				if (!(r = alloc_resource())) {
+					rv = -ENOMEM;
+					goto next;
+				}
+
+				r->use_vb = 0;
+				r->type = LD_RT_LV;
+				strncpy(r->name, lv_uuid, MAX_NAME);
+				if (lock_args)
+					strncpy(r->lv_args, lock_args, MAX_ARGS);
+				list_add_tail(&r->list, &ls->resources);
+				log_debug("get_lockd_vgs %s lv %s %s (name %s)",
+					  ls->vg_name, r->name, lock_args ? lock_args : "", lv_cn->key);
+			}
+		}
+ next:
+		daemon_reply_destroy(reply);
+
+		if (rv < 0)
+			break;
+	}
+out:
+	/* Return lockd VG's on the vg_lockd list. */
+
+	list_for_each_entry_safe(ls, safe, &update_vgs, list) {
+		list_del(&ls->list);
+
+		if ((ls->lm_type == LD_LM_SANLOCK) || (ls->lm_type == LD_LM_DLM))
+			list_add_tail(&ls->list, vg_lockd);
+		else
+			free(ls);
+	}
+
+	return rv;
+#endif
+}
+
 static char _dm_uuid[DM_UUID_LEN];

 static char *get_dm_uuid(char *dm_name)
@@ -5215,9 +5140,9 @@ static void adopt_locks(void)
 	INIT_LIST_HEAD(&to_unlock);

 	/*
-	 * Get list of lockspaces from currently running lock managers.
-	 * Get list of shared VGs from file written by prior lvmlockd.
-	 * Get list of active LVs (in the shared VGs) from the file.
+	 * Get list of lockspaces from lock managers.
+	 * Get list of VGs from lvmetad with a lockd type.
+	 * Get list of active lockd type LVs from /dev.
 	 */

 	if (lm_support_dlm() && lm_is_running_dlm()) {
@@ -5241,17 +5166,12 @@ static void adopt_locks(void)
 	 * Adds a struct lockspace to vg_lockd for each lockd VG.
 	 * Adds a struct resource to ls->resources for each LV.
 	 */
-	rv = read_adopt_file(&vg_lockd);
+	rv = get_lockd_vgs(&vg_lockd);
 	if (rv < 0) {
-		log_error("adopt_locks read_adopt_file failed");
+		log_error("adopt_locks get_lockd_vgs failed");
 		goto fail;
 	}

-	if (list_empty(&vg_lockd)) {
-		log_debug("No lockspaces in adopt file");
-		return;
-	}
-
 	/*
 	 * For each resource on each lockspace, check if the
 	 * corresponding LV is active.  If so, leave the
@@ -5490,7 +5410,7 @@ static void adopt_locks(void)
 				goto fail;
 			act->op = LD_OP_LOCK;
 			act->rt = LD_RT_LV;
-			act->mode = r->adopt_mode;
+			act->mode = LD_LK_EX;
 			act->flags = (LD_AF_ADOPT | LD_AF_PERSISTENT);
 			act->client_id = INTERNAL_CLIENT_ID;
 			act->lm_type = ls->lm_type;
@@ -5588,9 +5508,8 @@ static void adopt_locks(void)
 			 * Adopt failed because the orphan has a different mode
 			 * than initially requested.  Repeat the lock-adopt operation
 			 * with the other mode.  N.B. this logic depends on first
-			 * trying sh then ex for GL/VG locks; for LV locks the mode
-			 * from the adopt file is tried first, the alternate
-			 * (if the mode in adopt file was wrong somehow.)
+			 * trying sh then ex for GL/VG locks, and ex then sh for
+			 * LV locks.
 			 */

 			if ((act->rt != LD_RT_LV) && (act->mode == LD_LK_SH)) {
@@ -5598,12 +5517,9 @@ static void adopt_locks(void)
 				act->mode = LD_LK_EX;
 				rv = add_lock_action(act);

-			} else if (act->rt == LD_RT_LV) {
-				/* LV locks: attempt to adopt the other mode. */
-				if (act->mode == LD_LK_EX)
-					act->mode = LD_LK_SH;
-				else if (act->mode == LD_LK_SH)
-					act->mode = LD_LK_EX;
+			} else if ((act->rt == LD_RT_LV) && (act->mode == LD_LK_EX)) {
+				/* LV locks: attempt to adopt sh after ex failed. */
+				act->mode = LD_LK_SH;
 				rv = add_lock_action(act);

 			} else {
@@ -5738,13 +5654,10 @@ static void adopt_locks(void)
 	if (count_start_fail || count_adopt_fail)
 		goto fail;

-	unlink(adopt_file);
-	write_adopt_file();
 	log_debug("adopt_locks done");
 	return;

 fail:
-	unlink(adopt_file);
 	log_error("adopt_locks failed, reset host");
 }

@@ -5873,10 +5786,6 @@ static int main_loop(daemon_state *ds_arg)
 	setup_worker_thread();
 	setup_restart();

-#ifdef USE_SD_NOTIFY
-	sd_notify(0, "READY=1");
-#endif
-
 	/*
 	 * Attempt to rejoin lockspaces and adopt locks from a previous
 	 * instance of lvmlockd that left behind lockspaces/locks.
@@ -6019,8 +5928,6 @@ static void usage(char *prog, FILE *file)
 	fprintf(file, "        Set path to the pid file. [%s]\n", LVMLOCKD_PIDFILE);
 	fprintf(file, "  --socket-path | -s <path>\n");
 	fprintf(file, "        Set path to the socket to listen on. [%s]\n", LVMLOCKD_SOCKET);
-	fprintf(file, "  --adopt-file <path>\n");
-	fprintf(file, "        Set path to the adopt file. [%s]\n", LVMLOCKD_ADOPT_FILE);
 	fprintf(file, "  --syslog-priority | -S err|warning|debug\n");
 	fprintf(file, "        Write log messages from this level up to syslog. [%s]\n", _syslog_num_to_name(LOG_SYSLOG_PRIO));
 	fprintf(file, "  --gl-type | -g <str>\n");
@@ -6038,14 +5945,14 @@ static void usage(char *prog, FILE *file)
 int main(int argc, char *argv[])
 {
 	daemon_state ds = {
-		.name = "lvmlockd",
+		.daemon_main = main_loop,
+		.daemon_init = NULL,
+		.daemon_fini = NULL,
 		.pidfile = getenv("LVM_LVMLOCKD_PIDFILE"),
 		.socket_path = getenv("LVM_LVMLOCKD_SOCKET"),
 		.protocol = lvmlockd_protocol,
 		.protocol_version = lvmlockd_protocol_version,
-		.daemon_init = NULL,
-		.daemon_fini = NULL,
-		.daemon_main = main_loop,
+		.name = "lvmlockd",
 	};

 	static struct option long_options[] = {
@@ -6056,7 +5963,6 @@ int main(int argc, char *argv[])
 		{"daemon-debug",    no_argument,       0, 'D' },
 		{"pid-file",        required_argument, 0, 'p' },
 		{"socket-path",     required_argument, 0, 's' },
-		{"adopt-file",      required_argument, 0, 128 },
 		{"gl-type",         required_argument, 0, 'g' },
 		{"host-id",         required_argument, 0, 'i' },
 		{"host-id-file",    required_argument, 0, 'F' },
@@ -6079,9 +5985,6 @@ int main(int argc, char *argv[])
 		switch (c) {
 		case '0':
 			break;
-		case 128:
-			adopt_file = strdup(optarg);
-			break;
 		case 'h':
 			usage(argv[0], stdout);
 			exit(EXIT_SUCCESS);
@@ -6143,9 +6046,6 @@ int main(int argc, char *argv[])
 	if (!ds.socket_path)
 		ds.socket_path = LVMLOCKD_SOCKET;

-	if (!adopt_file)
-		adopt_file = LVMLOCKD_ADOPT_FILE;
-
 	/* runs daemon_main/main_loop */
 	daemon_start(ds);

--- a/daemons/lvmlockd/lvmlockd-dlm.c
+++ b/daemons/lvmlockd/lvmlockd-dlm.c
@@ -24,7 +24,6 @@
 * link with non-threaded version of library, libdlm_lt.
 */
 #include "libdlm.h"
-#include "libdlmcontrol.h"

 #include <stddef.h>
 #include <poll.h>
@@ -128,18 +127,16 @@ static int read_cluster_name(char *clustername)
 	return 0;
 }

-#define MAX_VERSION 16
-
 int lm_init_vg_dlm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
 {
 	char clustername[MAX_ARGS+1];
-	char lock_args_version[MAX_VERSION+1];
+	char lock_args_version[MAX_ARGS+1];
 	int rv;

 	memset(clustername, 0, sizeof(clustername));
 	memset(lock_args_version, 0, sizeof(lock_args_version));

-	snprintf(lock_args_version, MAX_VERSION, "%u.%u.%u",
+	snprintf(lock_args_version, MAX_ARGS, "%u.%u.%u",
 		 VG_LOCK_ARGS_MAJOR, VG_LOCK_ARGS_MINOR, VG_LOCK_ARGS_PATCH);

 	rv = read_cluster_name(clustername);
@@ -151,9 +148,7 @@ int lm_init_vg_dlm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
 		return -EARGS;
 	}

-	rv = snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, clustername);
-	if (rv >= MAX_ARGS)
-		log_debug("init_vg_dlm vg_args may be too long %d %s", rv, vg_args);
+	snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, clustername);
 	rv = 0;

 	log_debug("init_vg_dlm done %s vg_args %s", ls_name, vg_args);
@@ -277,9 +272,10 @@ static int lm_add_resource_dlm(struct lockspace *ls, struct resource *r, int wit
 	int rv;

 	if (r->type == LD_RT_GL || r->type == LD_RT_VG) {
-		buf = zalloc(sizeof(struct val_blk) + DLM_LVB_LEN);
+		buf = malloc(sizeof(struct val_blk) + DLM_LVB_LEN);
 		if (!buf)
 			return -ENOMEM;
+		memset(buf, 0, sizeof(struct val_blk) + DLM_LVB_LEN);

 		rdd->vb = (struct val_blk *)buf;
 		rdd->lksb.sb_lvbptr = buf + sizeof(struct val_blk);
@@ -398,18 +394,12 @@ static int lm_adopt_dlm(struct lockspace *ls, struct resource *r, int ld_mode,
 			  (void *)1, (void *)1, (void *)1,
 			  NULL, NULL);

-	if (rv == -1 && (errno == EAGAIN)) {
+	if (rv == -1 && errno == -EAGAIN) {
 		log_debug("S %s R %s adopt_dlm adopt mode %d try other mode",
 			  ls->name, r->name, ld_mode);
 		rv = -EUCLEAN;
 		goto fail;
 	}
-	if (rv == -1 && (errno == ENOENT)) {
-		log_debug("S %s R %s adopt_dlm adopt mode %d no lock",
-			  ls->name, r->name, ld_mode);
-		rv = -ENOENT;
-		goto fail;
-	}
 	if (rv < 0) {
 		log_debug("S %s R %s adopt_dlm mode %d flags %x error %d errno %d",
 			  ls->name, r->name, mode, flags, rv, errno);
@@ -787,107 +777,3 @@ int lm_is_running_dlm(void)
 	return 1;
 }

-#ifdef LOCKDDLM_CONTROL_SUPPORT
-
-int lm_refresh_lv_start_dlm(struct action *act)
-{
-	char path[PATH_MAX];
-	char command[DLMC_RUN_COMMAND_LEN];
-	char run_uuid[DLMC_RUN_UUID_LEN];
-	char *p, *vgname, *lvname;
-	int rv;
-
-	/* split /dev/vgname/lvname into vgname and lvname strings */
-	strncpy(path, act->path, strlen(act->path));
-
-	/* skip past dev */
-	p = strchr(path + 1, '/');
-
-	/* skip past slashes */
-	while (*p == '/')
-		p++;
-
-	/* start of vgname */
-	vgname = p;
-
-	/* skip past vgname */
-	while (*p != '/')
-		p++;
-
-	/* terminate vgname */
-	*p = '\0';
-	p++;
-
-	/* skip past slashes */
-	while (*p == '/')
-		p++;
-
-	lvname = p;
-
-	memset(command, 0, sizeof(command));
-	memset(run_uuid, 0, sizeof(run_uuid));
-
-	/* todo: add --readonly */
-
-	snprintf(command, DLMC_RUN_COMMAND_LEN,
-		 "lvm lvchange --refresh --partial --nolocking %s/%s",
-		 vgname, lvname);
-
-	rv = dlmc_run_start(command, strlen(command), 0,
-			    DLMC_FLAG_RUN_START_NODE_NONE,
-			    run_uuid);
-	if (rv < 0) {
-		log_debug("refresh_lv run_start error %d", rv);
-		return rv;
-	}
-
-	log_debug("refresh_lv run_start %s", run_uuid);
-
-	/* Bit of a hack here, we don't need path once started,
-	   but we do need to save the run_uuid somewhere, so just
-	   replace the path with the uuid. */
-
-	free(act->path);
-	act->path = strdup(run_uuid);
-	return 0;
-}
-
-int lm_refresh_lv_check_dlm(struct action *act)
-{
-	uint32_t check_status = 0;
-	int rv;
-
-	/* NB act->path was replaced with run_uuid */
-
-	rv = dlmc_run_check(act->path, strlen(act->path), 0,
-			    DLMC_FLAG_RUN_CHECK_CLEAR,
-			    &check_status);
-	if (rv < 0) {
-		log_debug("refresh_lv check error %d", rv);
-		return rv;
-	}
-
-	log_debug("refresh_lv check %s status %x", act->path, check_status);
-
-	if (!(check_status & DLMC_RUN_STATUS_DONE))
-		return -EAGAIN;
-
-	if (check_status & DLMC_RUN_STATUS_FAILED)
-		return -1;
-
-	return 0;
-}
-
-#else /* LOCKDDLM_CONTROL_SUPPORT */
-
-int lm_refresh_lv_start_dlm(struct action *act)
-{
-	return 0;
-}
-
-int lm_refresh_lv_check_dlm(struct action *act)
-{
-	return 0;
-}
-
-#endif /* LOCKDDLM_CONTROL_SUPPORT */
--- a/daemons/lvmlockd/lvmlockd-internal.h
+++ b/daemons/lvmlockd/lvmlockd-internal.h
@@ -11,8 +11,6 @@
 #ifndef _LVM_LVMLOCKD_INTERNAL_H
 #define _LVM_LVMLOCKD_INTERNAL_H

-#include "base/memory/container_of.h"
-
 #define MAX_NAME 64
 #define MAX_ARGS 64

@@ -55,8 +53,6 @@ enum {
 	LD_OP_KILL_VG,
 	LD_OP_DROP_VG,
 	LD_OP_BUSY,
-	LD_OP_QUERY_LOCK,
-	LD_OP_REFRESH_LV,
 };

 /* resource types */
@@ -109,7 +105,6 @@ struct client {
 #define LD_AF_WARN_GL_REMOVED	   0x00020000
 #define LD_AF_LV_LOCK              0x00040000
 #define LD_AF_LV_UNLOCK            0x00080000
-#define LD_AF_SH_EXISTS            0x00100000

 /*
 * Number of times to repeat a lock request after
@@ -132,7 +127,6 @@ struct action {
 	int max_retries;
 	int result;
 	int lm_rv;			/* return value from lm_ function */
-	char *path;
 	char vg_uuid[64];
 	char vg_name[MAX_NAME+1];
 	char lv_name[MAX_NAME+1];
@@ -147,7 +141,6 @@ struct resource {
 	char name[MAX_NAME+1];		/* vg name or lv name */
 	int8_t type;			/* resource type LD_RT_ */
 	int8_t mode;
-	int8_t adopt_mode;
 	unsigned int sh_count;		/* number of sh locks on locks list */
 	uint32_t version;
 	uint32_t last_client_id;	/* last client_id to lock or unlock resource */
@@ -158,7 +151,7 @@ struct resource {
 	struct list_head locks;
 	struct list_head actions;
 	char lv_args[MAX_ARGS+1];
-	char lm_data[];			/* lock manager specific data */
+	char lm_data[0];		/* lock manager specific data */
 };

 #define LD_LF_PERSISTENT 0x00000001
@@ -181,9 +174,7 @@ struct lockspace {
 	int8_t lm_type;			/* lock manager: LM_DLM, LM_SANLOCK */
 	void *lm_data;
 	uint64_t host_id;
-	uint64_t free_lock_offset;	/* for sanlock, start search for free lock here */
-	int free_lock_sector_size;	/* for sanlock */
-	int free_lock_align_size;	/* for sanlock */
+	uint64_t free_lock_offset;	/* start search for free lock here */

 	uint32_t start_client_id;	/* client_id that started the lockspace */
 	pthread_t thread;		/* makes synchronous lock requests */
@@ -219,6 +210,10 @@ struct val_blk {
 /* lm_unlock flags */
 #define LMUF_FREE_VG 0x00000001

+#define container_of(ptr, type, member) ({                      \
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
 static inline void INIT_LIST_HEAD(struct list_head *list)
 {
 	list->next = list;
@@ -392,8 +387,6 @@ int lm_get_lockspaces_dlm(struct list_head *ls_rejoin);
 int lm_data_size_dlm(void);
 int lm_is_running_dlm(void);
 int lm_hosts_dlm(struct lockspace *ls, int notify);
-int lm_refresh_lv_start_dlm(struct action *act);
-int lm_refresh_lv_check_dlm(struct action *act);

 static inline int lm_support_dlm(void)
 {
@@ -470,22 +463,12 @@ static inline int lm_hosts_dlm(struct lockspace *ls, int notify)
 	return 0;
 }

-static inline int lm_refresh_lv_start_dlm(struct action *act)
-{
-	return 0;
-}
-
-static inline int lm_refresh_lv_check_dlm(struct action *act)
-{
-	return 0;
-}
-
 #endif /* dlm support */

 #ifdef LOCKDSANLOCK_SUPPORT

 int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
-int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, int sector_size, int align_size, uint64_t free_offset);
+int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, uint64_t free_offset);
 int lm_free_lv_sanlock(struct lockspace *ls, struct resource *r);
 int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
 int lm_prepare_lockspace_sanlock(struct lockspace *ls);
@@ -505,7 +488,7 @@ int lm_gl_is_enabled(struct lockspace *ls);
 int lm_get_lockspaces_sanlock(struct list_head *ls_rejoin);
 int lm_data_size_sanlock(void);
 int lm_is_running_sanlock(void);
-int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset, int *sector_size, int *align_size);
+int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset);

 static inline int lm_support_sanlock(void)
 {
@@ -519,7 +502,7 @@ static inline int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flag
 	return -1;
 }

-static inline int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, int sector_size, int align_size, uint64_t free_offset)
+static inline int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, uint64_t free_offset)
 {
 	return -1;
 }
@@ -607,7 +590,7 @@ static inline int lm_is_running_sanlock(void)
 	return 0;
 }

-static inline int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset, int *sector_size, int *align_size)
+static inline int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset)
 {
 	return -1;
 }
--- a/daemons/lvmlockd/lvmlockd-sanlock.c
+++ b/daemons/lvmlockd/lvmlockd-sanlock.c
@@ -24,29 +24,10 @@
 #include "sanlock_admin.h"
 #include "sanlock_resource.h"

-/* FIXME: these are copied from sanlock.h only until
-   an updated version of sanlock is available with them. */
-#define SANLK_RES_ALIGN1M       0x00000010
-#define SANLK_RES_ALIGN2M       0x00000020
-#define SANLK_RES_ALIGN4M       0x00000040
-#define SANLK_RES_ALIGN8M       0x00000080
-#define SANLK_RES_SECTOR512     0x00000100
-#define SANLK_RES_SECTOR4K      0x00000200
-#define SANLK_LSF_ALIGN1M       0x00000010
-#define SANLK_LSF_ALIGN2M       0x00000020
-#define SANLK_LSF_ALIGN4M       0x00000040
-#define SANLK_LSF_ALIGN8M       0x00000080
-#define SANLK_LSF_SECTOR512     0x00000100
-#define SANLK_LSF_SECTOR4K      0x00000200
-
 #include <stddef.h>
 #include <poll.h>
 #include <errno.h>
 #include <syslog.h>
-#include <blkid/blkid.h>
-#include <sys/sysmacros.h>
-
-#define ONE_MB 1048576

 /*
 -------------------------------------------------------------------------------
@@ -158,7 +139,6 @@ release all the leases for the VG.

 struct lm_sanlock {
 	struct sanlk_lockspace ss;
-	int sector_size;
 	int align_size;
 	int sock; /* sanlock daemon connection */
 };
@@ -221,6 +201,7 @@ int lm_data_size_sanlock(void)
 * ...
 */

+#define LS_BEGIN 0
 #define GL_LOCK_BEGIN UINT64_C(65)
 #define VG_LOCK_BEGIN UINT64_C(66)
 #define LV_LOCK_BEGIN UINT64_C(67)
@@ -307,8 +288,7 @@ static int read_host_id_file(void)
 		}
 	}
 	if (fclose(file))
-		log_debug("Failed to fclose host id file %s (%s).",
-			  daemon_host_id_file, strerror(errno));
+		log_error("failed to close host id file %s", daemon_host_id_file);
 out:
 	log_debug("host_id %d from %s", host_id, daemon_host_id_file);
 	return host_id;
@@ -344,154 +324,6 @@ fail:
 	return rv;
 }

-static void _read_sysfs_size(dev_t devno, const char *name, unsigned int *val)
-{
-	char path[PATH_MAX];
-	char buf[32];
-	FILE *fp;
-	size_t len;
-
-	snprintf(path, sizeof(path), "/sys/dev/block/%d:%d/queue/%s",
-		 (int)major(devno), (int)minor(devno), name);
-
-	if (!(fp = fopen(path, "r")))
-		return;
-
-	if (!fgets(buf, sizeof(buf), fp))
-		goto out;
-
-	if ((len = strlen(buf)) && buf[len - 1] == '\n')
-		buf[--len] = '\0';
-
-	if (strlen(buf))
-		*val = atoi(buf);
-out:
-	if (fclose(fp))
-		log_debug("Failed to fclose host id file %s (%s).", path, strerror(errno));
-
-}
-
-/* Select sector/align size for a new VG based on what the device reports for
-   sector size of the lvmlock LV. */
-
-static int get_sizes_device(char *path, int *sector_size, int *align_size)
-{
-	unsigned int physical_block_size = 0;
-	unsigned int logical_block_size = 0;
-	struct stat st;
-	int rv;
-
-	rv = stat(path, &st);
-	if (rv < 0) {
-		log_error("Failed to stat device to get block size %s %d", path, errno);
-		return -1;
-	}
-
-	_read_sysfs_size(st.st_rdev, "physical_block_size", &physical_block_size);
-	_read_sysfs_size(st.st_rdev, "logical_block_size", &logical_block_size);
-
-	if ((physical_block_size == 512) && (logical_block_size == 512)) {
-		*sector_size = 512;
-		*align_size = ONE_MB;
-		return 0;
-	}
-
-	if ((physical_block_size == 4096) && (logical_block_size == 4096)) {
-		*sector_size = 4096;
-		*align_size = 8 * ONE_MB;
-		return 0;
-	}
-
-	if (physical_block_size && (physical_block_size != 512) && (physical_block_size != 4096)) {
-		log_warn("WARNING: invalid block sizes physical %u logical %u for %s",
-			 physical_block_size, logical_block_size, path);
-		physical_block_size = 0;
-	}
-
-	if (logical_block_size && (logical_block_size != 512) && (logical_block_size != 4096)) {
-		log_warn("WARNING: invalid block sizes physical %u logical %u for %s",
-			 physical_block_size, logical_block_size, path);
-		logical_block_size = 0;
-	}
-
-	if (!physical_block_size && !logical_block_size) {
-		log_error("Failed to get a block size for %s", path);
-		return -1;
-	}
-
-	if (!physical_block_size || !logical_block_size) {
-		log_warn("WARNING: incomplete block size information physical %u logical %u for %s",
-			 physical_block_size, logical_block_size, path);
-		if (!physical_block_size)
-			physical_block_size = logical_block_size;
-		if (!logical_block_size)
-			logical_block_size = physical_block_size;
-	}
-
-	if ((logical_block_size == 4096) && (physical_block_size == 512)) {
-		log_warn("WARNING: mixed block sizes physical %u logical %u (using 4096) for %s",
-			 physical_block_size, logical_block_size, path);
-		*sector_size = 4096;
-		*align_size = 8 * ONE_MB;
-		return 0;
-	}
-
-	if ((physical_block_size == 4096) && (logical_block_size == 512)) {
-		log_warn("WARNING: mixed block sizes physical %u logical %u (using 4096) for %s",
-			 physical_block_size, logical_block_size, path);
-		*sector_size = 4096;
-		*align_size = 8 * ONE_MB;
-		return 0;
-	}
-
-	if (physical_block_size == 512) {
-		*sector_size = 512;
-		*align_size = ONE_MB;
-		return 0;
-	}
-
-	if (physical_block_size == 4096) {
-		*sector_size = 4096;
-		*align_size = 8 * ONE_MB;
-		return 0;
-	}
-
-	log_error("Failed to get a block size for %s", path);
-	return -1;
-}
-
-
-/* Get the sector/align sizes that were used to create an existing VG.
-   sanlock encoded this in the lockspace/resource structs on disk. */
-
-static int get_sizes_lockspace(char *path, int *sector_size, int *align_size)
-{
-	struct sanlk_lockspace ss;
-	uint32_t io_timeout = 0;
-	int rv;
-
-	memset(&ss, 0, sizeof(ss));
-	memcpy(ss.host_id_disk.path, path, SANLK_PATH_LEN);
-	ss.host_id_disk.offset = 0;
-
-	rv = sanlock_read_lockspace(&ss, 0, &io_timeout);
-	if (rv < 0) {
-		log_error("get_sizes_lockspace %s error %d", path, rv);
-		return rv;
-	}
-
-	if ((ss.flags & SANLK_LSF_SECTOR4K) && (ss.flags & SANLK_LSF_ALIGN8M)) {
-		*sector_size = 4096;
-		*align_size = 8 * ONE_MB;
-	} else if ((ss.flags & SANLK_LSF_SECTOR512) && (ss.flags & SANLK_LSF_ALIGN1M)) {
-		*sector_size = 512;
-		*align_size = ONE_MB;
-	}
-
-	log_debug("get_sizes_lockspace found %d %d", *sector_size, *align_size);
-	return 0;
-}
-
 /*
 * vgcreate
 *
@@ -500,21 +332,18 @@ static int get_sizes_lockspace(char *path, int *sector_size, int *align_size)
 * version and lv name, and returns the real lock_args in vg_args.
 */

-#define MAX_VERSION 16
-
 int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
 {
 	struct sanlk_lockspace ss;
 	struct sanlk_resourced rd;
 	struct sanlk_disk disk;
 	char lock_lv_name[MAX_ARGS+1];
-	char lock_args_version[MAX_VERSION+1];
+	char lock_args_version[MAX_ARGS+1];
 	const char *gl_name = NULL;
 	uint32_t daemon_version;
 	uint32_t daemon_proto;
 	uint64_t offset;
-	int sector_size = 0;
-	int align_size = 0;
+	int align_size;
 	int i, rv;

 	memset(&ss, 0, sizeof(ss));
@@ -528,7 +357,7 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 		return -EARGS;
 	}

-	snprintf(lock_args_version, MAX_VERSION, "%u.%u.%u",
+	snprintf(lock_args_version, MAX_ARGS, "%u.%u.%u",
 		 VG_LOCK_ARGS_MAJOR, VG_LOCK_ARGS_MINOR, VG_LOCK_ARGS_PATCH);

 	/* see comment above about input vg_args being only lock_lv_name */
@@ -545,9 +374,7 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	if (daemon_test) {
 		if (!gl_lsname_sanlock[0])
 			strncpy(gl_lsname_sanlock, ls_name, MAX_NAME);
-		rv = snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, lock_lv_name);
-		if (rv >= MAX_ARGS)
-			log_debug("init_vg_san vg_args may be too long %d %s", rv, vg_args);
+		snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, lock_lv_name);
 		return 0;
 	}

@@ -560,25 +387,23 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	log_debug("sanlock daemon version %08x proto %08x",
 		  daemon_version, daemon_proto);

-	/* Nothing formatted on disk yet, use what the device reports. */
-	rv = get_sizes_device(disk.path, &sector_size, &align_size);
-	if (rv < 0) {
+	rv = sanlock_align(&disk);
+	if (rv <= 0) {
 		if (rv == -EACCES) {
 			log_error("S %s init_vg_san sanlock error -EACCES: no permission to access %s",
 				  ls_name, disk.path);
 			return -EDEVOPEN;
 		} else {
-			log_error("S %s init_vg_san sanlock error %d trying to get sector/align size of %s",
+			log_error("S %s init_vg_san sanlock error %d trying to get align size of %s",
 				  ls_name, rv, disk.path);
 			return -EARGS;
 		}
-	}
+	} else
+		align_size = rv;

 	strncpy(ss.name, ls_name, SANLK_NAME_LEN);
 	memcpy(ss.host_id_disk.path, disk.path, SANLK_PATH_LEN);
-	ss.host_id_disk.offset = 0;
-	ss.flags = (sector_size == 4096) ? (SANLK_LSF_SECTOR4K | SANLK_LSF_ALIGN8M) :
-					   (SANLK_LSF_SECTOR512 | SANLK_LSF_ALIGN1M);
+	ss.host_id_disk.offset = LS_BEGIN * align_size;

 	rv = sanlock_write_lockspace(&ss, 0, 0, sanlock_io_timeout);
 	if (rv < 0) {
@@ -611,8 +436,6 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	memcpy(rd.rs.disks[0].path, disk.path, SANLK_PATH_LEN);
 	rd.rs.disks[0].offset = align_size * GL_LOCK_BEGIN;
 	rd.rs.num_disks = 1;
-	rd.rs.flags = (sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-					      (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	rv = sanlock_write_resource(&rd.rs, 0, 0, 0);
 	if (rv < 0) {
@@ -626,8 +449,6 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	memcpy(rd.rs.disks[0].path, disk.path, SANLK_PATH_LEN);
 	rd.rs.disks[0].offset = align_size * VG_LOCK_BEGIN;
 	rd.rs.num_disks = 1;
-	rd.rs.flags = (sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-					      (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	rv = sanlock_write_resource(&rd.rs, 0, 0, 0);
 	if (rv < 0) {
@@ -639,9 +460,7 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	if (!strcmp(gl_name, R_NAME_GL))
 		strncpy(gl_lsname_sanlock, ls_name, MAX_NAME);
 
-	rv = snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, lock_lv_name);
-	if (rv >= MAX_ARGS)
-		log_debug("init_vg_san vg_args may be too long %d %s", rv, vg_args);
+	snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, lock_lv_name);

 	log_debug("S %s init_vg_san done vg_args %s", ls_name, vg_args);

@@ -653,8 +472,6 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar

 	memset(&rd, 0, sizeof(rd));
 	rd.rs.num_disks = 1;
-	rd.rs.flags = (sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-					      (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);
 	memcpy(rd.rs.disks[0].path, disk.path, SANLK_PATH_LEN);
 	strncpy(rd.rs.lockspace_name, ls_name, SANLK_NAME_LEN);
 	strcpy(rd.rs.name, "#unused");
@@ -693,13 +510,13 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 */

 int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name,
-		       char *vg_args, char *lv_args,
-		       int sector_size, int align_size, uint64_t free_offset)
+		       char *vg_args, char *lv_args, uint64_t free_offset)
 {
 	struct sanlk_resourced rd;
 	char lock_lv_name[MAX_ARGS+1];
-	char lock_args_version[MAX_VERSION+1];
+	char lock_args_version[MAX_ARGS+1];
 	uint64_t offset;
+	int align_size;
 	int rv;

 	memset(&rd, 0, sizeof(rd));
@@ -713,11 +530,11 @@ int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name,
 		return rv;
 	}

-	snprintf(lock_args_version, MAX_VERSION, "%u.%u.%u",
+	snprintf(lock_args_version, MAX_ARGS, "%u.%u.%u",
 		 LV_LOCK_ARGS_MAJOR, LV_LOCK_ARGS_MINOR, LV_LOCK_ARGS_PATCH);

 	if (daemon_test) {
-		align_size = ONE_MB;
+		align_size = 1048576;
 		snprintf(lv_args, MAX_ARGS, "%s:%llu",
 			 lock_args_version,
 			 (unsigned long long)((align_size * LV_LOCK_BEGIN) + (align_size * daemon_test_lv_count)));
@@ -730,35 +547,12 @@ int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name,
 	if ((rv = build_dm_path(rd.rs.disks[0].path, SANLK_PATH_LEN, vg_name, lock_lv_name)))
 		return rv;

-	/*
-	 * These should not usually be zero, maybe only the first time this function is called?
-	 * We need to use the same sector/align sizes that are already being used.
-	 */
-	if (!sector_size || !align_size) {
-		rv = get_sizes_lockspace(rd.rs.disks[0].path, &sector_size, &align_size);
-		if (rv < 0) {
-			log_error("S %s init_lv_san read_lockspace error %d %s",
-				  ls_name, rv, rd.rs.disks[0].path);
-			return rv;
-		}
-
-		if (sector_size)
-			log_debug("S %s init_lv_san found ls sector_size %d align_size %d", ls_name, sector_size, align_size);
-		else {
-			/* use the old method */
-			align_size = sanlock_align(&rd.rs.disks[0]);
-			if (align_size <= 0) {
-				log_error("S %s init_lv_san align error %d", ls_name, align_size);
-				return -EINVAL;
-			}
-			sector_size = (align_size == ONE_MB) ? 512 : 4096;
-			log_debug("S %s init_lv_san found old sector_size %d align_size %d", ls_name, sector_size, align_size);
-		}
+	align_size = sanlock_align(&rd.rs.disks[0]);
+	if (align_size <= 0) {
+		log_error("S %s init_lv_san align error %d", ls_name, align_size);
+		return -EINVAL;
 	}

-	rd.rs.flags = (sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-					      (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);
-
 	if (free_offset)
 		offset = free_offset;
 	else
@@ -801,8 +595,6 @@ int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name,
 				  ls_name, lv_name, (unsigned long long)offset);

 			strncpy(rd.rs.name, lv_name, SANLK_NAME_LEN);
-			rd.rs.flags = (sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-							      (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 			rv = sanlock_write_resource(&rd.rs, 0, 0, 0);
 			if (!rv) {
@@ -834,8 +626,7 @@ int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_
 	char lock_lv_name[MAX_ARGS+1];
 	uint64_t offset;
 	uint32_t io_timeout;
-	int sector_size = 0;
-	int align_size = 0;
+	int align_size;
 	int i, rv;

 	memset(&disk, 0, sizeof(disk));
@@ -864,13 +655,20 @@ int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_
 	/* FIXME: device is not always ready for us here */
 	sleep(1);

+	align_size = sanlock_align(&disk);
+	if (align_size <= 0) {
+		log_error("S %s rename_vg_san bad align size %d %s",
+			  ls_name, align_size, disk.path);
+		return -EINVAL;
+	}
+
 	/*
 	 * Lockspace
 	 */

 	memset(&ss, 0, sizeof(ss));
 	memcpy(ss.host_id_disk.path, disk.path, SANLK_PATH_LEN);
-	ss.host_id_disk.offset = 0;
+	ss.host_id_disk.offset = LS_BEGIN * align_size;

 	rv = sanlock_read_lockspace(&ss, 0, &io_timeout);
 	if (rv < 0) {
@@ -879,26 +677,6 @@ int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_
 		return rv;
 	}

-	if ((ss.flags & SANLK_LSF_SECTOR4K) && (ss.flags & SANLK_LSF_ALIGN8M)) {
-		sector_size = 4096;
-		align_size = 8 * ONE_MB;
-	} else if ((ss.flags & SANLK_LSF_SECTOR512) && (ss.flags & SANLK_LSF_ALIGN1M)) {
-		sector_size = 512;
-		align_size = ONE_MB;
-	} else {
-		/* use the old method */
-		align_size = sanlock_align(&ss.host_id_disk);
-		if (align_size <= 0) {
-			log_error("S %s rename_vg_san unknown sector/align size for %s",
-				 ls_name, ss.host_id_disk.path);
-			return -1;
-		}
-		sector_size = (align_size == ONE_MB) ? 512 : 4096;
-	}
-
-	if (!sector_size || !align_size)
-		return -1;
-
 	strncpy(ss.name, ls_name, SANLK_NAME_LEN);

 	rv = sanlock_write_lockspace(&ss, 0, 0, sanlock_io_timeout);
@@ -1052,11 +830,6 @@ int lm_ex_disable_gl_sanlock(struct lockspace *ls)
 	rd1.rs.num_disks = 1;
 	strncpy(rd1.rs.disks[0].path, lms->ss.host_id_disk.path, SANLK_PATH_LEN-1);
 	rd1.rs.disks[0].offset = lms->align_size * GL_LOCK_BEGIN;
-	
-	rd1.rs.flags = (lms->sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-						    (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);
-	rd2.rs.flags = (lms->sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-						    (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	rv = sanlock_acquire(lms->sock, -1, 0, 1, &rs1, NULL);
 	if (rv < 0) {
@@ -1118,8 +891,6 @@ int lm_able_gl_sanlock(struct lockspace *ls, int enable)
 	rd.rs.num_disks = 1;
 	strncpy(rd.rs.disks[0].path, lms->ss.host_id_disk.path, SANLK_PATH_LEN-1);
 	rd.rs.disks[0].offset = lms->align_size * GL_LOCK_BEGIN;
-	rd.rs.flags = (lms->sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-						   (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	rv = sanlock_write_resource(&rd.rs, 0, 0, 0);
 	if (rv < 0) {
@@ -1165,8 +936,7 @@ static int gl_is_enabled(struct lockspace *ls, struct lm_sanlock *lms)

 	rv = sanlock_read_resource(&rd.rs, 0);
 	if (rv < 0) {
-		log_error("gl_is_enabled read_resource align_size %d offset %llu error %d",
-			  lms->align_size, (unsigned long long)offset, rv);
+		log_error("gl_is_enabled read_resource error %d", rv);
 		return rv;
 	}

@@ -1203,7 +973,7 @@ int lm_gl_is_enabled(struct lockspace *ls)
 * been disabled.)
 */

-int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset, int *sector_size, int *align_size)
+int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset)
 {
 	struct lm_sanlock *lms = (struct lm_sanlock *)ls->lm_data;
 	struct sanlk_resourced rd;
@@ -1213,22 +983,15 @@ int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset, int *
 	int round = 0;

 	if (daemon_test) {
-		*free_offset = (ONE_MB * LV_LOCK_BEGIN) + (ONE_MB * (daemon_test_lv_count + 1));
-		*sector_size = 512;
-		*align_size = ONE_MB;
+		*free_offset = (1048576 * LV_LOCK_BEGIN) + (1048576 * (daemon_test_lv_count + 1));
 		return 0;
 	}

-	*sector_size = lms->sector_size;
-	*align_size = lms->align_size;
-
 	memset(&rd, 0, sizeof(rd));

 	strncpy(rd.rs.lockspace_name, ls->name, SANLK_NAME_LEN);
 	rd.rs.num_disks = 1;
 	strncpy(rd.rs.disks[0].path, lms->ss.host_id_disk.path, SANLK_PATH_LEN-1);
-	rd.rs.flags = (lms->sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) :
-						   (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	if (ls->free_lock_offset)
 		offset = ls->free_lock_offset;
@@ -1328,8 +1091,6 @@ int lm_prepare_lockspace_sanlock(struct lockspace *ls)
 	char disk_path[SANLK_PATH_LEN];
 	char killpath[SANLK_PATH_LEN];
 	char killargs[SANLK_PATH_LEN];
-	int sector_size = 0;
-	int align_size = 0;
 	int gl_found;
 	int ret, rv;

@@ -1399,7 +1160,7 @@ int lm_prepare_lockspace_sanlock(struct lockspace *ls)
 		goto fail;
 	}

-	lms = zalloc(sizeof(struct lm_sanlock));
+	lms = malloc(sizeof(struct lm_sanlock));
 	if (!lms) {
 		ret = -ENOMEM;
 		goto fail;
@@ -1408,6 +1169,7 @@ int lm_prepare_lockspace_sanlock(struct lockspace *ls)
 	memset(lsname, 0, sizeof(lsname));
 	strncpy(lsname, ls->name, SANLK_NAME_LEN);

+	memset(lms, 0, sizeof(struct lm_sanlock));
 	memcpy(lms->ss.name, lsname, SANLK_NAME_LEN);
 	lms->ss.host_id_disk.offset = 0;
 	lms->ss.host_id = ls->host_id;
@@ -1445,34 +1207,13 @@ int lm_prepare_lockspace_sanlock(struct lockspace *ls)
 		goto fail;
 	}

-	rv = get_sizes_lockspace(disk_path, &sector_size, &align_size);
-	if (rv < 0) {
-		log_error("S %s prepare_lockspace_san cannot get sector/align sizes %d", lsname, rv);
+	lms->align_size = sanlock_align(&lms->ss.host_id_disk);
+	if (lms->align_size <= 0) {
+		log_error("S %s prepare_lockspace_san align error %d", lsname, lms->align_size);
 		ret = -EMANAGER;
 		goto fail;
 	}

-	if (!sector_size) {
-		log_debug("S %s prepare_lockspace_san using old size method", lsname);
-		/* use the old method */
-		align_size = sanlock_align(&lms->ss.host_id_disk);
-		if (align_size <= 0) {
-			log_error("S %s prepare_lockspace_san align error %d", lsname, align_size);
-			ret = -EINVAL;
-			goto fail;
-		}
-		sector_size = (align_size == ONE_MB) ? 512 : 4096;
-		log_debug("S %s prepare_lockspace_san found old sector_size %d align_size %d", lsname, sector_size, align_size);
-	}
-
-	log_debug("S %s prepare_lockspace_san sizes %d %d", lsname, sector_size, align_size);
-
-	lms->align_size = align_size;
-	lms->sector_size = sector_size;
-
-	lms->ss.flags = (sector_size == 4096) ? (SANLK_LSF_SECTOR4K | SANLK_LSF_ALIGN8M) :
-						(SANLK_LSF_SECTOR512 | SANLK_LSF_ALIGN1M);
-
 	gl_found = gl_is_enabled(ls, lms);
 	if (gl_found < 0) {
 		log_error("S %s prepare_lockspace_san gl_enabled error %d", lsname, gl_found);
@@ -1610,7 +1351,6 @@ static int lm_add_resource_sanlock(struct lockspace *ls, struct resource *r)
 	strncpy(rds->rs.name, r->name, SANLK_NAME_LEN);
 	rds->rs.num_disks = 1;
 	memcpy(rds->rs.disks[0].path, lms->ss.host_id_disk.path, SANLK_PATH_LEN);
-	rds->rs.flags = (lms->sector_size == 4096) ? (SANLK_RES_SECTOR4K | SANLK_RES_ALIGN8M) : (SANLK_RES_SECTOR512 | SANLK_RES_ALIGN1M);

 	if (r->type == LD_RT_GL)
 		rds->rs.disks[0].offset = GL_LOCK_BEGIN * lms->align_size;
@@ -1620,9 +1360,10 @@ static int lm_add_resource_sanlock(struct lockspace *ls, struct resource *r)
 	/* LD_RT_LV offset is set in each lm_lock call from lv_args. */

 	if (r->type == LD_RT_GL || r->type == LD_RT_VG) {
-		rds->vb = zalloc(sizeof(struct val_blk));
+		rds->vb = malloc(sizeof(struct val_blk));
 		if (!rds->vb)
 			return -ENOMEM;
+		memset(rds->vb, 0, sizeof(struct val_blk));
 	}

 	return 0;
@@ -2119,20 +1860,12 @@ int lm_unlock_sanlock(struct lockspace *ls, struct resource *r,
 	if (rv < 0)
 		log_error("S %s R %s unlock_san release error %d", ls->name, r->name, rv);

-	/*
-	 * sanlock may return an error here if it fails to release the lease on
-	 * disk because of an io timeout.  But, sanlock will continue trying to
-	 * release the lease after this call returns.  We shouldn't return an
-	 * error here which would result in lvmlockd-core keeping the lock
-	 * around.  By releasing the lock in lvmlockd-core at this point,
-	 * lvmlockd may send another acquire request to lvmlockd.  If sanlock
-	 * has not been able to release the previous instance of the lock yet,
-	 * then it will return an error for the new request.  But, acquiring a
-	 * new lock is able o fail gracefully, until sanlock is finally able to
-	 * release the old lock.
-	 */
+	if (rv == -EIO)
+		rv = -ELOCKIO;
+	else if (rv < 0)
+		rv = -ELMERR;

-	return 0;
+	return rv;
 }

 int lm_hosts_sanlock(struct lockspace *ls, int notify)
--- a/daemons/lvmpolld/Makefile.in
+++ b/daemons/lvmpolld/Makefile.in
@@ -29,16 +29,15 @@ include $(top_builddir)/make.tmpl

 CFLAGS += $(EXTRA_EXEC_CFLAGS)
 INCLUDES += -I$(top_srcdir)/libdaemon/server
-LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
-LIBS += $(DAEMON_LIBS) $(PTHREAD_LIBS)
+LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
+LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS)

-lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
-	@echo "    [CC] $@"
-	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
+lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
+		    $(top_builddir)/libdaemon/server/libdaemonserver.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(INTERNAL_LIBS) $(LIBS)

 install_lvmpolld: lvmpolld
-	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
+	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

 install_lvm2: install_lvmpolld

--- a/daemons/lvmpolld/lvmpolld-common.h
+++ b/daemons/lvmpolld/lvmpolld-common.h
@@ -18,6 +18,8 @@
 #ifndef _LVM_LVMPOLLD_COMMON_H
 #define _LVM_LVMPOLLD_COMMON_H

+#define _REENTRANT
+
 #include "tools/tool.h"

 #include "lvmpolld-cmd-utils.h"
--- a/daemons/lvmpolld/lvmpolld-core.c
+++ b/daemons/lvmpolld/lvmpolld-core.c
@@ -915,7 +915,7 @@ int main(int argc, char *argv[])
 	int option_index = 0;
 	int client = 0, server = 0;
 	unsigned action = ACTION_MAX;
-	struct timespec timeout;
+	struct timeval timeout;
 	daemon_idle di = { .ptimeout = &timeout };
 	struct lvmpolld_state ls = { .log_config = "" };
 	daemon_state s = {
--- a/device_mapper/Makefile
+++ b/device_mapper/Makefile
@@ -10,12 +10,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

-# NOTE: this Makefile only works as 'include' for toplevel Makefile
-#       which defined all top_* variables
-
 DEVICE_MAPPER_SOURCE=\
 	device_mapper/datastruct/bitset.c \
-	device_mapper/ioctl/libdm-iface.c \
 	device_mapper/libdm-common.c \
 	device_mapper/libdm-config.c \
 	device_mapper/libdm-deptree.c \
@@ -28,25 +24,29 @@ DEVICE_MAPPER_SOURCE=\
 	device_mapper/regex/matcher.c \
 	device_mapper/regex/parse_rx.c \
 	device_mapper/regex/ttree.c \
-	device_mapper/vdo/status.c \
-	device_mapper/vdo/vdo_target.c
+	device_mapper/ioctl/libdm-iface.c \
+	device_mapper/vdo/vdo_target.c \
+	device_mapper/vdo/status.c

-DEVICE_MAPPER_TARGET = device_mapper/libdevice-mapper.a
-DEVICE_MAPPER_DEPENDS = $(DEVICE_MAPPER_SOURCE:%.c=%.d)
-DEVICE_MAPPER_OBJECTS = $(DEVICE_MAPPER_SOURCE:%.c=%.o)
-CLEAN_TARGETS += $(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) \
-	$(DEVICE_MAPPER_SOURCE:%.c=%.gcda) \
-	$(DEVICE_MAPPER_SOURCE:%.c=%.gcno) \
-	$(DEVICE_MAPPER_TARGET)
+DEVICE_MAPPER_DEPENDS=$(addprefix $(top_builddir)/,$(subst .c,.d,$(DEVICE_MAPPER_SOURCE)))
+DEVICE_MAPPER_OBJECTS=$(addprefix $(top_builddir)/,$(subst .c,.o,$(DEVICE_MAPPER_SOURCE)))
+CLEAN_TARGETS+=$(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS)

 #$(DEVICE_MAPPER_DEPENDS): INCLUDES+=$(VDO_INCLUDES)
 #$(DEVICE_MAPPER_OBJECTS): INCLUDES+=$(VDO_INCLUDES)

-$(DEVICE_MAPPER_TARGET): $(DEVICE_MAPPER_OBJECTS)
+ifeq ("$(USE_TRACKING)","yes")
+ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \
+ help check check_local check_cluster check_lvmetad check_lvmpolld))
+	-include $(DEVICE_MAPPER_DEPENDS)
+endif
+endif
+
+$(DEVICE_MAPPER_OBJECTS): INCLUDES+=-I$(top_srcdir)/device_mapper/
+
+$(top_builddir)/device_mapper/libdevice-mapper.a: $(DEVICE_MAPPER_OBJECTS)
 	@echo "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null

-ifeq ("$(DEPENDS)","yes")
-include $(DEVICE_MAPPER_DEPENDS)
-endif
+CLEAN_TARGETS+=$(top_builddir)/device_mapper/libdevice-mapper.a
--- a/device_mapper/all.h
+++ b/device_mapper/all.h
@@ -116,14 +116,10 @@ enum {
 	DM_DEVICE_MKNODES,

 	DM_DEVICE_LIST_VERSIONS,
-
+	
 	DM_DEVICE_TARGET_MSG,

-	DM_DEVICE_SET_GEOMETRY,
-
-	DM_DEVICE_ARM_POLL,
-
-	DM_DEVICE_GET_TARGET_VERSION
+	DM_DEVICE_SET_GEOMETRY
 };

 /*
@@ -164,20 +160,20 @@ struct dm_info {
 struct dm_deps {
 	uint32_t count;
 	uint32_t filler;
-	uint64_t device[];
+	uint64_t device[0];
 };

 struct dm_names {
 	uint64_t dev;
 	uint32_t next;		/* Offset to next struct from start of this struct */
-	char name[];
+	char name[0];
 };

 struct dm_versions {
 	uint32_t next;		/* Offset to next struct from start of this struct */
 	uint32_t version[3];

-	char name[];
+	char name[0];
 };

 int dm_get_library_version(char *version, size_t size);
@@ -234,7 +230,6 @@ int dm_task_suppress_identical_reload(struct dm_task *dmt);
 int dm_task_secure_data(struct dm_task *dmt);
 int dm_task_retry_remove(struct dm_task *dmt);
 int dm_task_deferred_remove(struct dm_task *dmt);
-void dm_task_skip_reload_params_compare(struct dm_task *dmt);

 /*
 * Record timestamp immediately after the ioctl returns.
@@ -384,7 +379,7 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
 			struct dm_status_cache **status);

 struct dm_status_writecache {
-	uint64_t error;
+	uint32_t error;
 	uint64_t total_blocks;
 	uint64_t free_blocks;
 	uint64_t writeback_blocks;
@@ -393,15 +388,6 @@ struct dm_status_writecache {
 int dm_get_status_writecache(struct dm_pool *mem, const char *params,
                             struct dm_status_writecache **status);

-struct dm_status_integrity {
-	uint64_t number_of_mismatches;
-	uint64_t provided_data_sectors;
-	uint64_t recalc_sector;
-};
-
-int dm_get_status_integrity(struct dm_pool *mem, const char *params,
-                            struct dm_status_integrity **status);
-
 /*
 * Parse params from STATUS call for snapshot target
 *
@@ -915,7 +901,6 @@ int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
 #define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002
 #define DM_CACHE_FEATURE_PASSTHROUGH  0x00000004
 #define DM_CACHE_FEATURE_METADATA2    0x00000008 /* cache v1.10 */
-#define DM_CACHE_FEATURE_NO_DISCARD_PASSDOWN 0x00000010

 struct dm_config_node;
 /*
@@ -937,91 +922,21 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 				  const char *origin_uuid,
 				  const char *policy_name,
 				  const struct dm_config_node *policy_settings,
-				  uint64_t metadata_start,
-				  uint64_t metadata_len,
-				  uint64_t data_start,
-				  uint64_t data_len,
 				  uint32_t data_block_size);

-struct writecache_settings {
-	uint64_t high_watermark;
-	uint64_t low_watermark;
-	uint64_t writeback_jobs;
-	uint64_t autocommit_blocks;
-	uint64_t autocommit_time; /* in milliseconds */
-	uint32_t fua;
-	uint32_t nofua;
-	uint32_t cleaner;
-	uint32_t max_age;
-
-	/*
-	 * Allow an unrecognized key and its val to be passed to the kernel for
-	 * cases where a new kernel setting is added but lvm doesn't know about
-	 * it yet.
-	 */
-	char *new_key;
-	char *new_val;
-
-	/*
-	 * Flag is 1 if a value has been set.
-	 */
-	unsigned high_watermark_set:1;
-	unsigned low_watermark_set:1;
-	unsigned writeback_jobs_set:1;
-	unsigned autocommit_blocks_set:1;
-	unsigned autocommit_time_set:1;
-	unsigned fua_set:1;
-	unsigned nofua_set:1;
-	unsigned cleaner_set:1;
-	unsigned max_age_set:1;
-};
-
 int dm_tree_node_add_writecache_target(struct dm_tree_node *node,
 				uint64_t size,
 				const char *origin_uuid,
 				const char *cache_uuid,
-				int pmem,
-				uint32_t writecache_block_size,
-				struct writecache_settings *settings);
+				int pmem);

-struct integrity_settings {
-	char mode[8];
-	uint32_t tag_size;
-	uint32_t block_size;       /* optional table param always set by lvm */
-	const char *internal_hash; /* optional table param always set by lvm */
-
-	uint32_t journal_sectors;
-	uint32_t interleave_sectors;
-	uint32_t buffer_sectors;
-	uint32_t journal_watermark;
-	uint32_t commit_time;
-	uint32_t bitmap_flush_interval;
-	uint64_t sectors_per_bit;
-
-	unsigned journal_sectors_set:1;
-	unsigned interleave_sectors_set:1;
-	unsigned buffer_sectors_set:1;
-	unsigned journal_watermark_set:1;
-	unsigned commit_time_set:1;
-	unsigned bitmap_flush_interval_set:1;
-	unsigned sectors_per_bit_set:1;
-};
-
-int dm_tree_node_add_integrity_target(struct dm_tree_node *node,
-				uint64_t size,
-				const char *origin_uuid,
-				const char *meta_uuid,
-				struct integrity_settings *settings,
-				int recalculate);

 /*
 * VDO target
 */
 int dm_tree_node_add_vdo_target(struct dm_tree_node *node,
 				uint64_t size,
-				const char *vdo_pool_name,
 				const char *data_uuid,
-				uint64_t data_size,
 				const struct dm_vdo_target_params *param);

 /*
@@ -1318,7 +1233,7 @@ int dm_bit_get_next(dm_bitset_t bs, int last_bit);
 int dm_bit_get_last(dm_bitset_t bs);
 int dm_bit_get_prev(dm_bitset_t bs, int last_bit);

-#define DM_BITS_PER_INT ((unsigned)sizeof(int) * CHAR_BIT)
+#define DM_BITS_PER_INT (sizeof(int) * CHAR_BIT)

 #define dm_bit(bs, i) \
   ((bs)[((i) / DM_BITS_PER_INT) + 1] & (0x1 << ((i) & (DM_BITS_PER_INT - 1))))
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -15,7 +15,6 @@

 #include "base/memory/zalloc.h"
 #include "device_mapper/misc/dmlib.h"
-#include "device_mapper/misc/dm-ioctl.h"
 #include "device_mapper/ioctl/libdm-targets.h"
 #include "device_mapper/libdm-common.h"

@@ -33,9 +32,11 @@
 #else
 #  define MAJOR(x) major((x))
 #  define MINOR(x) minor((x))
-#  define MKDEV(x,y) makedev(((dev_t)x),((dev_t)y))
+#  define MKDEV(x,y) makedev((x),(y))
 #endif

+#include "device_mapper/misc/dm-ioctl.h"
+
 /*
 * Ensure build compatibility.  
 * The hard-coded versions here are the highest present 
@@ -116,12 +117,6 @@ static struct cmd_data _cmd_data_v4[] = {
 #ifdef DM_DEV_SET_GEOMETRY
 	{"setgeometry",	DM_DEV_SET_GEOMETRY,	{4, 6, 0}},
 #endif
-#ifdef DM_DEV_ARM_POLL
-	{"armpoll",	DM_DEV_ARM_POLL,	{4, 36, 0}},
-#endif
-#ifdef DM_GET_TARGET_VERSION
-	{"target-version", DM_GET_TARGET_VERSION, {4, 41, 0}},
-#endif
 };
 /* *INDENT-ON* */

@@ -205,7 +200,7 @@ static int _get_proc_number(const char *file, const char *name,
 	}

 	while (getline(&line, &len, fl) != -1) {
-		if (sscanf(line, "%u %255s\n", &num, &nm[0]) == 2) {
+		if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) {
 			if (!strcmp(name, nm)) {
 				if (number) {
 					*number = num;
@@ -266,7 +261,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
 		return -1;
 	}

-	if (major && buf.st_rdev != MKDEV(major, minor)) {
+	if (major && buf.st_rdev != MKDEV((dev_t)major, (dev_t)minor)) {
 		log_verbose("%s: Wrong device number: (%u, %u) instead of "
 			    "(%u, %u)", control,
 			    MAJOR(buf.st_mode), MINOR(buf.st_mode),
@@ -309,7 +304,7 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
 	(void) dm_prepare_selinux_context(control, S_IFCHR);
 	old_umask = umask(DM_CONTROL_NODE_UMASK);
 	if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
-		  MKDEV(major, minor)) < 0)  {
+		  MKDEV((dev_t)major, (dev_t)minor)) < 0)  {
 		log_sys_error("mknod", control);
 		ret = 0;
 	}
@@ -473,7 +468,6 @@ static void _dm_zfree_string(char *string)
 {
 	if (string) {
 		memset(string, 0, strlen(string));
-		asm volatile ("" ::: "memory"); /* Compiler barrier. */
 		free(string);
 	}
 }
@@ -482,7 +476,6 @@ static void _dm_zfree_dmi(struct dm_ioctl *dmi)
 {
 	if (dmi) {
 		memset(dmi, 0, dmi->data_size);
-		asm volatile ("" ::: "memory"); /* Compiler barrier. */
 		free(dmi);
 	}
 }
@@ -805,11 +798,6 @@ int dm_task_suppress_identical_reload(struct dm_task *dmt)
 	return 1;
 }

-void dm_task_skip_reload_params_compare(struct dm_task *dmt)
-{
-	dmt->skip_reload_params_compare = 1;
-}
-
 int dm_task_set_add_node(struct dm_task *dmt, dm_add_node_t add_node)
 {
 	switch (add_node) {
@@ -1094,22 +1082,6 @@ static int _lookup_dev_name(uint64_t dev, char *buf, size_t len)
 	return r;
 }

-static int _add_params(int type)
-{
-	switch (type) {
-	case DM_DEVICE_REMOVE_ALL:
-	case DM_DEVICE_CREATE:
-	case DM_DEVICE_REMOVE:
-	case DM_DEVICE_SUSPEND:
-	case DM_DEVICE_STATUS:
-	case DM_DEVICE_CLEAR:
-	case DM_DEVICE_ARM_POLL:
-		return 0; /* IOCTL_FLAGS_NO_PARAMS in drivers/md/dm-ioctl.c */
-	default:
-		return 1;
-	}
-}
-
 static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 {
 	const size_t min_size = 16 * 1024;
@@ -1122,15 +1094,11 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 	char *b, *e;
 	int count = 0;

-	if (_add_params(dmt->type))
-		for (t = dmt->head; t; t = t->next) {
-			len += sizeof(struct dm_target_spec);
-			len += strlen(t->params) + 1 + ALIGNMENT;
-			count++;
-		}
-	else if (dmt->head)
-		log_debug_activation(INTERNAL_ERROR "dm '%s' ioctl should not define parameters.",
-				     _cmd_data_v4[dmt->type].name);
+	for (t = dmt->head; t; t = t->next) {
+		len += sizeof(struct dm_target_spec);
+		len += strlen(t->params) + 1 + ALIGNMENT;
+		count++;
+	}

 	if (count && (dmt->sector || dmt->message)) {
 		log_error("targets and message are incompatible");
@@ -1214,7 +1182,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 		}

 		dmi->flags |= DM_PERSISTENT_DEV_FLAG;
-		dmi->dev = MKDEV(dmt->major, dmt->minor);
+		dmi->dev = MKDEV((dev_t)dmt->major, (dev_t)dmt->minor);
 	}

 	/* Does driver support device number referencing? */
@@ -1280,10 +1248,9 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 	b = (char *) (dmi + 1);
 	e = (char *) dmi + len;

-	if (_add_params(dmt->type))
-		for (t = dmt->head; t; t = t->next)
-			if (!(b = _add_target(t, b, e)))
-				goto_bad;
+	for (t = dmt->head; t; t = t->next)
+		if (!(b = _add_target(t, b, e)))
+			goto_bad;

 	if (dmt->newname)
 		strcpy(b, dmt->newname);
@@ -1487,7 +1454,6 @@ static int _create_and_load_v4(struct dm_task *dmt)
 	dmt->uuid = NULL;
 	free(dmt->mangled_uuid);
 	dmt->mangled_uuid = NULL;
-	_dm_task_free_targets(dmt);

 	if (dm_task_run(dmt))
 		return 1;
@@ -1498,7 +1464,6 @@ static int _create_and_load_v4(struct dm_task *dmt)
 	dmt->uuid = NULL;
 	free(dmt->mangled_uuid);
 	dmt->mangled_uuid = NULL;
-	_dm_task_free_targets(dmt);

 	/*
 	 * Also udev-synchronize "remove" dm task that is a part of this revert!
@@ -1580,29 +1545,11 @@ static int _reload_with_suppression_v4(struct dm_task *dmt)
 		len = strlen(t2->params);
 		while (len-- > 0 && t2->params[len] == ' ')
 			t2->params[len] = '\0';
-
-		if (t1->start != t2->start) {
-			log_debug("reload %u:%u start diff", task->major, task->minor);
+		if ((t1->start != t2->start) ||
+		    (t1->length != t2->length) ||
+		    (strcmp(t1->type, t2->type)) ||
+		    (strcmp(t1->params, t2->params)))
 			goto no_match;
-		}
-		if (t1->length != t2->length) {
-			log_debug("reload %u:%u length diff", task->major, task->minor);
-			goto no_match;
-		}
-		if (strcmp(t1->type, t2->type)) {
-			log_debug("reload %u:%u type diff %s %s", task->major, task->minor, t1->type, t2->type);
-			goto no_match;
-		}
-		if (strcmp(t1->params, t2->params)) {
-			if (dmt->skip_reload_params_compare)
-				log_debug("reload %u:%u skip params ignore %s %s",
-					  task->major, task->minor, t1->params, t2->params);
-			else {
-				log_debug("reload %u:%u params diff", task->major, task->minor);
-				goto no_match;
-			}
-		}
-
 		t1 = t1->next;
 		t2 = t2->next;
 	}
--- a/device_mapper/ioctl/libdm-targets.h
+++ b/device_mapper/ioctl/libdm-targets.h
@@ -59,7 +59,6 @@ struct dm_task {
 	int skip_lockfs;
 	int query_inactive_table;
 	int suppress_identical_reload;
-	int skip_reload_params_compare;
 	dm_add_node_t add_node;
 	uint64_t existing_table_size;
 	int cookie_set;
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -512,7 +512,7 @@ int unmangle_string(const char *str, const char *str_name, size_t len,
 	int strict = mode != DM_STRING_MANGLING_NONE;
 	char str_rest[DM_NAME_LEN];
 	size_t i, j;
-	unsigned int code;
+	int code;
 	int r = 0;

 	if (!str || !buf)
@@ -1042,7 +1042,7 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
 {
 	char path[PATH_MAX];
 	struct stat info;
-	dev_t dev = MKDEV(major, minor);
+	dev_t dev = MKDEV((dev_t)major, (dev_t)minor);
 	mode_t old_mask;

 	if (!_build_dev_path(path, sizeof(path), dev_name))
@@ -1445,7 +1445,7 @@ struct node_op_parms {
 	char *old_name;
 	int warn_if_udev_failed;
 	unsigned rely_on_udev;
-	char names[];
+	char names[0];
 };

 static void _store_str(char **pos, char **ptr, const char *str)
@@ -1765,7 +1765,7 @@ static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min,
 			return 0;
 		}
 		devmapper += 12; /* skip fixed prefix */
-		for (i = 0; devmapper[i] && devmapper[i] != ' ' && i < sizeof(root)-1; ++i)
+		for (i = 0; devmapper[i] && devmapper[i] != ' ' && i < sizeof(root); ++i)
 			root[i] = devmapper[i];
 		root[i] = 0;
 		_unmangle_mountinfo_string(root, buf);
@@ -1874,120 +1874,6 @@ bad:
 	return r;
 }

-static int _sysfs_get_dev_major_minor(const char *path, uint32_t major, uint32_t minor)
-{
-	FILE *fp;
-	uint32_t ma, mi;
-	int r;
-
-	if (!(fp = fopen(path, "r")))
-		return 0;
-
-	r = (fscanf(fp, "%" PRIu32 ":%" PRIu32 , &ma, &mi) == 2) &&
-		(ma == major) && (mi == minor);
-	// log_debug("Checking %s  %u:%u  -> %d", path, ma, mi, r);
-
-	if (fclose(fp))
-		log_sys_error("fclose", path);
-
-	return r;
-}
-
-static int _sysfs_find_kernel_name(uint32_t major, uint32_t minor, char *buf, size_t buf_size)
-{
-	const char *name, *name_dev;
-	char path[PATH_MAX];
-	struct dirent *dirent, *dirent_dev;
-	DIR *d, *d_dev;
-	struct stat st;
-	int r = 0, sz;
-
-	if (!*_sysfs_dir ||
-	    dm_snprintf(path, sizeof(path), "%s/block/", _sysfs_dir) < 0) {
-		log_error("Failed to build sysfs_path.");
-		return 0;
-	}
-
-	if (!(d = opendir(path))) {
-		log_sys_error("opendir", path);
-		return 0;
-	}
-
-	while (!r && (dirent = readdir(d))) {
-		name = dirent->d_name;
-
-		if (!strcmp(name, ".") || !strcmp(name, ".."))
-			continue;
-
-		if ((sz = dm_snprintf(path, sizeof(path), "%sblock/%s/dev",
-				      _sysfs_dir, name)) == -1) {
-			log_warn("Couldn't create path for %s.", name);
-			continue;
-		}
-
-		if (_sysfs_get_dev_major_minor(path, major, minor)) {
-			r = dm_strncpy(buf, name, buf_size);
-			break; /* found */
-		}
-
-		path[sz - 4] = 0; /* strip /dev from end of path string */
-		if (stat(path, &st))
-			continue;
-
-		if (S_ISDIR(st.st_mode)) {
-
-			/* let's assume there is no tree-complex device in past systems */
-			if (!(d_dev = opendir(path))) {
-				log_sys_debug("opendir", path);
-				continue;
-			}
-
-			while ((dirent_dev = readdir(d_dev))) {
-				name_dev = dirent_dev->d_name;
-
-				/* skip known ignorable paths */
-				if (!strcmp(name_dev, ".") || !strcmp(name_dev, "..") ||
-				    !strcmp(name_dev, "bdi") ||
-				    !strcmp(name_dev, "dev") ||
-				    !strcmp(name_dev, "device") ||
-				    !strcmp(name_dev, "holders") ||
-				    !strcmp(name_dev, "integrity") ||
-				    !strcmp(name_dev, "loop") ||
-				    !strcmp(name_dev, "queueu") ||
-				    !strcmp(name_dev, "md") ||
-				    !strcmp(name_dev, "mq") ||
-				    !strcmp(name_dev, "power") ||
-				    !strcmp(name_dev, "removable") ||
-				    !strcmp(name_dev, "slave") ||
-				    !strcmp(name_dev, "slaves") ||
-				    !strcmp(name_dev, "subsystem") ||
-				    !strcmp(name_dev, "trace") ||
-				    !strcmp(name_dev, "uevent"))
-					continue;
-
-				if (dm_snprintf(path, sizeof(path), "%sblock/%s/%s/dev",
-						_sysfs_dir, name, name_dev) == -1) {
-					log_warn("Couldn't create path for %s/%s.", name, name_dev);
-					continue;
-				}
-
-				if (_sysfs_get_dev_major_minor(path, major, minor)) {
-					r = dm_strncpy(buf, name_dev, buf_size);
-					break; /* found */
-				}
-			}
-
-			if (closedir(d_dev))
-				log_sys_debug("closedir", name);
-		}
-	}
-
-	if (closedir(d))
-		log_sys_debug("closedir", path);
-
-	return r;
-}
-
 static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, size_t buf_size)
 {
 	char *name, *sysfs_path, *temp_buf = NULL;
@@ -2010,11 +1896,8 @@ static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, siz
 	if ((size = readlink(sysfs_path, temp_buf, PATH_MAX - 1)) < 0) {
 		if (errno != ENOENT)
 			log_sys_error("readlink", sysfs_path);
-		else {
+		else
 			log_sys_debug("readlink", sysfs_path);
-			r = _sysfs_find_kernel_name(major, minor, buf, buf_size);
-			goto out;
-		}
 		goto bad;
 	}
 	temp_buf[size] = '\0';
@@ -2034,7 +1917,6 @@ static int _sysfs_get_kernel_name(uint32_t major, uint32_t minor, char *buf, siz
 	strcpy(buf, name);
 	r = 1;
 bad:
-out:
 	free(temp_buf);
 	free(sysfs_path);

--- a/device_mapper/libdm-config.c
+++ b/device_mapper/libdm-config.c
@@ -51,8 +51,6 @@ struct parser {

 	struct dm_pool *mem;
 	int no_dup_node_check;	/* whether to disable dup node checking */
-	const char *key;        /* last obtained key */
-	unsigned ignored_creation_time;
 };

 struct config_output {
@@ -178,7 +176,7 @@ static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, co
 	/* TODO? if (start == end) return 1; */

 	struct parser *p;
-	if (!(p = dm_pool_zalloc(cft->mem, sizeof(*p))))
+	if (!(p = dm_pool_alloc(cft->mem, sizeof(*p))))
 		return_0;

 	p->mem = cft->mem;
@@ -617,7 +615,6 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
 		match(TOK_SECTION_E);
 	} else {
 		match(TOK_EQ);
-		p->key = root->key;
 		if (!(value = _value(p)))
 			return_NULL;
 		if (root->v)
@@ -685,17 +682,8 @@ static struct dm_config_value *_type(struct parser *p)
 		errno = 0;
 		v->v.i = strtoll(p->tb, NULL, 0);	/* FIXME: check error */
 		if (errno) {
-			if (errno == ERANGE && p->key &&
-			    strcmp("creation_time", p->key) == 0) {
-				/* Due to a bug in some older 32bit builds (<2.02.169),
-				 * lvm was able to produce invalid creation_time string */
-				v->v.i = 1527120000; /* Pick 2018-05-24 day instead */
-				if (!p->ignored_creation_time++)
-					log_warn("WARNING: Invalid creation_time found in metadata (repaired with next metadata update).");
-			} else {
-				log_error("Failed to read int token.");
-				return NULL;
-			}
+			log_error("Failed to read int token.");
+			return NULL;
 		}
 		match(TOK_INT);
 		break;
--- a/device_mapper/libdm-deptree.c
+++ b/device_mapper/libdm-deptree.c
@@ -21,6 +21,7 @@

 #include <stdarg.h>
 #include <string.h>
+#include <sys/param.h>
 #include <sys/utsname.h>

 #define MAX_TARGET_PARAMSIZE 500000
@@ -38,7 +39,6 @@ enum {
 	SEG_STRIPED,
 	SEG_ZERO,
 	SEG_WRITECACHE,
-	SEG_INTEGRITY,
 	SEG_THIN_POOL,
 	SEG_THIN,
 	SEG_VDO,
@@ -79,7 +79,6 @@ static const struct {
 	{ SEG_STRIPED, "striped" },
 	{ SEG_ZERO, "zero"},
 	{ SEG_WRITECACHE, "writecache"},
-	{ SEG_INTEGRITY, "integrity"},
 	{ SEG_THIN_POOL, "thin-pool"},
 	{ SEG_THIN, "thin"},
 	{ SEG_VDO, "vdo" },
@@ -193,11 +192,6 @@ struct load_segment {
 	uint32_t min_recovery_rate;	/* raid kB/sec/disk */
 	uint32_t data_copies;		/* raid10 data_copies */

-	uint64_t metadata_start;	/* Cache */
-	uint64_t metadata_len;		/* Cache */
-	uint64_t data_start;		/* Cache */
-	uint64_t data_len;		/* Cache */
-
 	struct dm_tree_node *metadata;	/* Thin_pool + Cache */
 	struct dm_tree_node *pool;	/* Thin_pool, Thin */
 	struct dm_tree_node *external;	/* Thin */
@@ -205,7 +199,6 @@ struct load_segment {
 	uint64_t transaction_id;	/* Thin_pool */
 	uint64_t low_water_mark;	/* Thin_pool */
 	uint32_t data_block_size;       /* Thin_pool + cache */
-	uint32_t migration_threshold;   /* Cache */
 	unsigned skip_block_zeroing;	/* Thin_pool */
 	unsigned ignore_discard;	/* Thin_pool target vsn 1.1 */
 	unsigned no_discard_passdown;	/* Thin_pool target vsn 1.1 */
@@ -217,17 +210,9 @@ struct load_segment {
 	struct dm_tree_node *vdo_data;  /* VDO */
 	struct dm_vdo_target_params vdo_params; /* VDO */
 	const char *vdo_name;           /* VDO - device name is ALSO passed as table arg */
-	uint64_t vdo_data_size;		/* VDO - size of data storage device */

-	struct dm_tree_node *writecache_node;		/* writecache */
-	int writecache_pmem;				/* writecache, 1 if pmem, 0 if ssd */
-	uint32_t writecache_block_size;			/* writecache, in bytes */
-	struct writecache_settings writecache_settings;	/* writecache */
-
-	uint64_t integrity_data_sectors;		/* integrity (provided_data_sectors) */
-	struct dm_tree_node *integrity_meta_node;	/* integrity */
-	struct integrity_settings integrity_settings;	/* integrity */
-	int integrity_recalculate;			/* integrity */
+	struct dm_tree_node *cachevol;	/* writecache */
+	int cachevol_pmem;
 };

 /* Per-device properties */
@@ -274,16 +259,6 @@ struct load_properties {
 	 */
 	unsigned delay_resume_if_extended;

-	/*
-	 * When comparing table lines to decide if a reload is
-	 * needed, ignore any differences betwen the lvm device
-	 * params and the kernel-reported device params.
-	 * dm-integrity reports many internal parameters on the
-	 * table line when lvm does not explicitly set them,
-	 * causing lvm and the kernel to have differing params.
-	 */
-	unsigned skip_reload_params_compare;
-
 	/*
 	 * Call node_send_messages(), set to 2 if there are messages
 	 * When != 0, it validates matching transaction id, thus thin-pools
@@ -562,7 +537,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
 	dm_list_init(&node->activated);
 	dm_list_init(&node->props.segs);

-	dev = MKDEV(info->major, info->minor);
+	dev = MKDEV((dev_t)info->major, (dev_t)info->minor);

 	if (!dm_hash_insert_binary(dtree->devs, (const char *) &dev,
 				   sizeof(dev), node)) {
@@ -585,7 +560,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
 static struct dm_tree_node *_find_dm_tree_node(struct dm_tree *dtree,
 					       uint32_t major, uint32_t minor)
 {
-	dev_t dev = MKDEV(major, minor);
+	dev_t dev = MKDEV((dev_t)major, (dev_t)minor);

 	return dm_hash_lookup_binary(dtree->devs, (const char *) &dev,
 				     sizeof(dev));
@@ -1517,7 +1492,7 @@ static int _node_message(uint32_t major, uint32_t minor,
 			 int expected_errno, const char *message)
 {
 	struct dm_task *dmt;
-	int r = 0;
+	int r;

 	if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG)))
 		return_0;
@@ -1589,37 +1564,8 @@ static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_messa
 	}

 	if (!_node_message(dnode->info.major, dnode->info.minor,
-			   tm->expected_errno, buf)) {
-		switch (m->type) {
-		case DM_THIN_MESSAGE_CREATE_SNAP:
-		case DM_THIN_MESSAGE_CREATE_THIN:
-			if (errno == EEXIST) {
-				/*
-				 * ATM errno from ioctl() is preserved through code error path chain
-				 * If this would ever change, another way need to be used to
-				 * obtain result from failed DM message
-				 */
-				log_error("Thin pool %s already contain thin device with device_id %u.",
-					  _node_name(dnode), m->u.m_create_snap.device_id);
-				/*
-				 * TODO:
-				 *
-				 * Give some useful advice how to solve this problem,
-				 * until lvconvert --repair can handle this automatically
-				 */
-				log_error("Manual intervention may be required to remove device dev_id=%u in thin pool metadata.",
-					  m->u.m_create_snap.device_id);
-				log_error("Optionally new thin volume with device_id=%u can be manually added into a volume group.",
-					  m->u.m_create_snap.device_id);
-				log_warn("WARNING: When uncertain how to do this, contact support!");
-				return 0;
-			}
-			/* fall through */
-		default:
-			return_0;
-		}
-
-	}
+			   tm->expected_errno, buf))
+		return_0;

 	return 1;
 }
@@ -1666,15 +1612,6 @@ static int _thin_pool_node_send_messages(struct dm_tree_node *dnode,
 	if (!have_messages || !send)
 		return 1; /* transaction_id is matching */

-	if (stp.fail || stp.read_only || stp.needs_check) {
-		log_error("Cannot send messages to thin pool %s%s%s%s.",
-			  _node_name(dnode),
-			  stp.fail ? " in failed state" : "",
-			  stp.read_only ? " with read only metadata" : "",
-			  stp.needs_check ? " which needs check first" : "");
-		return 0;
-	}
-
 	dm_list_iterate_items(tmsg, &seg->thin_messages) {
 		if (!(_thin_pool_node_message(dnode, tmsg)))
 			return_0;
@@ -1821,12 +1758,7 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,

 		if (info.open_count) {
 			/* Skip internal non-toplevel opened nodes */
-			/* On some old udev systems without corrrect udev rules
-			 * this hack avoids 'leaking' active _mimageX legs after
-			 * deactivation of mirror LV. Other suffixes are not added
-			 * since it's expected newer systems with wider range of
-			 * supported targets also use better udev */
-			if (level && !strstr(name, "_mimage"))
+			if (level)
 				continue;

 			/* When retry is not allowed, error */
@@ -1866,7 +1798,7 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,

 		if (!_deactivate_node(name, info.major, info.minor,
 				      &child->dtree->cookie, child->udev_flags,
-				      child->dtree->retry_remove)) {
+				      (level == 0) ? child->dtree->retry_remove : 0)) {
 			log_error("Unable to deactivate %s (" FMTu32 ":"
 				  FMTu32 ").", name, info.major, info.minor);
 			r = 0;
@@ -2136,7 +2068,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
 	return r;
 }

-static int _create_node(struct dm_tree_node *dnode, struct dm_tree_node *parent)
+static int _create_node(struct dm_tree_node *dnode)
 {
 	int r = 0;
 	struct dm_task *dmt;
@@ -2185,15 +2117,38 @@ static int _create_node(struct dm_tree_node *dnode, struct dm_tree_node *parent)
 				  "Unable to get DM task info for %s.",
 				  dnode->name);
 	}
-
-	if (r)
-		dm_list_add_h(&parent->activated, &dnode->activated_list);
 out:
 	dm_task_destroy(dmt);

 	return r;
 }

+/*
+ * _remove_node
+ *
+ * This function is only used to remove a DM device that has failed
+ * to load any table.
+ */
+static int _remove_node(struct dm_tree_node *dnode)
+{
+	if (!dnode->info.exists)
+		return 1;
+
+	if (dnode->info.live_table || dnode->info.inactive_table) {
+		log_error(INTERNAL_ERROR
+			  "_remove_node called on device with loaded table(s).");
+		return 0;
+	}
+
+	if (!_deactivate_node(dnode->name, dnode->info.major, dnode->info.minor,
+			      &dnode->dtree->cookie, dnode->udev_flags, 0)) {
+		log_error("Failed to clean-up device with no table: %s.",
+			  _node_name(dnode));
+		return 0;
+	}
+	return 1;
+}
+
 static int _build_dev_string(char *devbuf, size_t bufsize, struct dm_tree_node *node)
 {
 	if (!dm_format_dev(devbuf, bufsize, node->info.major, node->info.minor)) {
@@ -2595,7 +2550,7 @@ static int _cache_emit_segment_line(struct dm_task *dmt,
 				    char *params, size_t paramsize)
 {
 	int pos = 0;
-	unsigned feature_count;
+	/* unsigned feature_count; */
 	char data[DM_FORMAT_DEV_BUFSIZE];
 	char metadata[DM_FORMAT_DEV_BUFSIZE];
 	char origin[DM_FORMAT_DEV_BUFSIZE];
@@ -2620,37 +2575,29 @@ static int _cache_emit_segment_line(struct dm_task *dmt,
 	EMIT_PARAMS(pos, " %u", seg->data_block_size);

 	/* Features */
-
-	feature_count = 1; /* One of passthrough|writeback|writethrough is always set. */
-
+	/* feature_count = hweight32(seg->flags); */
+	/* EMIT_PARAMS(pos, " %u", feature_count); */
 	if (seg->flags & DM_CACHE_FEATURE_METADATA2)
-		feature_count++;
-
-	EMIT_PARAMS(pos, " %u", feature_count);
-
-	if (seg->flags & DM_CACHE_FEATURE_METADATA2)
-		EMIT_PARAMS(pos, " metadata2");
+		EMIT_PARAMS(pos, " 2 metadata2 ");
+	else
+		EMIT_PARAMS(pos, " 1 ");

 	if (seg->flags & DM_CACHE_FEATURE_PASSTHROUGH)
-		EMIT_PARAMS(pos, " passthrough");
+		EMIT_PARAMS(pos, "passthrough");
        else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK)
-		EMIT_PARAMS(pos, " writeback");
+		EMIT_PARAMS(pos, "writeback");
 	else
-		EMIT_PARAMS(pos, " writethrough");
+		EMIT_PARAMS(pos, "writethrough");

 	/* Cache Policy */
 	name = seg->policy_name ? : "default";

 	EMIT_PARAMS(pos, " %s", name);

-	/* Do not pass migration_threshold 2048 which is default */
-	EMIT_PARAMS(pos, " %u", (seg->policy_argc + (seg->migration_threshold != 2048) ? 1 : 0) * 2);
-	if (seg->migration_threshold != 2048)
-		    EMIT_PARAMS(pos, " migration_threshold %u", seg->migration_threshold);
+	EMIT_PARAMS(pos, " %u", seg->policy_argc * 2);
 	if (seg->policy_settings)
 		for (cn = seg->policy_settings->child; cn; cn = cn->sib)
-			if (cn->v) /* Skip deleted entry */
-				EMIT_PARAMS(pos, " %s %" PRIu64, cn->key, cn->v->v.i);
+			EMIT_PARAMS(pos, " %s %" PRIu64, cn->key, cn->v->v.i);

 	return 1;
 }
@@ -2660,169 +2607,18 @@ static int _writecache_emit_segment_line(struct dm_task *dmt,
 				    char *params, size_t paramsize)
 {
 	int pos = 0;
-	int count = 0;
-	uint32_t block_size;
 	char origin_dev[DM_FORMAT_DEV_BUFSIZE];
 	char cache_dev[DM_FORMAT_DEV_BUFSIZE];

 	if (!_build_dev_string(origin_dev, sizeof(origin_dev), seg->origin))
 		return_0;

-	if (!_build_dev_string(cache_dev, sizeof(cache_dev), seg->writecache_node))
+	if (!_build_dev_string(cache_dev, sizeof(cache_dev), seg->cachevol))
 		return_0;

-	if (seg->writecache_settings.high_watermark_set)
-		count += 2;
-	if (seg->writecache_settings.low_watermark_set)
-		count += 2;
-	if (seg->writecache_settings.writeback_jobs_set)
-		count += 2;
-	if (seg->writecache_settings.autocommit_blocks_set)
-		count += 2;
-	if (seg->writecache_settings.autocommit_time_set)
-		count += 2;
-	if (seg->writecache_settings.fua_set)
-		count += 1;
-	if (seg->writecache_settings.nofua_set)
-		count += 1;
-	if (seg->writecache_settings.cleaner_set && seg->writecache_settings.cleaner)
-		count += 1;
-	if (seg->writecache_settings.max_age_set)
-		count += 2;
-	if (seg->writecache_settings.new_key)
-		count += 2;
-
-	if (!(block_size = seg->writecache_block_size))
-		block_size = 4096;
-
-	EMIT_PARAMS(pos, "%s %s %s %u %d",
-		    seg->writecache_pmem ? "p" : "s",
-		    origin_dev, cache_dev, block_size, count);
-
-	if (seg->writecache_settings.high_watermark_set) {
-		EMIT_PARAMS(pos, " high_watermark %llu",
-			(unsigned long long)seg->writecache_settings.high_watermark);
-	}
-
-	if (seg->writecache_settings.low_watermark_set) {
-		EMIT_PARAMS(pos, " low_watermark %llu",
-			(unsigned long long)seg->writecache_settings.low_watermark);
-	}
-
-	if (seg->writecache_settings.writeback_jobs_set) {
-		EMIT_PARAMS(pos, " writeback_jobs %llu",
-			(unsigned long long)seg->writecache_settings.writeback_jobs);
-	}
-
-	if (seg->writecache_settings.autocommit_blocks_set) {
-		EMIT_PARAMS(pos, " autocommit_blocks %llu",
-			(unsigned long long)seg->writecache_settings.autocommit_blocks);
-	}
-
-	if (seg->writecache_settings.autocommit_time_set) {
-		EMIT_PARAMS(pos, " autocommit_time %llu",
-			(unsigned long long)seg->writecache_settings.autocommit_time);
-	}
-
-	if (seg->writecache_settings.fua_set) {
-		EMIT_PARAMS(pos, " fua");
-	}
-
-	if (seg->writecache_settings.nofua_set) {
-		EMIT_PARAMS(pos, " nofua");
-	}
-
-	if (seg->writecache_settings.cleaner_set && seg->writecache_settings.cleaner) {
-		EMIT_PARAMS(pos, " cleaner");
-	}
-
-	if (seg->writecache_settings.max_age_set) {
-		EMIT_PARAMS(pos, " max_age %u", seg->writecache_settings.max_age);
-	}
-
-	if (seg->writecache_settings.new_key) {
-		EMIT_PARAMS(pos, " %s %s",
-			seg->writecache_settings.new_key,
-			seg->writecache_settings.new_val);
-	}
-
-	return 1;
-}
-
-static int _integrity_emit_segment_line(struct dm_task *dmt,
-				    struct load_segment *seg,
-				    char *params, size_t paramsize)
-{
-	struct integrity_settings *set = &seg->integrity_settings;
-	int pos = 0;
-	int count;
-	char origin_dev[DM_FORMAT_DEV_BUFSIZE];
-	char meta_dev[DM_FORMAT_DEV_BUFSIZE];
-
-	if (!_build_dev_string(origin_dev, sizeof(origin_dev), seg->origin))
-		return_0;
-
-	if (seg->integrity_meta_node &&
-	    !_build_dev_string(meta_dev, sizeof(meta_dev), seg->integrity_meta_node))
-		return_0;
-
-	count = 3; /* block_size, internal_hash, fix_padding options are always passed */
-
-	if (seg->integrity_meta_node)
-		count++;
-
-	if (seg->integrity_recalculate)
-		count++;
-
-	if (set->journal_sectors_set)
-		count++;
-	if (set->interleave_sectors_set)
-		count++;
-	if (set->buffer_sectors_set)
-		count++;
-	if (set->journal_watermark_set)
-		count++;
-	if (set->commit_time_set)
-		count++;
-	if (set->bitmap_flush_interval_set)
-		count++;
-	if (set->sectors_per_bit_set)
-		count++;
-
-	EMIT_PARAMS(pos, "%s 0 %u %s %d fix_padding block_size:%u internal_hash:%s",
-		    origin_dev,
-		    set->tag_size,
-		    set->mode,
-		    count,
-		    set->block_size,
-		    set->internal_hash);
-
-	if (seg->integrity_meta_node)
-		EMIT_PARAMS(pos, " meta_device:%s", meta_dev);
-
-	if (seg->integrity_recalculate)
-		EMIT_PARAMS(pos, " recalculate");
-
-	if (set->journal_sectors_set)
-		EMIT_PARAMS(pos, " journal_sectors:%u", set->journal_sectors);
-
-	if (set->interleave_sectors_set)
-		EMIT_PARAMS(pos, " ineterleave_sectors:%u", set->interleave_sectors);
-
-	if (set->buffer_sectors_set)
-		EMIT_PARAMS(pos, " buffer_sectors:%u", set->buffer_sectors);
-
-	if (set->journal_watermark_set)
-		EMIT_PARAMS(pos, " journal_watermark:%u", set->journal_watermark);
-
-	if (set->commit_time_set)
-		EMIT_PARAMS(pos, " commit_time:%u", set->commit_time);
-
-	if (set->bitmap_flush_interval_set)
-		EMIT_PARAMS(pos, " bitmap_flush_interval:%u", set->bitmap_flush_interval);
-
-	if (set->sectors_per_bit_set)
-		EMIT_PARAMS(pos, " sectors_per_bit:%llu", (unsigned long long)set->sectors_per_bit);
+	EMIT_PARAMS(pos, "%s %s %s 4096 0",
+		    seg->cachevol_pmem ? "p" : "s",
+		    origin_dev, cache_dev);

 	return 1;
 }
@@ -2870,21 +2666,20 @@ static int _vdo_emit_segment_line(struct dm_task *dmt,
 	/* Unlike normal targets, current VDO requires device path */
 	if (dm_snprintf(data_dev, sizeof(data_dev), "/dev/dm-%u", seg->vdo_data->info.minor) < 0) {
 		log_error("Can create VDO data volume path for %s.", data);
-		return 0;
+		return_0;
 	}

-	EMIT_PARAMS(pos, "V2 %s " FMTu64 " %u " FMTu64 " %u %s %s %s "
-		    "maxDiscard %u ack %u bio %u bioRotationInterval %u cpu %u hash %u logical %u physical %u",
+	EMIT_PARAMS(pos, "%s %u %s " FMTu64 " " FMTu64 " %u on %s %s "
+		    "ack=%u,bio=%u,bioRotationInterval=%u,cpu=%u,hash=%u,logical=%u,physical=%u",
 		    data_dev,
-		    seg->vdo_data_size / 8, // this parameter is in 4K units
-		    seg->vdo_params.minimum_io_size * UINT32_C(512), //  sector to byte units
+		    (seg->vdo_params.emulate_512_sectors == 0) ? 4096 : 512,
+		    seg->vdo_params.use_read_cache ? "enabled" : "disabled",
+		    seg->vdo_params.read_cache_size_mb * UINT64_C(256),		// 1MiB -> 4KiB units
 		    seg->vdo_params.block_map_cache_size_mb * UINT64_C(256),	// 1MiB -> 4KiB units
-		    seg->vdo_params.block_map_era_length,
-		    seg->vdo_params.use_metadata_hints ? "on" : "off" ,
+		    seg->vdo_params.block_map_period,
 		    (seg->vdo_params.write_policy == DM_VDO_WRITE_POLICY_SYNC) ? "sync" :
 			(seg->vdo_params.write_policy == DM_VDO_WRITE_POLICY_ASYNC) ? "async" : "auto", // policy
 		    seg->vdo_name,
-		    seg->vdo_params.max_discard,
 		    seg->vdo_params.ack_threads,
 		    seg->vdo_params.bio_threads,
 		    seg->vdo_params.bio_rotation,
@@ -3011,10 +2806,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 		if (!_writecache_emit_segment_line(dmt, seg, params, paramsize))
 			return_0;
 		break;
-	case SEG_INTEGRITY:
-		if (!_integrity_emit_segment_line(dmt, seg, params, paramsize))
-			return_0;
-		break;
 	}

 	switch(seg->type) {
@@ -3027,7 +2818,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 	case SEG_THIN:
 	case SEG_CACHE:
 	case SEG_WRITECACHE:
-	case SEG_INTEGRITY:
 		break;
 	case SEG_CRYPT:
 	case SEG_LINEAR:
@@ -3132,9 +2922,6 @@ static int _load_node(struct dm_tree_node *dnode)
 	if (!dm_task_suppress_identical_reload(dmt))
 		log_warn("WARNING: Failed to suppress reload of identical tables.");

-	if (dnode->props.skip_reload_params_compare)
-		dm_task_skip_reload_params_compare(dmt);
-
 	if ((r = dm_task_run(dmt))) {
 		r = dm_task_get_info(dmt, &dnode->info);
 		if (r && !dnode->info.inactive_table)
@@ -3153,8 +2940,8 @@ static int _load_node(struct dm_tree_node *dnode)
 			if (!existing_table_size && dnode->props.delay_resume_if_new)
 				dnode->props.size_changed = 0;

-			log_debug_activation("Table size changed from %" PRIu64 " to %" PRIu64 " for %s.%s",
-					     existing_table_size,
+			log_debug_activation("Table size changed from %" PRIu64 " to %"
+					     PRIu64 " for %s.%s", existing_table_size,
 					     seg_start, _node_name(dnode),
 					     dnode->props.size_changed ? "" : " (Ignoring.)");

@@ -3206,16 +2993,6 @@ static int _dm_tree_revert_activated(struct dm_tree_node *parent)
 	return 1;
 }

-static int _dm_tree_wait_and_revert_activated(struct dm_tree_node *dnode)
-{
-	if (!dm_udev_wait(dm_tree_get_cookie(dnode)))
-		stack;
-
-	dm_tree_set_cookie(dnode, 0);
-
-	return _dm_tree_revert_activated(dnode);
-}
-
 int dm_tree_preload_children(struct dm_tree_node *dnode,
 			     const char *uuid_prefix,
 			     size_t uuid_prefix_len)
@@ -3245,7 +3022,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
 				return_0;

 		/* FIXME Cope if name exists with no uuid? */
-		if (!child->info.exists && !(node_created = _create_node(child, dnode)))
+		if (!child->info.exists && !(node_created = _create_node(child)))
 			return_0;

 		/* Propagate delayed resume from exteded child node */
@@ -3255,22 +3032,28 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
 		if (!child->info.inactive_table &&
 		    child->props.segment_count &&
 		    !_load_node(child)) {
-			stack;
 			/*
-			 * If the table load fails, try to device in the kernel
-			 * together with other created and preloaded devices.
+			 * If the table load does not succeed, we remove the
+			 * device in the kernel that would otherwise have an
+			 * empty table.  This makes the create + load of the
+			 * device atomic.  However, if other dependencies have
+			 * already been created and loaded; this code is
+			 * insufficient to remove those - only the node
+			 * encountering the table load failure is removed.
 			 */
-			if (!_dm_tree_wait_and_revert_activated(dnode))
-				stack;
-			r = 0;
-			continue;
+			if (node_created) {
+				if (!_remove_node(child))
+					return_0;
+				if (!dm_udev_wait(dm_tree_get_cookie(dnode)))
+					stack;
+				dm_tree_set_cookie(dnode, 0);
+				(void) _dm_tree_revert_activated(child);
+			}
+			return_0;
 		}

 		/* No resume for a device without parents or with unchanged or smaller size */
-		if (!dm_tree_node_num_children(child, 1))
-			continue;
-
-		if (child->props.size_changed <= 0)
+		if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0))
 			continue;

 		if (!child->info.inactive_table && !child->info.suspended)
@@ -3281,19 +3064,28 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
 				  &child->info, &child->dtree->cookie, child->udev_flags,
 				  child->info.suspended)) {
 			log_error("Unable to resume %s.", _node_name(child));
-			if (!_dm_tree_wait_and_revert_activated(dnode))
-				stack;
+			/* If the device was not previously active, we might as well remove this node. */
+			if (!child->info.live_table &&
+			    !_deactivate_node(child->name, child->info.major, child->info.minor,
+					      &child->dtree->cookie, child->udev_flags, 0))
+				log_error("Unable to deactivate %s.", _node_name(child));
 			r = 0;
+			/* Each child is handled independently */
 			continue;
 		}

 		if (node_created) {
+			/* Collect newly introduced devices for revert */
+			dm_list_add_h(&dnode->activated, &child->activated_list);
+
 			/* When creating new node also check transaction_id. */
 			if (child->props.send_messages &&
 			    !_node_send_messages(child, uuid_prefix, uuid_prefix_len, 0)) {
 				stack;
-				if (!_dm_tree_wait_and_revert_activated(dnode))
+				if (!dm_udev_wait(dm_tree_get_cookie(dnode)))
 					stack;
+				dm_tree_set_cookie(dnode, 0);
+				(void) _dm_tree_revert_activated(dnode);
 				r = 0;
 				continue;
 			}
@@ -3709,10 +3501,6 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 				  const char *origin_uuid,
 				  const char *policy_name,
 				  const struct dm_config_node *policy_settings,
-				  uint64_t metadata_start,
-				  uint64_t metadata_len,
-				  uint64_t data_start,
-				  uint64_t data_len,
 				  uint32_t data_block_size)
 {
 	struct dm_config_node *cn;
@@ -3788,14 +3576,9 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 	if (!_link_tree_nodes(node, seg->origin))
 		return_0;

-	seg->metadata_start = metadata_start;
-	seg->metadata_len = metadata_len;
-	seg->data_start = data_start;
-	seg->data_len = data_len;
 	seg->data_block_size = data_block_size;
 	seg->flags = feature_flags;
 	seg->policy_name = policy_name;
-	seg->migration_threshold = 2048; /* Default migration threshold 1MiB */

 	/* FIXME: better validation missing */
 	if (policy_settings) {
@@ -3808,18 +3591,10 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 				log_error("Cache policy parameter %s is without integer value.", cn->key);
 				return 0;
 			}
-			if (strcmp(cn->key, "migration_threshold") == 0) {
-				seg->migration_threshold = cn->v->v.i;
-				cn->v = NULL; /* skip this entry */
-			} else
-				seg->policy_argc++;
+			seg->policy_argc++;
 		}
 	}

-	/* Always some throughput available for cache to proceed */
-	if (seg->migration_threshold < data_block_size * 8)
-		seg->migration_threshold = data_block_size * 8;
-
 	return 1;
 }

@@ -3827,81 +3602,31 @@ int dm_tree_node_add_writecache_target(struct dm_tree_node *node,
 				  uint64_t size,
 				  const char *origin_uuid,
 				  const char *cache_uuid,
-				  int pmem,
-				  uint32_t writecache_block_size,
-				  struct writecache_settings *settings)
+				  int pmem)
 {
 	struct load_segment *seg;

 	if (!(seg = _add_segment(node, SEG_WRITECACHE, size)))
 		return_0;

-	seg->writecache_pmem = pmem;
-	seg->writecache_block_size = writecache_block_size;
+	seg->cachevol_pmem = pmem;

-	if (!(seg->writecache_node = dm_tree_find_node_by_uuid(node->dtree, cache_uuid))) {
-		log_error("Missing writecache's cache uuid %s.", cache_uuid);
+	if (!(seg->cachevol = dm_tree_find_node_by_uuid(node->dtree,
+							cache_uuid))) {
+		log_error("Missing writecache's cachevol uuid %s.", cache_uuid);
 		return 0;
 	}
-	if (!_link_tree_nodes(node, seg->writecache_node))
+	if (!_link_tree_nodes(node, seg->cachevol))
 		return_0;

-	if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree, origin_uuid))) {
+	if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree,
+						      origin_uuid))) {
 		log_error("Missing writecache's origin uuid %s.", origin_uuid);
 		return 0;
 	}
 	if (!_link_tree_nodes(node, seg->origin))
 		return_0;

-	memcpy(&seg->writecache_settings, settings, sizeof(struct writecache_settings));
-
-	if (settings->new_key && settings->new_val) {
-		seg->writecache_settings.new_key = dm_pool_strdup(node->dtree->mem, settings->new_key);
-		seg->writecache_settings.new_val = dm_pool_strdup(node->dtree->mem, settings->new_val);
-	}
-
-	return 1;
-}
-
-int dm_tree_node_add_integrity_target(struct dm_tree_node *node,
-				  uint64_t size,
-				  const char *origin_uuid,
-				  const char *meta_uuid,
-				  struct integrity_settings *settings,
-				  int recalculate)
-{
-	struct load_segment *seg;
-
-	if (!(seg = _add_segment(node, SEG_INTEGRITY, size)))
-		return_0;
-
-	if (!meta_uuid) {
-		log_error("No integrity meta uuid.");
-		return 0;
-	}
-
-	if (!(seg->integrity_meta_node = dm_tree_find_node_by_uuid(node->dtree, meta_uuid))) {
-		log_error("Missing integrity's meta uuid %s.", meta_uuid);
-		return 0;
-	}
-
-	if (!_link_tree_nodes(node, seg->integrity_meta_node))
-		return_0;
-
-	if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree, origin_uuid))) {
-		log_error("Missing integrity's origin uuid %s.", origin_uuid);
-		return 0;
-	}
-
-	if (!_link_tree_nodes(node, seg->origin))
-		return_0;
-
-	memcpy(&seg->integrity_settings, settings, sizeof(struct integrity_settings));
-
-	seg->integrity_recalculate = recalculate;
-
-	node->props.skip_reload_params_compare = 1;
-
 	return 1;
 }

@@ -4361,15 +4086,13 @@ int dm_tree_node_add_cache_target_base(struct dm_tree_node *node,

 	return dm_tree_node_add_cache_target(node, size, feature_flags & _mask,
 					     metadata_uuid, data_uuid, origin_uuid,
-					     policy_name, policy_settings, 0, 0, 0, 0, data_block_size);
+					     policy_name, policy_settings, data_block_size);
 }
 #endif

 int dm_tree_node_add_vdo_target(struct dm_tree_node *node,
 				uint64_t size,
-				const char *vdo_pool_name,
 				const char *data_uuid,
-				uint64_t data_size,
 				const struct dm_vdo_target_params *vtp)
 {
 	struct load_segment *seg;
@@ -4389,8 +4112,7 @@ int dm_tree_node_add_vdo_target(struct dm_tree_node *node,
 		return_0;

 	seg->vdo_params = *vtp;
-	seg->vdo_name = vdo_pool_name;
-	seg->vdo_data_size = data_size;
+	seg->vdo_name = node->name;

 	node->props.send_messages = 2;

--- a/device_mapper/libdm-file.c
+++ b/device_mapper/libdm-file.c
@@ -222,8 +222,6 @@ retry_fcntl:
 		goto fail_close_unlink;
 	}

-	/* coverity[leaked_handle] intentional leak of fd handle here  */
-
 	return 1;

 fail_close_unlink:
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -749,11 +749,10 @@ static void _display_fields_more(struct dm_report *rh,
 			id_len = strlen(type->prefix) + 3;

 	for (f = 0; fields[f].report_fn; f++) {
-		if (!(type = _find_type(rh, fields[f].type))) {
-			log_debug(INTERNAL_ERROR "Field type undefined.");
-			continue;
-		}
-		desc = (type->desc) ? : " ";
+		if ((type = _find_type(rh, fields[f].type)) && type->desc)
+			desc = type->desc;
+		else
+			desc = " ";
 		if (desc != last_desc) {
 			if (*last_desc)
 				log_warn(" ");
@@ -2382,7 +2381,7 @@ static const char *_get_reserved(struct dm_report *rh, unsigned type,
 {
 	const struct dm_report_reserved_value *iter = implicit ? NULL : rh->reserved_values;
 	const struct dm_report_field_reserved_value *frv;
-	const char *tmp_begin = NULL, *tmp_end = NULL, *tmp_s = s;
+	const char *tmp_begin, *tmp_end, *tmp_s = s;
 	const char *name = NULL;
 	char c;

--- a/device_mapper/libdm-targets.c
+++ b/device_mapper/libdm-targets.c
@@ -296,8 +296,6 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
 			s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH;
 		else if (!strncmp(p, "metadata2 ", 10))
 			s->feature_flags |= DM_CACHE_FEATURE_METADATA2;
-		else if (!strncmp(p, "no_discard_passdown ", 20))
-			s->feature_flags |= DM_CACHE_FEATURE_NO_DISCARD_PASSDOWN;
 		else
 			log_error("Unknown feature in status: %s", params);

@@ -366,8 +364,8 @@ int dm_get_status_writecache(struct dm_pool *mem, const char *params,
 	if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_writecache))))
 		return_0;

-	if (sscanf(params, "%llu %llu %llu %llu",
-		   (unsigned long long *)&s->error,
+	if (sscanf(params, "%u %llu %llu %llu",
+		   &s->error,
 		   (unsigned long long *)&s->total_blocks,
 		   (unsigned long long *)&s->free_blocks,
 		   (unsigned long long *)&s->writeback_blocks) != 4) {
@@ -380,33 +378,6 @@ int dm_get_status_writecache(struct dm_pool *mem, const char *params,
 	return 1;
 }

-int dm_get_status_integrity(struct dm_pool *mem, const char *params,
-			     struct dm_status_integrity **status)
-{
-	struct dm_status_integrity *s;
-	char recalc_str[16] = "\0";
-
-	if (!(s = dm_pool_zalloc(mem, sizeof(*s))))
-		return_0;
-
-	if (sscanf(params, "%llu %llu %s",
-		   (unsigned long long *)&s->number_of_mismatches,
-		   (unsigned long long *)&s->provided_data_sectors,
-		   recalc_str) != 3) {
-		log_error("Failed to parse integrity params: %s.", params);
-		dm_pool_free(mem, s);
-		return 0;
-	}
-
-	if (recalc_str[0] == '-')
-		s->recalc_sector = 0;
-	else
-		s->recalc_sector = strtoull(recalc_str, NULL, 0);
-
-	*status = s;
-	return 1;
-}
-
 int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s)
 {
 	int pos;
--- a/device_mapper/misc/dm-ioctl.h
+++ b/device_mapper/misc/dm-ioctl.h
@@ -183,7 +183,7 @@ struct dm_target_spec {
 struct dm_target_deps {
 	uint32_t count;	/* Array size */
 	uint32_t padding;	/* unused */
-	uint64_t dev[];		/* out */
+	uint64_t dev[0];	/* out */
 };

 /*
@@ -193,7 +193,7 @@ struct dm_name_list {
 	uint64_t dev;
 	uint32_t next;		/* offset to the next record from
 				   the _start_ of this */
-	char name[];
+	char name[0];
 };

 /*
@@ -203,7 +203,7 @@ struct dm_target_versions {
        uint32_t next;
        uint32_t version[3];

-        char name[];
+        char name[0];
 };

 /*
@@ -212,7 +212,7 @@ struct dm_target_versions {
 struct dm_target_msg {
 	uint64_t sector;	/* Device sector */

-	char message[];
+	char message[0];
 };

 /*
@@ -244,7 +244,6 @@ enum {
 	DM_TARGET_MSG_CMD,
 	DM_DEV_SET_GEOMETRY_CMD,
 	DM_DEV_ARM_POLL_CMD,
-	DM_GET_TARGET_VERSION_CMD,
 };

 #define DM_IOCTL 0xfd
@@ -271,8 +270,6 @@ enum {
 #define DM_TARGET_MSG	 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
 #define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)

-#define DM_GET_TARGET_VERSION	_IOWR(DM_IOCTL, DM_GET_TARGET_VERSION_CMD, struct dm_ioctl)
-
 #define DM_VERSION_MAJOR	4
 #define DM_VERSION_MINOR	36
 #define DM_VERSION_PATCHLEVEL	0
--- a/device_mapper/misc/dmlib.h
+++ b/device_mapper/misc/dmlib.h
@@ -21,6 +21,11 @@

 // FIXME: get rid of this whole file
 
+#include "configure.h"
+
+#define _REENTRANT
+#define _GNU_SOURCE
+
 #include "device_mapper/all.h"
 #include "lib/misc/util.h"
 #include "dm-logging.h"
--- a/device_mapper/misc/kdev_t.h
+++ b/device_mapper/misc/kdev_t.h
@@ -17,6 +17,6 @@

 #define MAJOR(dev)      ((dev & 0xfff00) >> 8)
 #define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))
-#define MKDEV(ma,mi)    (((dev_t)mi & 0xff) | ((dev_t)ma << 8) | (((dev_t)mi & ~0xff) << 12))
+#define MKDEV(ma,mi)    ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))

 #endif
--- a/device_mapper/mm/pool.c
+++ b/device_mapper/mm/pool.c
@@ -59,13 +59,11 @@ char *dm_pool_strdup(struct dm_pool *p, const char *str)

 char *dm_pool_strndup(struct dm_pool *p, const char *str, size_t n)
 {
-	size_t slen = strlen(str);
-	size_t len = (slen < n) ? slen : n;
 	char *ret = dm_pool_alloc(p, n + 1);

 	if (ret) {
-		ret[len] = '\0';
-		memcpy(ret, str, len);
+		strncpy(ret, str, n);
+		ret[n] = '\0';
 	}

 	return ret;
@@ -98,7 +96,7 @@ void dm_pools_check_leaks(void)
 			  p->orig_pool,
 			  p->name, p->stats.bytes);
 #else
-		log_error(" [%p] %s", (void *)p, p->name);
+		log_error(" [%p] %s", p, p->name);
 #endif
 	}
 	pthread_mutex_unlock(&_dm_pools_mutex);
--- a/device_mapper/vdo/status.c
+++ b/device_mapper/vdo/status.c
@@ -1,24 +1,8 @@
-/*
- * Copyright (C) 2018 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * 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 Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser 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
- */
+#include "configure.h"
+#include "target.h"

-/* Note: this object is also used by VDO dmeventd plugin for parsing status */
-/* File could be included by VDO plugin and can use original libdm library */
-#ifndef LIB_DMEVENT_H
+// For DM_ARRAY_SIZE!
 #include "device_mapper/all.h"
-#endif
-
-#include "device_mapper/vdo/target.h"
 #include "base/memory/zalloc.h"

 #include <ctype.h>
@@ -170,7 +154,7 @@ static void _set_error(struct dm_vdo_status_parse_result *result, const char *fm
 	va_list ap;

 	va_start(ap, fmt);
-	(void) vsnprintf(result->error, sizeof(result->error), fmt, ap);
+	vsnprintf(result->error, sizeof(result->error), fmt, ap);
 	va_end(ap);
 }

@@ -200,7 +184,7 @@ static bool _parse_field(const char **b, const char *e,
 bool dm_vdo_status_parse(struct dm_pool *mem, const char *input,
 			 struct dm_vdo_status_parse_result *result)
 {
-	const char *b = input;
+	const char *b = b = input;
 	const char *e = input + strlen(input);
 	const char *te;
 	struct dm_vdo_status *s;
@@ -219,10 +203,11 @@ bool dm_vdo_status_parse(struct dm_pool *mem, const char *input,
 		goto bad;
 	}

-	if (!(s->device = (!mem) ? strndup(b, (te - b)) : dm_pool_alloc(mem, (te - b)))) {
+	if (!(s->device = (!mem) ? malloc((e - b) + 1) : dm_pool_alloc(mem, (e - b) + 1))) {
 		_set_error(result, "out of memory");
 		goto bad;
 	}
+	dm_strncpy(s->device, b, te - b + 1);

 	b = _eat_space(te, e);

--- a/device_mapper/vdo/target.h
+++ b/device_mapper/vdo/target.h
@@ -74,16 +74,16 @@ enum dm_vdo_write_policy {

 // FIXME: review whether we should use the createParams from the userlib
 struct dm_vdo_target_params {
-	uint32_t minimum_io_size;       // in sectors
 	uint32_t block_map_cache_size_mb;
-	uint32_t block_map_era_length;	// format period
+	uint32_t block_map_period;

 	uint32_t check_point_frequency;
-	uint32_t index_memory_size_mb;  // format
+	uint32_t index_memory_size_mb;

-	uint32_t slab_size_mb;          // format
+	uint32_t read_cache_size_mb;
+
+	uint32_t slab_size_mb;

-	uint32_t max_discard;
 	// threads
 	uint32_t ack_threads;
 	uint32_t bio_threads;
@@ -95,8 +95,9 @@ struct dm_vdo_target_params {

 	bool use_compression;
 	bool use_deduplication;
-	bool use_metadata_hints;
-	bool use_sparse_index;          // format
+	bool emulate_512_sectors;
+	bool use_sparse_index;
+	bool use_read_cache;

 	// write policy
 	enum dm_vdo_write_policy write_policy;
--- a/device_mapper/vdo/vdo_limits.h
+++ b/device_mapper/vdo/vdo_limits.h
@@ -21,8 +21,8 @@
 #define DM_VDO_BLOCK_MAP_CACHE_SIZE_MAXIMUM_MB	(16 * 1024 * 1024 - 1)	// 16TiB - 1
 #define DM_VDO_BLOCK_MAP_CACHE_SIZE_MINIMUM_PER_LOGICAL_THREAD  (4096 * DM_VDO_BLOCK_SIZE_KB)

-#define DM_VDO_BLOCK_MAP_ERA_LENGTH_MINIMUM	(1)
-#define DM_VDO_BLOCK_MAP_ERA_LENGTH_MAXIMUM	(16380)
+#define DM_VDO_BLOCK_MAP_PERIOD_MINIMUM		1
+#define DM_VDO_BLOCK_MAP_PERIOD_MAXIMUM		(16380)

 #define DM_VDO_INDEX_MEMORY_SIZE_MINIMUM_MB	(256)			// 0.25 GiB
 #define DM_VDO_INDEX_MEMORY_SIZE_MAXIMUM_MB	(1024 * 1024 * 1024)	// 1TiB
@@ -57,7 +57,4 @@
 //#define DM_VDO_PHYSICAL_THREADS_MINIMUM	(0)
 #define DM_VDO_PHYSICAL_THREADS_MAXIMUM		(16)

-#define DM_VDO_MAX_DISCARD_MINIMUM		(1)
-#define DM_VDO_MAX_DISCARD_MAXIMUM		(UINT32_MAX / 4096)
-
 #endif // DEVICE_MAPPER_VDO_LIMITS_H
--- a/device_mapper/vdo/vdo_target.c
+++ b/device_mapper/vdo/vdo_target.c
@@ -23,14 +23,6 @@ bool dm_vdo_validate_target_params(const struct dm_vdo_target_params *vtp,
 {
 	bool valid = true;

-	/* 512 or 4096 bytes only ATM */
-	if ((vtp->minimum_io_size != 1) &&
-	    (vtp->minimum_io_size != 8)) {
-		log_error("VDO minimum io size %u is unsupported.",
-			  vtp->minimum_io_size);
-		valid = false;
-	}
-
 	if ((vtp->block_map_cache_size_mb < DM_VDO_BLOCK_MAP_CACHE_SIZE_MINIMUM_MB) ||
 	    (vtp->block_map_cache_size_mb > DM_VDO_BLOCK_MAP_CACHE_SIZE_MAXIMUM_MB)) {
 		log_error("VDO block map cache size %u out of range.",
@@ -45,6 +37,12 @@ bool dm_vdo_validate_target_params(const struct dm_vdo_target_params *vtp,
 		valid = false;
 	}

+	if (vtp->read_cache_size_mb > DM_VDO_READ_CACHE_SIZE_MAXIMUM_MB) {
+		log_error("VDO read cache size %u out of range.",
+			  vtp->read_cache_size_mb);
+		valid = false;
+	}
+
 	if ((vtp->slab_size_mb < DM_VDO_SLAB_SIZE_MINIMUM_MB) ||
 	    (vtp->slab_size_mb > DM_VDO_SLAB_SIZE_MAXIMUM_MB)) {
 		log_error("VDO slab size %u out of range.",
@@ -52,13 +50,6 @@ bool dm_vdo_validate_target_params(const struct dm_vdo_target_params *vtp,
 		valid = false;
 	}

-	if ((vtp->max_discard < DM_VDO_MAX_DISCARD_MINIMUM) ||
-	    (vtp->max_discard > DM_VDO_MAX_DISCARD_MAXIMUM)) {
-		log_error("VDO max discard %u out of range.",
-			  vtp->max_discard);
-		valid = false;
-	}
-
 	if (vtp->ack_threads > DM_VDO_ACK_THREADS_MAXIMUM) {
 		log_error("VDO ack threads %u out of range.", vtp->ack_threads);
 		valid = false;
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@

 include $(top_builddir)/make.tmpl

-DISTCLEAN_TARGETS += configure.h lvm-version.h
+DISTCLEAN_TARGETS += .configure.h lvm-version.h
 CLEAN_TARGETS += \
 .symlinks \
 .symlinks_created \
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -45,6 +45,9 @@
 /* Name of default metadata cache subdirectory. */
 #undef DEFAULT_CACHE_SUBDIR

+/* Default data alignment. */
+#undef DEFAULT_DATA_ALIGNMENT
+
 /* Define default node creation behavior with dmsetup create */
 #undef DEFAULT_DM_ADD_NODE

@@ -87,6 +90,9 @@
 /* Use blkid wiping by default. */
 #undef DEFAULT_USE_BLKID_WIPING

+/* Use lvmetad by default. */
+#undef DEFAULT_USE_LVMETAD
+
 /* Use lvmlockd by default. */
 #undef DEFAULT_USE_LVMLOCKD

@@ -126,9 +132,6 @@
 /* Library version */
 #undef DM_LIB_VERSION

-/* Define to 1 to include the LVM editline shell. */
-#undef EDITLINE_SUPPORT
-
 /* Path to fsadm binary. */
 #undef FSADM_PATH

@@ -154,9 +157,6 @@
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT

-/* Define if ioctl BLKZEROOUT can be used for device zeroing. */
-#undef HAVE_BLKZEROOUT
-
 /* Define to 1 if canonicalize_file_name is available. */
 #undef HAVE_CANONICALIZE_FILE_NAME

@@ -182,12 +182,6 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT

-/* Define to 1 if you have the <editline/history.h> header file. */
-#undef HAVE_EDITLINE_HISTORY_H
-
-/* Define to 1 if you have the <editline/readline.h> header file. */
-#undef HAVE_EDITLINE_READLINE_H
-
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H

@@ -304,12 +298,6 @@
 /* Define to 1 if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H

-/* Define to 1 if you have the `prlimit' function. */
-#undef HAVE_PRLIMIT
-
-/* Define to 1 if you have the `pselect' function. */
-#undef HAVE_PSELECT
-
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 #undef HAVE_PTRDIFF_T

@@ -543,18 +531,12 @@
 /* Define to 1 if the system has the `__builtin_clzll' built-in function */
 #undef HAVE___BUILTIN_CLZLL

-/* Define to 1 to include built-in support for integrity. */
-#undef INTEGRITY_INTERNAL
-
 /* Internalization package */
 #undef INTL_PACKAGE

 /* Locale-dependent data */
 #undef LOCALEDIR

-/* Define to 1 to include code that uses lvmlockd dlm control option. */
-#undef LOCKDDLM_CONTROL_SUPPORT
-
 /* Define to 1 to include code that uses lvmlockd dlm option. */
 #undef LOCKDDLM_SUPPORT

@@ -568,6 +550,12 @@
 /* Path to lvmconfig binary. */
 #undef LVMCONFIG_PATH

+/* Path to lvmetad pidfile. */
+#undef LVMETAD_PIDFILE
+
+/* Define to 1 to include code that uses lvmetad. */
+#undef LVMETAD_SUPPORT
+
 /* Path to lvmlockd pidfile. */
 #undef LVMLOCKD_PIDFILE

@@ -690,15 +678,6 @@
 /* Define to 1 to include built-in support for vdo. */
 #undef VDO_INTERNAL

-/* Define to 1 to include built-in support for writecache. */
-#undef WRITECACHE_INTERNAL
-
-/* Define to get access to GNU/Linux extension */
-#undef _GNU_SOURCE
-
-/* Define to use re-entrant thread safe versions */
-#undef _REENTRANT
-
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
   #define below would cause a syntax error. */
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -20,7 +20,6 @@ SOURCES =\
 	activate/activate.c \
 	cache/lvmcache.c \
 	writecache/writecache.c \
-	integrity/integrity.c \
 	cache_segtype/cache.c \
 	commands/toolcontext.c \
 	config/config.c \
@@ -62,13 +61,10 @@ SOURCES =\
 	format_text/text_label.c \
 	freeseg/freeseg.c \
 	label/label.c \
-	label/hints.c \
 	locking/file_locking.c \
 	locking/locking.c \
 	log/log.c \
 	metadata/cache_manip.c \
-	metadata/writecache_manip.c \
-	metadata/integrity_manip.c \
 	metadata/lv.c \
 	metadata/lv_manip.c \
 	metadata/merge.c \
@@ -76,7 +72,6 @@ SOURCES =\
 	metadata/mirror.c \
 	metadata/pool_manip.c \
 	metadata/pv.c \
-	metadata/pv_list.c \
 	metadata/pv_manip.c \
 	metadata/pv_map.c \
 	metadata/raid_manip.c \
@@ -96,7 +91,6 @@ SOURCES =\
 	misc/lvm-string.c \
 	misc/lvm-wrappers.c \
 	misc/lvm-percent.c \
-	misc/sharedlib.c \
 	mm/memlock.c \
 	notify/lvmnotify.c \
 	properties/prop_common.c \
@@ -115,6 +109,10 @@ ifeq ("@DEVMAPPER@", "yes")
 	activate/fs.c
 endif

+ifeq ("@HAVE_LIBDL@", "yes")
+  SOURCES += misc/sharedlib.c
+endif
+
 ifeq ("@BUILD_LVMPOLLD@", "yes")
  SOURCES +=\
 	lvmpolld/lvmpolld-client.c
@@ -132,6 +130,12 @@ endif
 LIB_NAME = liblvm-internal
 LIB_STATIC = $(LIB_NAME).a

+ifeq ($(MAKECMDGOALS),distclean)
+  SUBDIRS =\
+	notify \
+	locking
+endif
+
 CFLOW_LIST = $(SOURCES)
 CFLOW_LIST_TARGET = $(LIB_NAME).cflow

--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -28,6 +28,7 @@
 #include "lib/config/config.h"
 #include "lib/metadata/segtype.h"
 #include "lib/misc/sharedlib.h"
+#include "lib/cache/lvmcache.h"
 #include "lib/metadata/metadata.h"

 #include <limits.h>
@@ -185,8 +186,8 @@ void set_activation(int act, int silent)
 	if (warned || !act)
 		return;

-	log_warn("WARNING: Compiled without libdevmapper support. "
-		 "Can't enable activation.");
+	log_error("Compiled without libdevmapper support. "
+		  "Can't enable activation.");

 	warned = 1;
 }
@@ -221,13 +222,23 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la
 {
 	return 0;
 }
-int lv_info_with_seg_status(struct cmd_context *cmd,
-			    const struct lv_segment *lv_seg,
+int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer,
+		    struct lvinfo *info, int with_open_count, int with_read_ahead)
+{
+	return 0;
+}
+int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume *lv,
+			    const struct lv_segment *lv_seg, int use_layer,
 			    struct lv_with_info_and_seg_status *status,
 			    int with_open_count, int with_read_ahead)
 {
 	return 0;
 }
+int lv_status(struct cmd_context *cmd, const struct lv_segment *lv_seg,
+	      int use_layer, struct lv_seg_status *lv_seg_status)
+{
+	return 0;
+}
 int lv_cache_status(const struct logical_volume *cache_lv,
 		    struct lv_status_cache **status)
 {
@@ -274,17 +285,18 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
 {
 	return 0;
 }
-int lv_writecache_message(const struct logical_volume *lv, const char *msg)
+int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
+			 dm_percent_t *percent)
 {
 	return 0;
 }
-int lv_thin_pool_status(const struct logical_volume *lv, int flush,
-			struct lv_status_thin_pool **thin_pool_status)
+int lv_thin_percent(const struct logical_volume *lv, int mapped,
+		    dm_percent_t *percent)
 {
 	return 0;
 }
-int lv_thin_status(const struct logical_volume *lv, int flush,
-		   struct lv_status_thin **thin_status)
+int lv_thin_pool_transaction_id(const struct logical_volume *lv,
+				uint64_t *transaction_id)
 {
 	return 0;
 }
@@ -292,15 +304,6 @@ int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id)
 {
 	return 0;
 }
-int lv_vdo_pool_status(const struct logical_volume *lv, int flush,
-		       struct lv_status_vdo **vdo_status)
-{
-	return 0;
-}
-int lv_vdo_pool_percent(const struct logical_volume *lv, dm_percent_t *percent)
-{
-	return 0;
-}
 int lvs_in_vg_activated(const struct volume_group *vg)
 {
 	return 0;
@@ -537,7 +540,25 @@ int target_version(const char *target_name, uint32_t *maj,

 int lvm_dm_prefix_check(int major, int minor, const char *prefix)
 {
-	return dev_manager_check_prefix_dm_major_minor(major, minor, prefix);
+	struct dm_task *dmt;
+	const char *uuid;
+	int r;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_STATUS)))
+		return_0;
+
+	if (!dm_task_set_minor(dmt, minor) ||
+	    !dm_task_set_major(dmt, major) ||
+	    !dm_task_run(dmt) ||
+	    !(uuid = dm_task_get_uuid(dmt))) {
+		dm_task_destroy(dmt);
+		return 0;
+	}
+
+	r = strncasecmp(uuid, prefix, strlen(prefix));
+	dm_task_destroy(dmt);
+
+	return r ? 0 : 1;
 }

 int module_present(struct cmd_context *cmd, const char *target_name)
@@ -618,7 +639,7 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,
 		    int use_layer, struct lvinfo *info,
 		    const struct lv_segment *seg,
 		    struct lv_seg_status *seg_status,
-		    int with_open_count, int with_read_ahead, int with_name_check)
+		    int with_open_count, int with_read_ahead)
 {
 	struct dm_info dminfo;

@@ -636,7 +657,7 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,
 	/* New thin-pool has no layer, but -tpool suffix needs to be queried */
 	if (!use_layer && lv_is_new_thin_pool(lv)) {
 		/* Check if there isn't existing old thin pool mapping in the table */
-		if (!dev_manager_info(cmd, lv, NULL, 0, 0, 0, &dminfo, NULL, NULL))
+		if (!dev_manager_info(cmd, lv, NULL, 0, 0, &dminfo, NULL, NULL))
 			return_0;
 		if (!dminfo.exists)
 			use_layer = 1;
@@ -649,9 +670,8 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,

 	if (!dev_manager_info(cmd, lv,
 			      (use_layer) ? lv_layer(lv) : NULL,
-			      with_open_count, with_read_ahead, with_name_check,
-			      &dminfo,
-			      (info) ? &info->read_ahead : NULL,
+			      with_open_count, with_read_ahead,
+			      &dminfo, (info) ? &info->read_ahead : NULL,
 			      seg_status))
 		return_0;

@@ -680,16 +700,7 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la
 	if (!activation())
 		return 0;

-	return _lv_info(cmd, lv, use_layer, info, NULL, NULL, with_open_count, with_read_ahead, 0);
-}
-
-int lv_info_with_name_check(struct cmd_context *cmd, const struct logical_volume *lv,
-			    int use_layer, struct lvinfo *info)
-{
-	if (!activation())
-		return 0;
-
-	return _lv_info(cmd, lv, use_layer, info, NULL, NULL, 0, 0, 1);
+	return _lv_info(cmd, lv, use_layer, info, NULL, NULL, with_open_count, with_read_ahead);
 }

 /*
@@ -719,16 +730,16 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 		 * STATUS is collected from cache LV */
 		if (!(lv_seg = get_only_segment_using_this_lv(lv)))
 			return_0;
-		(void) _lv_info(cmd, lv_seg->lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
+		(void) _lv_info(cmd, lv_seg->lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
 		return 1;
 	}

 	if (lv_is_thin_pool(lv)) {
 		/* Always collect status for '-tpool' */
-		if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0, 0) &&
+		if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0) &&
 		    (status->seg_status.type == SEG_STATUS_THIN_POOL)) {
 			/* There is -tpool device, but query 'active' state of 'fake' thin-pool */
-			if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0, 0) &&
+			if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0) &&
 			    !status->seg_status.thin_pool->needs_check)
 				status->info.exists = 0; /* So pool LV is not active */
 		}
@@ -737,10 +748,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,

 	if (lv_is_external_origin(lv)) {
 		if (!_lv_info(cmd, lv, 0, &status->info, NULL, NULL,
-			      with_open_count, with_read_ahead, 0))
+			      with_open_count, with_read_ahead))
 			return_0;

-		(void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
+		(void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
 		return 1;
 	}

@@ -753,13 +764,13 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 		/* Show INFO for actual origin and grab status for merging origin */
 		if (!_lv_info(cmd, lv, 0, &status->info, lv_seg,
 			      lv_is_merging_origin(lv) ? &status->seg_status : NULL,
-			      with_open_count, with_read_ahead, 0))
+			      with_open_count, with_read_ahead))
 			return_0;

 		if (status->info.exists &&
 		    (status->seg_status.type != SEG_STATUS_SNAPSHOT)) /* Not merging */
 			/* Grab STATUS from layered -real */
-			(void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
+			(void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
 		return 1;
 	}

@@ -768,11 +779,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 			olv = origin_from_cow(lv);

 			if (!_lv_info(cmd, olv, 0, &status->info, first_seg(olv), &status->seg_status,
-				      with_open_count, with_read_ahead, 0))
+				      with_open_count, with_read_ahead))
 				return_0;

-			if (status->seg_status.type == SEG_STATUS_SNAPSHOT ||
-			    (lv_is_thin_volume(olv) && (status->seg_status.type == SEG_STATUS_THIN))) {
+			if (status->seg_status.type == SEG_STATUS_SNAPSHOT) {
 				log_debug_activation("Snapshot merge is in progress, querying status of %s instead.",
 						     display_lvname(lv));
 				/*
@@ -790,33 +800,21 @@ int lv_info_with_seg_status(struct cmd_context *cmd,

 	if (lv_is_vdo(lv)) {
 		if (!_lv_info(cmd, lv, 0, &status->info, NULL, NULL,
-			      with_open_count, with_read_ahead, 0))
+			      with_open_count, with_read_ahead))
 			return_0;
 		if (status->info.exists) {
 			/* Status for VDO pool */
 			(void) _lv_info(cmd, seg_lv(lv_seg, 0), 1, NULL,
 					first_seg(seg_lv(lv_seg, 0)),
-					&status->seg_status, 0, 0, 0);
+					&status->seg_status, 0, 0);
 			/* Use VDO pool segtype result for VDO segtype */
 			status->seg_status.seg = lv_seg;
 		}
 		return 1;
 	}

-	if (lv_is_vdo_pool(lv)) {
-		/* Always collect status for '-vpool' */
-		if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0, 0) &&
-		    (status->seg_status.type == SEG_STATUS_VDO_POOL)) {
-			/* There is -tpool device, but query 'active' state of 'fake' vdo-pool */
-			if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0, 0))
-				status->info.exists = 0; /* So VDO pool LV is not active */
-		}
-
-		return 1;
-	}
-
 	return _lv_info(cmd, lv, 0, &status->info, lv_seg, &status->seg_status,
-			with_open_count, with_read_ahead, 0);
+			with_open_count, with_read_ahead);
 }

 #define OPEN_COUNT_CHECK_RETRIES 25
@@ -1176,26 +1174,6 @@ out:
 	return r;
 }

-int lv_writecache_message(const struct logical_volume *lv, const char *msg)
-{
-	int r = 0;
-	struct dev_manager *dm;
-
-	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0)) {
-		log_error("Unable to send message to an inactive logical volume.");
-		return 0;
-	}
-
-	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
-		return_0;
-
-	r = dev_manager_writecache_message(dm, lv, msg);
-
-	dev_manager_destroy(dm);
-
-	return r;
-}
-
 /*
 * Return dm_status_cache for cache volume, accept also cache pool
 *
@@ -1246,52 +1224,86 @@ int lv_cache_status(const struct logical_volume *cache_lv,
 	return 1;
 }

-int lv_thin_pool_status(const struct logical_volume *lv, int flush,
-			struct lv_status_thin_pool **thin_pool_status)
+/*
+ * Returns data or metadata percent usage, depends on metadata 0/1.
+ * Returns 1 if percent set, else 0 on failure.
+ */
+int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
+			 dm_percent_t *percent)
 {
+	int r;
 	struct dev_manager *dm;

 	if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
 		return 0;

-	log_debug_activation("Checking thin pool status for LV %s.",
-			     display_lvname(lv));
+	log_debug_activation("Checking thin %sdata percent for LV %s.",
+			     (metadata) ? "meta" : "", display_lvname(lv));

 	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
 		return_0;

-	if (!dev_manager_thin_pool_status(dm, lv, flush, thin_pool_status)) {
-		dev_manager_destroy(dm);
-		return_0;
-	}
+	if (!(r = dev_manager_thin_pool_percent(dm, lv, metadata, percent)))
+		stack;

-	/* User has to call dm_pool_destroy(thin_pool_status->mem)! */
+	dev_manager_destroy(dm);

-	return 1;
+	return r;
 }

-int lv_thin_status(const struct logical_volume *lv, int flush,
-		   struct lv_status_thin **thin_status)
+/*
+ * Returns 1 if percent set, else 0 on failure.
+ */
+int lv_thin_percent(const struct logical_volume *lv,
+		    int mapped, dm_percent_t *percent)
 {
+	int r;
 	struct dev_manager *dm;

 	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
 		return 0;

-	log_debug_activation("Checking thin status for LV %s.",
+	log_debug_activation("Checking thin percent for LV %s.",
 			     display_lvname(lv));

 	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
 		return_0;

-	if (!dev_manager_thin_status(dm, lv, flush, thin_status)) {
-		dev_manager_destroy(dm);
+	if (!(r = dev_manager_thin_percent(dm, lv, mapped, percent)))
+		stack;
+
+	dev_manager_destroy(dm);
+
+	return r;
+}
+
+/*
+ * Returns 1 if transaction_id set, else 0 on failure.
+ */
+int lv_thin_pool_transaction_id(const struct logical_volume *lv,
+				uint64_t *transaction_id)
+{
+	int r;
+	struct dev_manager *dm;
+	struct dm_status_thin_pool *status;
+
+	if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
+		return 0;
+
+	log_debug_activation("Checking thin-pool transaction id for LV %s.",
+			     display_lvname(lv));
+
+	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
 		return_0;
-	}

-	/* User has to call dm_pool_destroy(thin_status->mem)! */
+	if (!(r = dev_manager_thin_pool_status(dm, lv, &status, 0)))
+		stack;
+	else
+		*transaction_id = status->transaction_id;

-	return 1;
+	dev_manager_destroy(dm);
+
+	return r;
 }

 int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id)
@@ -1328,8 +1340,10 @@ int lv_vdo_pool_status(const struct logical_volume *lv, int flush,
 {
 	int r = 0;
 	struct dev_manager *dm;
+	struct lv_status_vdo *status;
+	char *params;

-	if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
+	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
 		return 0;

 	log_debug_activation("Checking VDO pool status for LV %s.",
@@ -1338,10 +1352,14 @@ int lv_vdo_pool_status(const struct logical_volume *lv, int flush,
 	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, !lv_is_pvmove(lv))))
 		return_0;

-	if (!dev_manager_vdo_pool_status(dm, lv, vdo_status, flush))
+	if (!dev_manager_vdo_pool_status(dm, lv, flush, &params, &status))
 		goto_out;

-	/* User has to call dm_pool_destroy(vdo_status->mem) */
+	if (!parse_vdo_pool_status(status->mem, lv, params, status))
+		goto_out;
+
+	/* User is responsible to dm_pool_destroy memory pool! */
+	*vdo_status = status;
 	r = 1;
 out:
 	if (!r)
@@ -1350,19 +1368,6 @@ out:
 	return r;
 }

-int lv_vdo_pool_percent(const struct logical_volume *lv, dm_percent_t *percent)
-{
-	struct lv_status_vdo *vdo_status;
-
-	if (!lv_vdo_pool_status(lv, 0, &vdo_status))
-		return_0;
-
-	*percent = vdo_status->usage;
-	dm_pool_destroy(vdo_status->mem);
-
-	return 1;
-}
-
 static int _lv_active(struct cmd_context *cmd, const struct logical_volume *lv)
 {
 	struct lvinfo info;
@@ -1579,8 +1584,6 @@ static char *_build_target_uuid(struct cmd_context *cmd, const struct logical_vo

 	if (lv_is_thin_pool(lv))
 		layer = "tpool"; /* Monitor "tpool" for the "thin pool". */
-	else if (lv_is_vdo_pool(lv))
-		layer = "vpool"; /* Monitor "vpool" for the "VDO pool". */
 	else if (lv_is_origin(lv) || lv_is_external_origin(lv))
 		layer = "real"; /* Monitor "real" for "snapshot-origin". */
 	else
@@ -1737,8 +1740,6 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume

 	if (!laopts)
 		laopts = &zlaopts;
-	else
-		mirr_laopts.read_only = laopts->read_only;

 	/* skip dmeventd code altogether */
 	if (dmeventd_monitor_mode() == DMEVENTD_MONITOR_IGNORE)
@@ -1998,11 +1999,6 @@ static int _preload_detached_lv(struct logical_volume *lv, void *data)
 		    !lv_is_raid_metadata(lv_pre) && lv_is_active(lv) &&
 		    !_lv_preload(lv_pre, detached->laopts, detached->flush_required))
 			return_0;
-	} else if (lv_is_mirror_image(lv)) {
-		if ((lv_pre = find_lv_in_vg_by_lvid(detached->lv_pre->vg, &lv->lvid)) &&
-		    !lv_is_mirror_image(lv_pre) && lv_is_active(lv) &&
-		    !_lv_preload(lv_pre, detached->laopts, detached->flush_required))
-			return_0;
 	}

 	if (!lv_is_visible(lv) && (lv_pre = find_lv(detached->lv_pre->vg, lv->name)) &&
@@ -2029,6 +2025,8 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
 	               const struct logical_volume *lv, const struct logical_volume *lv_pre)
 {
 	const struct logical_volume *pvmove_lv = NULL;
+	const struct logical_volume *lv_to_free = NULL;
+	const struct logical_volume *lv_pre_to_free = NULL;
 	struct logical_volume *lv_pre_tmp, *lv_tmp;
 	struct seg_list *sl;
 	struct lv_segment *snap_seg;
@@ -2161,6 +2159,8 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
 	if (laopts->origin_only && lv_is_thin_volume(lv) && lv_is_thin_volume(lv_pre))
 		lockfs = 1;

+	critical_section_inc(cmd, "suspending");
+
 	if (!lv_is_locked(lv) && lv_is_locked(lv_pre) &&
 	    (pvmove_lv = find_pvmove_lv_in_lv(lv_pre))) {
 		/*
@@ -2202,28 +2202,25 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
 			}
 			dm_list_add(&suspend_lvs, &lvl->list);
 		}
-
-		critical_section_inc(cmd, "suspending");
-
 		dm_list_iterate_items(lvl, &suspend_lvs)
 			if (!_lv_suspend_lv(lvl->lv, laopts, lockfs, 1)) {
 				critical_section_dec(cmd, "failed suspend");
 				goto_out; /* FIXME: resume on recovery path? */
 			}
-
-	} else { /* Standard suspend */
-		critical_section_inc(cmd, "suspending");
-
+	} else  /* Standard suspend */
 		if (!_lv_suspend_lv(lv, laopts, lockfs, flush_required)) {
 			critical_section_dec(cmd, "failed suspend");
 			goto_out;
 		}
-	}

 	r = 1;
 out:
 	if (mem)
 		dm_pool_destroy(mem);
+	if (lv_pre_to_free)
+		release_vg(lv_pre_to_free->vg);
+	if (lv_to_free)
+		release_vg(lv_to_free->vg);

 	return r;
 }
@@ -2238,8 +2235,8 @@ int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s, unsigned o
 			 const struct logical_volume *lv, const struct logical_volume *lv_pre)
 {
 	struct lv_activate_opts laopts = {
-		.exclusive = exclusive,
-		.origin_only = origin_only
+		.origin_only = origin_only,
+		.exclusive = exclusive
 	};

 	return _lv_suspend(cmd, lvid_s, &laopts, 0, lv, lv_pre);
@@ -2291,9 +2288,6 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
 			      lv_is_thin_volume(lv) ? " thin only" : " without snapshots") : "",
 			     laopts->revert ? " (reverting)" : "");

-	if (laopts->revert)
-		goto needs_resume;
-
 	if (!lv_info(cmd, lv, laopts->origin_only, &info, 0, 0))
 		goto_out;

@@ -2353,8 +2347,8 @@ int lv_resume_if_active(struct cmd_context *cmd, const char *lvid_s,
 			unsigned revert, const struct logical_volume *lv)
 {
 	struct lv_activate_opts laopts = {
-		.exclusive = exclusive,
 		.origin_only = origin_only,
+		.exclusive = exclusive,
 		.revert = revert
 	};

@@ -2387,6 +2381,7 @@ static int _lv_has_open_snapshots(const struct logical_volume *lv)

 int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logical_volume *lv)
 {
+	const struct logical_volume *lv_to_free = NULL;
 	struct lvinfo info;
 	static const struct lv_activate_opts laopts = { .skip_in_use = 1 };
 	struct dm_list *snh;
@@ -2419,17 +2414,6 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi
 			}
 		}

-		if (lv_is_vdo_pool(lv)) {
-			/* If someone has remove 'linear' mapping over VDO device
-			 * we may still be able to deactivate the rest of the tree
-			 * i.e. in test-suite we simulate this via 'dmsetup remove' */
-			if (!lv_info(cmd, lv, 1, &info, 1, 0))
-				goto_out;
-
-			if (info.exists && !info.open_count)
-				r = 0; /* Unused VDO device left in table? */
-		}
-
 		if (r)
 			goto out;
 	}
@@ -2467,25 +2451,27 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi
 		r = 0;
 	}
 out:
+	if (lv_to_free)
+		release_vg(lv_to_free->vg);

 	return r;
 }

 /* Test if LV passes filter */
 int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
-			 int *activate, const struct logical_volume *lv)
+			 int *activate_lv, const struct logical_volume *lv)
 {
 	if (!activation()) {
-		*activate = 1;
+		*activate_lv = 1;
 		return 1;
 	}

 	if (!_passes_activation_filter(cmd, lv)) {
 		log_verbose("Not activating %s since it does not pass "
 			    "activation filter.", display_lvname(lv));
-		*activate = 0;
+		*activate_lv = 0;
 	} else
-		*activate = 1;
+		*activate_lv = 1;

 	return 1;
 }
@@ -2507,13 +2493,6 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
 		goto out;
 	}

-	if ((cmd->partial_activation || cmd->degraded_activation) &&
-	    lv_is_partial(lv) && lv_is_raid(lv) && lv_raid_has_integrity((struct logical_volume *)lv)) {
-		cmd->partial_activation = 0;
-		cmd->degraded_activation = 0;
-		log_print("No degraded or partial activation for raid with integrity.");
-	}
-
 	if ((!lv->vg->cmd->partial_activation) && lv_is_partial(lv)) {
 		if (!lv_is_raid_type(lv) || !partial_raid_lv_supports_degraded_activation(lv)) {
 			log_error("Refusing activation of partial LV %s.  "
@@ -2530,26 +2509,12 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
 		}
 	}

-	if ((cmd->partial_activation || cmd->degraded_activation) && lv_is_writecache(lv)) {
-		struct logical_volume *lv_fast = first_seg(lv)->writecache;
-		if (lv_is_partial(lv) || (lv_fast && lv_is_partial(lv_fast))) {
-			log_error("Cannot use partial or degraded activation with writecache.");
-			goto out;
-		}
-	}
-
 	if (lv_has_unknown_segments(lv)) {
 		log_error("Refusing activation of LV %s containing "
 			  "an unrecognised segment.", display_lvname(lv));
 		goto out;
 	}

-	if (lv_raid_has_visible_sublvs(lv)) {
-		log_error("Refusing activation of RAID LV %s with "
-			  "visible SubLVs.", display_lvname(lv));
-		goto out;
-	}
-
 	if (test_mode()) {
 		_skip("Activating %s.", display_lvname(lv));
 		r = 1;
@@ -2570,7 +2535,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
 			     laopts->noscan ? " noscan" : "",
 			     laopts->temporary ? " temporary" : "");

-	if (!lv_info_with_name_check(cmd, lv, 0, &info))
+	if (!lv_info(cmd, lv, 0, &info, 0, 0))
 		goto_out;

 	/*
@@ -2942,7 +2907,8 @@ int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv)

 	ret = lv_resume_if_active(cmd, NULL, 0, 0, 1, lv_committed(lv));

-	critical_section_dec(cmd, "unlocking on revert");
+	critical_section_dec(cmd, "unlocking on resume");

 	return ret;
 }
+
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -39,7 +39,6 @@ typedef enum {
 	SEG_STATUS_THIN_POOL,
 	SEG_STATUS_VDO_POOL,
 	SEG_STATUS_WRITECACHE,
-	SEG_STATUS_INTEGRITY,
 	SEG_STATUS_UNKNOWN
 } lv_seg_status_type_t;

@@ -54,7 +53,6 @@ struct lv_seg_status {
 		struct dm_status_thin *thin;
 		struct dm_status_thin_pool *thin_pool;
 		struct dm_status_writecache *writecache;
-		struct dm_status_integrity *integrity;
 		struct lv_status_vdo vdo_pool;
 	};
 };
@@ -146,8 +144,8 @@ int revert_lv(struct cmd_context *cmd, const struct logical_volume *lv);
 */
 int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_layer,
 	    struct lvinfo *info, int with_open_count, int with_read_ahead);
-int lv_info_with_name_check(struct cmd_context *cmd, const struct logical_volume *lv,
-			    int use_layer, struct lvinfo *info);
+int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer,
+		    struct lvinfo *info, int with_open_count, int with_read_ahead);

 /*
 * Returns 1 if lv_info_and_seg_status structure has been populated,
@@ -164,10 +162,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used);

 /*
- * Returns 1 if activate has been set: 1 = activate; 0 = don't.
+ * Returns 1 if activate_lv has been set: 1 = activate; 0 = don't.
 */
 int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
-			 int *activate, const struct logical_volume *lv);
+			 int *activate_lv, const struct logical_volume *lv);
 /*
 * Checks against the auto_activation_volume_list and
 * returns 1 if the LV should be activated, 0 otherwise.
@@ -188,17 +186,17 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health);
 int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt);
 int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action);
 int lv_raid_message(const struct logical_volume *lv, const char *msg);
-int lv_writecache_message(const struct logical_volume *lv, const char *msg);
 int lv_cache_status(const struct logical_volume *cache_lv,
 		    struct lv_status_cache **status);
+int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
+			 dm_percent_t *percent);
+int lv_thin_percent(const struct logical_volume *lv, int mapped,
+		    dm_percent_t *percent);
+int lv_thin_pool_transaction_id(const struct logical_volume *lv,
+				uint64_t *transaction_id);
 int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id);
-int lv_thin_status(const struct logical_volume *lv, int flush,
-		   struct lv_status_thin **status);
-int lv_thin_pool_status(const struct logical_volume *lv, int flush,
-			struct lv_status_thin_pool **status);
 int lv_vdo_pool_status(const struct logical_volume *lv, int flush,
 		       struct lv_status_vdo **status);
-int lv_vdo_pool_percent(const struct logical_volume *lv, dm_percent_t *percent);

 /*
 * Return number of LVs in the VG that are active.
@@ -244,7 +242,6 @@ struct dev_usable_check_params {
 	unsigned int check_suspended:1;
 	unsigned int check_error_target:1;
 	unsigned int check_reserved:1;
-	unsigned int check_lv:1;
 };

 /*
@@ -260,7 +257,6 @@ void fs_unlock(void);

 #define TARGET_NAME_CACHE "cache"
 #define TARGET_NAME_WRITECACHE "writecache"
-#define TARGET_NAME_INTEGRITY "integrity"
 #define TARGET_NAME_ERROR "error"
 #define TARGET_NAME_ERROR_OLD "erro"	/* Truncated in older kernels */
 #define TARGET_NAME_LINEAR "linear"
@@ -278,7 +274,6 @@ void fs_unlock(void);
 #define MODULE_NAME_CLUSTERED_MIRROR "clog"
 #define MODULE_NAME_CACHE TARGET_NAME_CACHE
 #define MODULE_NAME_WRITECACHE TARGET_NAME_WRITECACHE
-#define MODULE_NAME_INTEGRITY TARGET_NAME_INTEGRITY
 #define MODULE_NAME_ERROR TARGET_NAME_ERROR
 #define MODULE_NAME_LOG_CLUSTERED "log-clustered"
 #define MODULE_NAME_LOG_USERSPACE "log-userspace"
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
--- a/lib/activate/dev_manager.h
+++ b/lib/activate/dev_manager.h
@@ -47,7 +47,7 @@ void dev_manager_exit(void);
 */
 int dev_manager_info(struct cmd_context *cmd, const struct logical_volume *lv,
 		     const char *layer,
-		     int with_open_count, int with_read_ahead, int with_name_check,
+		     int with_open_count, int with_read_ahead,
 		     struct dm_info *dminfo, uint32_t *read_ahead,
 		     struct lv_seg_status *seg_status);

@@ -63,25 +63,27 @@ int dev_manager_raid_status(struct dev_manager *dm,
 int dev_manager_raid_message(struct dev_manager *dm,
 			     const struct logical_volume *lv,
 			     const char *msg);
-int dev_manager_writecache_message(struct dev_manager *dm,
-                                   const struct logical_volume *lv,
-                                   const char *msg);
 int dev_manager_cache_status(struct dev_manager *dm,
 			     const struct logical_volume *lv,
 			     struct lv_status_cache **status);
-int dev_manager_thin_status(struct dev_manager *dm,
-			    const struct logical_volume *lv, int flush,
-			    struct lv_status_thin **status);
+int dev_manager_thin_pool_status(struct dev_manager *dm,
+				 const struct logical_volume *lv,
+				 struct dm_status_thin_pool **status,
+				 int flush);
+int dev_manager_thin_pool_percent(struct dev_manager *dm,
+				  const struct logical_volume *lv,
+				  int metadata, dm_percent_t *percent);
+int dev_manager_thin_percent(struct dev_manager *dm,
+			     const struct logical_volume *lv,
+			     int mapped, dm_percent_t *percent);
 int dev_manager_thin_device_id(struct dev_manager *dm,
 			       const struct logical_volume *lv,
 			       uint32_t *device_id);
-int dev_manager_thin_pool_status(struct dev_manager *dm,
-				 const struct logical_volume *lv, int flush,
-				 struct lv_status_thin_pool **status);
 int dev_manager_vdo_pool_status(struct dev_manager *dm,
 				const struct logical_volume *lv,
-				struct lv_status_vdo **vdo_status,
-				int flush);
+				int flush,
+				char **vdo_params,
+				struct lv_status_vdo **vdo_status);
 int dev_manager_suspend(struct dev_manager *dm, const struct logical_volume *lv,
 			struct lv_activate_opts *laopts, int lockfs, int flush_required);
 int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv,
@@ -101,8 +103,4 @@ int dev_manager_execute(struct dev_manager *dm);
 int dev_manager_device_uses_vg(struct device *dev,
 			       struct volume_group *vg);

-int dev_manager_remove_dm_major_minor(uint32_t major, uint32_t minor);
-
-int dev_manager_check_prefix_dm_major_minor(uint32_t major, uint32_t minor, const char *prefix);
-
 #endif
--- a/lib/activate/fs.c
+++ b/lib/activate/fs.c
@@ -313,7 +313,7 @@ struct fs_op_parms {
 	char *lv_name;
 	char *dev;
 	char *old_lv_name;
-	char names[];
+	char names[0];
 };

 static void _store_str(char **pos, char **ptr, const char *str)
@@ -487,8 +487,7 @@ int fs_rename_lv(const struct logical_volume *lv, const char *dev,

 void fs_unlock(void)
 {
-	/* Do not allow syncing device name with suspended devices */
-	if (!dm_get_suspended_counter()) {
+	if (!prioritized_section()) {
 		log_debug_activation("Syncing device names");
 		/* Wait for all processed udev devices */
 		if (!dm_udev_wait(_fs_cookie))
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
--- a/lib/cache/lvmcache.h
+++ b/lib/cache/lvmcache.h
@@ -41,9 +41,14 @@ struct lvmcache_vginfo;

 /*
 * vgsummary represents a summary of the VG that is read
- * without a lock during label scan.  It's used to populate
- * basic lvmcache vginfo/info during label scan prior to
- * vg_read().
+ * without a lock.  The info does not come through vg_read(),
+ * but through reading mdas.  It provides information about
+ * the VG that is needed to lock the VG and then read it fully
+ * with vg_read(), after which the VG summary should be checked
+ * against the full VG metadata to verify it was correct (since
+ * it was read without a lock.)
+ *
+ * Once read, vgsummary information is saved in lvmcache_vginfo.
 */
 struct lvmcache_vgsummary {
 	const char *vgname;
@@ -52,14 +57,10 @@ struct lvmcache_vgsummary {
 	char *creation_host;
 	const char *system_id;
 	const char *lock_type;
-	uint32_t seqno;
 	uint32_t mda_checksum;
 	size_t mda_size;
-	int mda_num; /* 1 = summary from mda1, 2 = summary from mda2 */
-	unsigned mda_ignored:1;
-	unsigned zero_offset:1;
-	unsigned mismatch:1; /* lvmcache sets if this summary differs from previous values */
-	struct dm_list pvsummaries;
+	int zero_offset;
+	int seqno;
 };

 int lvmcache_init(struct cmd_context *cmd);
@@ -68,30 +69,31 @@ void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset);

 int lvmcache_label_scan(struct cmd_context *cmd);
 int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const char *vgid);
-int lvmcache_label_rescan_vg_rw(struct cmd_context *cmd, const char *vgname, const char *vgid);
-int lvmcache_label_reopen_vg_rw(struct cmd_context *cmd, const char *vgname, const char *vgid);

 /* Add/delete a device */
-struct lvmcache_info *lvmcache_add(struct cmd_context *cmd, struct labeller *labeller, const char *pvid,
-                                   struct device *dev, uint64_t label_sector,
-                                   const char *vgname, const char *vgid,
-                                   uint32_t vgstatus, int *is_duplicate);
-int lvmcache_add_orphan_vginfo(struct cmd_context *cmd, const char *vgname, struct format_type *fmt);
+struct lvmcache_info *lvmcache_add(struct labeller *labeller, const char *pvid,
+				   struct device *dev,
+				   const char *vgname, const char *vgid,
+				   uint32_t vgstatus);
+int lvmcache_add_orphan_vginfo(const char *vgname, struct format_type *fmt);
 void lvmcache_del(struct lvmcache_info *info);
 void lvmcache_del_dev(struct device *dev);

 /* Update things */
-int lvmcache_update_vgname_and_id(struct cmd_context *cmd, struct lvmcache_info *info,
+int lvmcache_update_vgname_and_id(struct lvmcache_info *info,
 				  struct lvmcache_vgsummary *vgsummary);
-int lvmcache_update_vg_from_read(struct volume_group *vg, unsigned precommitted);
-int lvmcache_update_vg_from_write(struct volume_group *vg);
+int lvmcache_update_vg(struct volume_group *vg, unsigned precommitted);

 void lvmcache_lock_vgname(const char *vgname, int read_only);
 void lvmcache_unlock_vgname(const char *vgname);

 /* Queries */
+const struct format_type *lvmcache_fmt_from_vgname(struct cmd_context *cmd, const char *vgname, const char *vgid, unsigned revalidate_labels);
 int lvmcache_lookup_mda(struct lvmcache_vgsummary *vgsummary);

+/* Decrement and test if there are still vg holders in vginfo. */
+int lvmcache_vginfo_holders_dec_and_test_for_zero(struct lvmcache_vginfo *vginfo);
+
 struct lvmcache_vginfo *lvmcache_vginfo_from_vgname(const char *vgname,
 					   const char *vgid);
 struct lvmcache_vginfo *lvmcache_vginfo_from_vgid(const char *vgid);
@@ -101,11 +103,14 @@ const char *lvmcache_vgid_from_vgname(struct cmd_context *cmd, const char *vgnam
 struct device *lvmcache_device_from_pvid(struct cmd_context *cmd, const struct id *pvid, uint64_t *label_sector);
 const char *lvmcache_vgname_from_info(struct lvmcache_info *info);
 const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info);
+int lvmcache_vgs_locked(void);

-int lvmcache_get_vgnameids(struct cmd_context *cmd,
-                           struct dm_list *vgnameids,
-                           const char *only_this_vgname,
-                           int include_internal);
+int lvmcache_get_vgnameids(struct cmd_context *cmd, int include_internal,
+                          struct dm_list *vgnameids);
+
+/* Returns list of struct dm_str_list containing pool-allocated copy of pvids */
+struct dm_list *lvmcache_get_pvids(struct cmd_context *cmd, const char *vgname,
+				const char *vgid);

 void lvmcache_drop_metadata(const char *vgname, int drop_precommitted);
 void lvmcache_commit_metadata(const char *vgname);
@@ -122,8 +127,7 @@ void lvmcache_del_mdas(struct lvmcache_info *info);
 void lvmcache_del_das(struct lvmcache_info *info);
 void lvmcache_del_bas(struct lvmcache_info *info);
 int lvmcache_add_mda(struct lvmcache_info *info, struct device *dev,
-		     uint64_t start, uint64_t size, unsigned ignored,
-		     struct metadata_area **mda_new);
+		     uint64_t start, uint64_t size, unsigned ignored);
 int lvmcache_add_da(struct lvmcache_info *info, uint64_t start, uint64_t size);
 int lvmcache_add_ba(struct lvmcache_info *info, uint64_t start, uint64_t size);

@@ -159,18 +163,18 @@ int lvmcache_foreach_pv(struct lvmcache_vginfo *vginfo,
 uint64_t lvmcache_device_size(struct lvmcache_info *info);
 void lvmcache_set_device_size(struct lvmcache_info *info, uint64_t size);
 struct device *lvmcache_device(struct lvmcache_info *info);
+int lvmcache_is_orphan(struct lvmcache_info *info);
 unsigned lvmcache_mda_count(struct lvmcache_info *info);
+int lvmcache_vgid_is_cached(const char *vgid);
 uint64_t lvmcache_smallest_mda_size(struct lvmcache_info *info);

-bool lvmcache_has_duplicate_devs(void);
-void lvmcache_del_dev_from_duplicates(struct device *dev);
-bool lvmcache_dev_is_unused_duplicate(struct device *dev);
-int lvmcache_pvid_in_unused_duplicates(const char *pvid);
-int lvmcache_get_unused_duplicates(struct cmd_context *cmd, struct dm_list *head);
-int vg_has_duplicate_pvs(struct volume_group *vg);
+int lvmcache_found_duplicate_pvs(void);

-int lvmcache_found_duplicate_vgnames(void);
-bool lvmcache_has_duplicate_local_vgname(const char *vgid, const char *vgname);
+void lvmcache_pvscan_duplicate_check(struct cmd_context *cmd);
+
+int lvmcache_get_unused_duplicate_devs(struct cmd_context *cmd, struct dm_list *head);
+
+int vg_has_duplicate_pvs(struct volume_group *vg);

 int lvmcache_contains_lock_type_sanlock(struct cmd_context *cmd);

@@ -179,47 +183,34 @@ void lvmcache_get_max_name_lengths(struct cmd_context *cmd,

 int lvmcache_vg_is_foreign(struct cmd_context *cmd, const char *vgname, const char *vgid);

-bool lvmcache_scan_mismatch(struct cmd_context *cmd, const char *vgname, const char *vgid);
+void lvmcache_lock_ordering(int enable);

-int lvmcache_vginfo_has_pvid(struct lvmcache_vginfo *vginfo, char *pvid);
+int lvmcache_dev_is_unchosen_duplicate(struct device *dev);

-uint64_t lvmcache_max_metadata_size(void);
-void lvmcache_save_metadata_size(uint64_t val);
+void lvmcache_remove_unchosen_duplicate(struct device *dev);
+
+int lvmcache_pvid_in_unchosen_duplicates(const char *pvid);
+
+int lvmcache_get_vg_devs(struct cmd_context *cmd,
+			 struct lvmcache_vginfo *vginfo,
+			 struct dm_list *devs);
+void lvmcache_set_independent_location(const char *vgname);
+
+int lvmcache_scan_mismatch(struct cmd_context *cmd, const char *vgname, const char *vgid);
+
+/*
+ * These are clvmd-specific functions and are not related to lvmcache.
+ * FIXME: rename these with a clvm_ prefix in place of lvmcache_
+ */
+void lvmcache_save_vg(struct volume_group *vg, int precommitted);
+struct volume_group *lvmcache_get_saved_vg(const char *vgid, int precommitted);
+struct volume_group *lvmcache_get_saved_vg_latest(const char *vgid);
+void lvmcache_drop_saved_vgid(const char *vgid);

 int dev_in_device_list(struct device *dev, struct dm_list *head);

-bool lvmcache_has_bad_metadata(struct device *dev);
-
-bool lvmcache_has_old_metadata(struct cmd_context *cmd, const char *vgname, const char *vgid, struct device *dev);
-
-void lvmcache_get_outdated_devs(struct cmd_context *cmd,
-                                const char *vgname, const char *vgid,
-                                struct dm_list *devs);
-void lvmcache_get_outdated_mdas(struct cmd_context *cmd,
-                                const char *vgname, const char *vgid,
-                                struct device *dev,
-                                struct dm_list **mdas);
-
-bool lvmcache_is_outdated_dev(struct cmd_context *cmd,
-                              const char *vgname, const char *vgid,
-                              struct device *dev);
-
-void lvmcache_del_outdated_devs(struct cmd_context *cmd,
-                                const char *vgname, const char *vgid);
-
-void lvmcache_save_bad_mda(struct lvmcache_info *info, struct metadata_area *mda);
-
-void lvmcache_get_bad_mdas(struct cmd_context *cmd,
-                           const char *vgname, const char *vgid,
-                           struct dm_list *bad_mda_list);
-
-void lvmcache_get_mdas(struct cmd_context *cmd,
-                       const char *vgname, const char *vgid,
-                       struct dm_list *mda_list);
-
-const char *dev_filtered_reason(struct device *dev);
-const char *devname_error_reason(const char *devname);
-
-struct metadata_area *lvmcache_get_dev_mda(struct device *dev, int mda_num);
+struct cachedev *lvmcache_cachedev_from_pvid(const struct id *pvid);
+void lvmcache_update_vg_cachedevs(struct volume_group *vg);
+void lvmcache_del_cachedev(struct cachedev *cd);

 #endif
--- a/lib/cache_segtype/cache.c
+++ b/lib/cache_segtype/cache.c
@@ -47,33 +47,23 @@ static int _cache_out_line(const char *line, void *_f)
 static void _cache_display(const struct lv_segment *seg)
 {
 	const struct dm_config_node *n;
-	const struct lv_segment *setting_seg = NULL;
-
-	if (seg_is_cache(seg) && lv_is_cache_vol(seg->pool_lv))
-		setting_seg = seg;
-
-	else if (seg_is_cache_pool(seg))
-		setting_seg = seg;
-
-	else if (seg_is_cache(seg))
-		setting_seg = first_seg(seg->pool_lv);
-	else
-		return;
+	const struct lv_segment *pool_seg =
+		seg_is_cache_pool(seg) ? seg : first_seg(seg->pool_lv);

 	log_print("  Chunk size\t\t%s",
-		  display_size(seg->lv->vg->cmd, setting_seg->chunk_size));
+		  display_size(seg->lv->vg->cmd, pool_seg->chunk_size));

-	if (setting_seg->cache_metadata_format != CACHE_METADATA_FORMAT_UNSELECTED)
-		log_print("  Metadata format\t%u", setting_seg->cache_metadata_format);
+	if (pool_seg->cache_metadata_format != CACHE_METADATA_FORMAT_UNSELECTED)
+		log_print("  Metadata format\t%u", pool_seg->cache_metadata_format);

-	if (setting_seg->cache_mode != CACHE_MODE_UNSELECTED)
-		log_print("  Mode\t\t%s", get_cache_mode_name(setting_seg));
+	if (pool_seg->cache_mode != CACHE_MODE_UNSELECTED)
+		log_print("  Mode\t\t%s", get_cache_mode_name(pool_seg));

-	if (setting_seg->policy_name)
-		log_print("  Policy\t\t%s", setting_seg->policy_name);
+	if (pool_seg->policy_name)
+		log_print("  Policy\t\t%s", pool_seg->policy_name);

-	if (setting_seg->policy_settings &&
-	    (n = setting_seg->policy_settings->child))
+	if (pool_seg->policy_settings &&
+	    (n = pool_seg->policy_settings->child))
 		dm_config_write_node(n, _cache_out_line, NULL);

 	log_print(" ");
@@ -109,16 +99,32 @@ static void _fix_missing_defaults(struct lv_segment *cpool_seg)
 	}
 }

-static int _settings_text_import(struct lv_segment *seg,
-				 const struct dm_config_node *sn)
+static int _cache_pool_text_import(struct lv_segment *seg,
+				   const struct dm_config_node *sn,
+				   struct dm_hash_table *pv_hash __attribute__((unused)))
 {
+	struct logical_volume *data_lv, *meta_lv;
 	const char *str = NULL;
 	struct dm_pool *mem = seg->lv->vg->vgmem;

-	if (dm_config_has_node(sn, "chunk_size")) {
-		if (!dm_config_get_uint32(sn, "chunk_size", &seg->chunk_size))
-			return SEG_LOG_ERROR("Couldn't read cache chunk_size in");
-	}
+	if (!dm_config_has_node(sn, "data"))
+		return SEG_LOG_ERROR("Cache data not specified in");
+	if (!(str = dm_config_find_str(sn, "data", NULL)))
+		return SEG_LOG_ERROR("Cache data must be a string in");
+	if (!(data_lv = find_lv(seg->lv->vg, str)))
+		return SEG_LOG_ERROR("Unknown logical volume %s specified for "
+				     "cache data in", str);
+
+	if (!dm_config_has_node(sn, "metadata"))
+		return SEG_LOG_ERROR("Cache metadata not specified in");
+	if (!(str = dm_config_find_str(sn, "metadata", NULL)))
+		return SEG_LOG_ERROR("Cache metadata must be a string in");
+	if (!(meta_lv = find_lv(seg->lv->vg, str)))
+		return SEG_LOG_ERROR("Unknown logical volume %s specified for "
+				     "cache metadata in", str);
+
+	if (!dm_config_get_uint32(sn, "chunk_size", &seg->chunk_size))
+		return SEG_LOG_ERROR("Couldn't read cache chunk_size in");

 	/*
 	 * Read in features:
@@ -140,6 +146,16 @@ static int _settings_text_import(struct lv_segment *seg,
 			return SEG_LOG_ERROR("Failed to duplicate policy in");
 	}

+	if (dm_config_has_node(sn, "metadata_format")) {
+		if (!dm_config_get_uint32(sn, "metadata_format", &seg->cache_metadata_format) ||
+		    ((seg->cache_metadata_format != CACHE_METADATA_FORMAT_1) &&
+		     (seg->cache_metadata_format != CACHE_METADATA_FORMAT_2)))
+			return SEG_LOG_ERROR("Unknown cache metadata format %u number in",
+					     seg->cache_metadata_format);
+		if (seg->cache_metadata_format == CACHE_METADATA_FORMAT_2)
+			seg->lv->status |= LV_METADATA_FORMAT;
+	}
+
 	/*
 	 * Read in policy args:
 	 *   policy_settings {
@@ -168,75 +184,6 @@ static int _settings_text_import(struct lv_segment *seg,
 			return_0;
 	}

-	return 1;
-}
-
-static int _settings_text_export(const struct lv_segment *seg,
-				 struct formatter *f)
-{
-	if (seg->chunk_size)
-		outf(f, "chunk_size = %" PRIu32, seg->chunk_size);
-
-	if (seg->cache_mode != CACHE_MODE_UNSELECTED) {
-		const char *cache_mode;
-		if (!(cache_mode = cache_mode_num_to_str(seg->cache_mode)))
-			return_0;
-		outf(f, "cache_mode = \"%s\"", cache_mode);
-	}
-
-	if (seg->policy_name) {
-		outf(f, "policy = \"%s\"", seg->policy_name);
-
-		if (seg->policy_settings) {
-			if (strcmp(seg->policy_settings->key, "policy_settings")) {
-				log_error(INTERNAL_ERROR "Incorrect policy_settings tree, %s.",
-					  seg->policy_settings->key);
-				return 0;
-			}
-			if (seg->policy_settings->child)
-				out_config_node(f, seg->policy_settings);
-		}
-	}
-
-	return 1;
-}
-
-static int _cache_pool_text_import(struct lv_segment *seg,
-				   const struct dm_config_node *sn,
-				   struct dm_hash_table *pv_hash __attribute__((unused)))
-{
-	struct logical_volume *data_lv, *meta_lv;
-	const char *str = NULL;
-
-	if (!dm_config_has_node(sn, "data"))
-		return SEG_LOG_ERROR("Cache data not specified in");
-	if (!(str = dm_config_find_str(sn, "data", NULL)))
-		return SEG_LOG_ERROR("Cache data must be a string in");
-	if (!(data_lv = find_lv(seg->lv->vg, str)))
-		return SEG_LOG_ERROR("Unknown logical volume %s specified for "
-				     "cache data in", str);
-
-	if (!dm_config_has_node(sn, "metadata"))
-		return SEG_LOG_ERROR("Cache metadata not specified in");
-	if (!(str = dm_config_find_str(sn, "metadata", NULL)))
-		return SEG_LOG_ERROR("Cache metadata must be a string in");
-	if (!(meta_lv = find_lv(seg->lv->vg, str)))
-		return SEG_LOG_ERROR("Unknown logical volume %s specified for "
-				     "cache metadata in", str);
-
-	if (dm_config_has_node(sn, "metadata_format")) {
-		if (!dm_config_get_uint32(sn, "metadata_format", &seg->cache_metadata_format) ||
-		    ((seg->cache_metadata_format != CACHE_METADATA_FORMAT_1) &&
-		     (seg->cache_metadata_format != CACHE_METADATA_FORMAT_2)))
-			return SEG_LOG_ERROR("Unknown cache metadata format %u number in",
-					     seg->cache_metadata_format);
-		if (seg->cache_metadata_format == CACHE_METADATA_FORMAT_2)
-			seg->lv->status |= LV_METADATA_FORMAT;
-	}
-
-	if (!_settings_text_import(seg, sn))
-		return_0;
-
 	if (!attach_pool_data_lv(seg, data_lv))
 		return_0;
 	if (!attach_pool_metadata_lv(seg, meta_lv))
@@ -260,8 +207,11 @@ static int _cache_pool_text_import_area_count(const struct dm_config_node *sn,
 static int _cache_pool_text_export(const struct lv_segment *seg,
 				   struct formatter *f)
 {
+	const char *cache_mode;
+
 	outf(f, "data = \"%s\"", seg_lv(seg, 0)->name);
 	outf(f, "metadata = \"%s\"", seg->metadata_lv->name);
+	outf(f, "chunk_size = %" PRIu32, seg->chunk_size);

 	switch (seg->cache_metadata_format) {
 	case CACHE_METADATA_FORMAT_UNSELECTED:
@@ -287,9 +237,25 @@ static int _cache_pool_text_export(const struct lv_segment *seg,
 	 * but not worth to break backward compatibility, by shifting
 	 * content to cache segment
 	 */
+	if (seg->cache_mode != CACHE_MODE_UNSELECTED) {
+		if (!(cache_mode = get_cache_mode_name(seg)))
+			return_0;
+		outf(f, "cache_mode = \"%s\"", cache_mode);
+	}

-	if (!_settings_text_export(seg, f))
-		return_0;
+	if (seg->policy_name) {
+		outf(f, "policy = \"%s\"", seg->policy_name);
+
+		if (seg->policy_settings) {
+			if (strcmp(seg->policy_settings->key, "policy_settings")) {
+				log_error(INTERNAL_ERROR "Incorrect policy_settings tree, %s.",
+					  seg->policy_settings->key);
+				return 0;
+			}
+			if (seg->policy_settings->child)
+				out_config_node(f, seg->policy_settings);
+		}
+	}

 	return 1;
 }
@@ -477,7 +443,6 @@ static int _cache_text_import(struct lv_segment *seg,
 {
 	struct logical_volume *pool_lv, *origin_lv;
 	const char *name;
-	const char *uuid;

 	if (!dm_config_has_node(sn, "cache_pool"))
 		return SEG_LOG_ERROR("cache_pool not specified in");
@@ -504,57 +469,13 @@ static int _cache_text_import(struct lv_segment *seg,

 	seg->lv->status |= strstr(seg->lv->name, "_corig") ? LV_PENDING_DELETE : 0;

-	if (!_settings_text_import(seg, sn))
-		return_0;
-
-	if (dm_config_has_node(sn, "metadata_format")) {
-		if (!dm_config_get_uint32(sn, "metadata_format", &seg->cache_metadata_format))
-			return SEG_LOG_ERROR("Couldn't read cache metadata_format in");
-		if (seg->cache_metadata_format != CACHE_METADATA_FORMAT_2)
-			return SEG_LOG_ERROR("Unknown cache metadata format %u number in",
-					     seg->cache_metadata_format);
-	}
-
-	if (dm_config_has_node(sn, "metadata_start")) {
-		if (!dm_config_get_uint64(sn, "metadata_start", &seg->metadata_start))
-			return SEG_LOG_ERROR("Couldn't read metadata_start in");
-		if (!dm_config_get_uint64(sn, "metadata_len", &seg->metadata_len))
-			return SEG_LOG_ERROR("Couldn't read metadata_len in");
-		if (!dm_config_get_uint64(sn, "data_start", &seg->data_start))
-			return SEG_LOG_ERROR("Couldn't read data_start in");
-		if (!dm_config_get_uint64(sn, "data_len", &seg->data_len))
-			return SEG_LOG_ERROR("Couldn't read data_len in");
-
-		/* Will use CVOL ID, when metadata_id is not provided */
-		if (dm_config_has_node(sn, "metadata_id")) {
-			if (!(seg->metadata_id = dm_pool_alloc(seg->lv->vg->vgmem, sizeof(*seg->metadata_id))))
-				return SEG_LOG_ERROR("Couldn't allocate metadata_id in");
-			if (!dm_config_get_str(sn, "metadata_id", &uuid))
-				return SEG_LOG_ERROR("Couldn't read metadata_id in");
-			if (!id_read_format(seg->metadata_id, uuid))
-				return SEG_LOG_ERROR("Couldn't format metadata_id in");
-		}
-
-		/* Will use CVOL ID, when data_id is not provided */
-		if (dm_config_has_node(sn, "data_id")) {
-			if (!(seg->data_id = dm_pool_alloc(seg->lv->vg->vgmem, sizeof(*seg->data_id))))
-				return SEG_LOG_ERROR("Couldn't allocate data_id in");
-			if (!dm_config_get_str(sn, "data_id", &uuid))
-				return SEG_LOG_ERROR("Couldn't read data_id in");
-			if (!id_read_format(seg->data_id, uuid))
-				return SEG_LOG_ERROR("Couldn't format data_id in");
-		}
-		pool_lv->status |= LV_CACHE_VOL; /* Mark as cachevol LV */
-	} else {
-		/* Do not call this when LV is cache_vol. */
-		/* load order is unknown, could be cache origin or pool LV, so check for both */
-		if (!dm_list_empty(&pool_lv->segments))
-			_fix_missing_defaults(first_seg(pool_lv));
-	}
-
 	if (!attach_pool_lv(seg, pool_lv, NULL, NULL, NULL))
 		return_0;

+	/* load order is unknown, could be cache origin or pool LV, so check for both */
+	if (!dm_list_empty(&pool_lv->segments))
+		_fix_missing_defaults(first_seg(pool_lv));
+
 	return 1;
 }

@@ -568,8 +489,6 @@ static int _cache_text_import_area_count(const struct dm_config_node *sn,

 static int _cache_text_export(const struct lv_segment *seg, struct formatter *f)
 {
-	char buffer[40];
-
 	if (!seg_lv(seg, 0))
 		return_0;

@@ -579,30 +498,6 @@ static int _cache_text_export(const struct lv_segment *seg, struct formatter *f)
 	if (seg->cleaner_policy)
 		outf(f, "cleaner = 1");

-	if (lv_is_cache_vol(seg->pool_lv)) {
-		outf(f, "metadata_format = " FMTu32, seg->cache_metadata_format);
-
-		if (!_settings_text_export(seg, f))
-			return_0;
-
-		outf(f, "metadata_start = " FMTu64, seg->metadata_start);
-		outf(f, "metadata_len = " FMTu64, seg->metadata_len);
-		outf(f, "data_start = " FMTu64, seg->data_start);
-		outf(f, "data_len = " FMTu64, seg->data_len);
-
-		if (seg->metadata_id) {
-			if (!id_write_format(seg->metadata_id, buffer, sizeof(buffer)))
-				return_0;
-			outf(f, "metadata_id = \"%s\"", buffer);
-		}
-
-		if (seg->data_id) {
-			if (!id_write_format(seg->data_id, buffer, sizeof(buffer)))
-				return_0;
-			outf(f, "data_id = \"%s\"", buffer);
-		}
-	}
-
 	return 1;
 }

@@ -617,9 +512,6 @@ static int _cache_add_target_line(struct dev_manager *dm,
 				 uint32_t *pvmove_mirror_count __attribute__((unused)))
 {
 	struct lv_segment *cache_pool_seg;
-	struct lv_segment *setting_seg;
-	union lvid metadata_lvid;
-	union lvid data_lvid;
 	char *metadata_uuid, *data_uuid, *origin_uuid;
 	uint64_t feature_flags = 0;
 	unsigned attr;
@@ -629,23 +521,15 @@ static int _cache_add_target_line(struct dev_manager *dm,
 		return 0;
 	}

-	log_debug("cache_add_target_line lv %s pool %s", seg->lv->name, seg->pool_lv->name);
-
 	cache_pool_seg = first_seg(seg->pool_lv);
-
-	if (lv_is_cache_vol(seg->pool_lv))
-		setting_seg = seg;
-	else
-		setting_seg = cache_pool_seg;
-
 	if (seg->cleaner_policy)
 		/* With cleaner policy always pass writethrough */
 		feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
 	else
-		switch (setting_seg->cache_mode) {
+		switch (cache_pool_seg->cache_mode) {
 		default:
 			log_error(INTERNAL_ERROR "LV %s has unknown cache mode %d.",
-				  display_lvname(seg->lv), setting_seg->cache_mode);
+				  display_lvname(seg->lv), cache_pool_seg->cache_mode);
 			/* Fall through */
 		case CACHE_MODE_WRITETHROUGH:
 			feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
@@ -658,7 +542,7 @@ static int _cache_add_target_line(struct dev_manager *dm,
 			break;
 		}

-	switch (setting_seg->cache_metadata_format) {
+	switch (cache_pool_seg->cache_metadata_format) {
 	case CACHE_METADATA_FORMAT_1: break;
 	case CACHE_METADATA_FORMAT_2:
 		if (!_target_present(cmd, NULL, &attr))
@@ -666,7 +550,7 @@ static int _cache_add_target_line(struct dev_manager *dm,

 		if (!(attr & CACHE_FEATURE_METADATA2)) {
 			log_error("LV %s has metadata format %u unsuported by kernel.",
-				  display_lvname(seg->lv), setting_seg->cache_metadata_format);
+				  display_lvname(seg->lv), cache_pool_seg->cache_metadata_format);
 			return 0;
 		}
 		feature_flags |= DM_CACHE_FEATURE_METADATA2;
@@ -674,49 +558,18 @@ static int _cache_add_target_line(struct dev_manager *dm,
 		break;
 	default:
 		log_error(INTERNAL_ERROR "LV %s has unknown metadata format %u.",
-			  display_lvname(seg->lv), setting_seg->cache_metadata_format);
+			  display_lvname(seg->lv), cache_pool_seg->cache_metadata_format);
 		return 0;
 	}

-	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), NULL)))
+	if (!(metadata_uuid = build_dm_uuid(mem, cache_pool_seg->metadata_lv, NULL)))
 		return_0;

-	if (!lv_is_cache_vol(seg->pool_lv)) {
-		/* We don't use start/len when using separate data/meta devices. */
-		if (seg->metadata_len || seg->data_len) {
-			log_error(INTERNAL_ERROR "LV %s using unsupported ranges with cache pool.",
-				 display_lvname(seg->lv));
-			return 0;
-		}
+	if (!(data_uuid = build_dm_uuid(mem, seg_lv(cache_pool_seg, 0), NULL)))
+		return_0;

-		if (!(metadata_uuid = build_dm_uuid(mem, cache_pool_seg->metadata_lv, NULL)))
-			return_0;
-
-		if (!(data_uuid = build_dm_uuid(mem, seg_lv(cache_pool_seg, 0), NULL)))
-			return_0;
-	} else {
-		if (!seg->metadata_len || !seg->data_len || (seg->metadata_start == seg->data_start)) {
-			log_error(INTERNAL_ERROR "LV %s has invalid ranges metadata %llu %llu data %llu %llu.",
-				 display_lvname(seg->lv),
-				 (unsigned long long)seg->metadata_start,
-				 (unsigned long long)seg->metadata_len,
-				 (unsigned long long)seg->data_start,
-				 (unsigned long long)seg->data_len);
-			return 0;
-		}
-
-		memset(&metadata_lvid, 0, sizeof(metadata_lvid));
-		memset(&data_lvid, 0, sizeof(data_lvid));
-		memcpy(&metadata_lvid.id[0], &seg->lv->vg->id, sizeof(struct id));
-		memcpy(&metadata_lvid.id[1], (seg->metadata_id) ? : &seg->pool_lv->lvid.id[1], sizeof(struct id));
-		memcpy(&data_lvid.id[0], &seg->lv->vg->id, sizeof(struct id));
-		memcpy(&data_lvid.id[1], (seg->data_id) ? : &seg->pool_lv->lvid.id[1], sizeof(struct id));
-
-		if (!(metadata_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&metadata_lvid.s, "cmeta")))
-			return_0;
-		if (!(data_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&data_lvid.s, "cdata")))
-			return_0;
-	}
+	if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), NULL)))
+		return_0;

 	if (!dm_tree_node_add_cache_target(node, len,
 					   feature_flags,
@@ -726,12 +579,8 @@ static int _cache_add_target_line(struct dev_manager *dm,
 					   seg->cleaner_policy ? "cleaner" :
 						   /* undefined policy name -> likely an old "mq" */
 						   cache_pool_seg->policy_name ? : "mq",
-					   seg->cleaner_policy ? NULL : setting_seg->policy_settings,
-					   seg->metadata_start,
-					   seg->metadata_len,
-					   seg->data_start,
-					   seg->data_len,
-					   setting_seg->chunk_size))
+					   seg->cleaner_policy ? NULL : cache_pool_seg->policy_settings,
+					   cache_pool_seg->chunk_size))
 		return_0;

 	return 1;
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -22,7 +22,6 @@
 #include "lib/activate/activate.h"
 #include "lib/filters/filter.h"
 #include "lib/label/label.h"
-#include "lib/label/hints.h"
 #include "lib/misc/lvm-file.h"
 #include "lib/format_text/format-text.h"
 #include "lib/display/display.h"
@@ -33,6 +32,10 @@
 #include "lib/format_text/archiver.h"
 #include "lib/lvmpolld/lvmpolld-client.h"

+#ifdef HAVE_LIBDL
+#include "lib/misc/sharedlib.h"
+#endif
+
 #include <locale.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
@@ -232,45 +235,6 @@ static void _get_sysfs_dir(struct cmd_context *cmd, char *buf, size_t buf_size)
 	strncpy(buf, sys_mnt, buf_size);
 }

-static uint32_t _parse_debug_fields(struct cmd_context *cmd, int cfg, const char *cfgname)
-{
-	const struct dm_config_node *cn;
-	const struct dm_config_value *cv;
-	uint32_t debug_fields = 0;
-
-	if (!(cn = find_config_tree_array(cmd, cfg, NULL))) {
-		log_error(INTERNAL_ERROR "Unable to find configuration for log/%s.", cfgname);
-		return 0;
-	}
-
-	for (cv = cn->v; cv; cv = cv->next) {
-		if (cv->type != DM_CFG_STRING) {
-			log_verbose("log/%s contains a value which is not a string.  Ignoring.", cfgname);
-			continue;
-		}
-
-		if (!strcasecmp(cv->v.str, "all"))
-			return 0;
-
-		if (!strcasecmp(cv->v.str, "time"))
-			debug_fields |= LOG_DEBUG_FIELD_TIME;
-
-		else if (!strcasecmp(cv->v.str, "command"))
-			debug_fields |= LOG_DEBUG_FIELD_COMMAND;
-
-		else if (!strcasecmp(cv->v.str, "fileline"))
-			debug_fields |= LOG_DEBUG_FIELD_FILELINE;
-
-		else if (!strcasecmp(cv->v.str, "message"))
-			debug_fields |= LOG_DEBUG_FIELD_MESSAGE;
-
-		else
-			log_verbose("Unrecognised value for log/%s: %s", cfgname, cv->v.str);
-	}
-
-	return debug_fields;
-}
-
 static int _parse_debug_classes(struct cmd_context *cmd)
 {
 	const struct dm_config_node *cn;
@@ -359,8 +323,8 @@ static void _init_logging(struct cmd_context *cmd)
 	cmd->default_settings.msg_prefix = find_config_tree_str_allow_empty(cmd, log_prefix_CFG, NULL);
 	init_msg_prefix(cmd->default_settings.msg_prefix);

-	/* so that file and verbose output have a command prefix */
-	init_log_command(0, 0);
+	cmd->default_settings.cmd_name = find_config_tree_bool(cmd, log_command_names_CFG, NULL);
+	init_cmd_name(cmd->default_settings.cmd_name);

 	/* Test mode */
 	cmd->default_settings.test =
@@ -374,19 +338,21 @@ static void _init_logging(struct cmd_context *cmd)
 	log_file = find_config_tree_str(cmd, log_file_CFG, NULL);

 	if (log_file) {
+		release_log_memory();
 		fin_log();
 		init_log_file(log_file, append);
 	}

+	log_file = find_config_tree_str(cmd, log_activate_file_CFG, NULL);
+	if (log_file)
+		init_log_direct(log_file, append);
+
 	init_log_while_suspended(find_config_tree_bool(cmd, log_activation_CFG, NULL));

 	cmd->default_settings.debug_classes = _parse_debug_classes(cmd);
 	log_debug("Setting log debug classes to %d", cmd->default_settings.debug_classes);
 	init_debug_classes_logged(cmd->default_settings.debug_classes);

-	init_debug_file_fields(_parse_debug_fields(cmd, log_debug_file_fields_CFG, "debug_file_fields"));
-	init_debug_output_fields(_parse_debug_fields(cmd, log_debug_output_fields_CFG, "debug_output_fields"));
-
 	t = time(NULL);
 	ctime_r(&t, &timebuf[0]);
 	timebuf[24] = '\0';
@@ -715,8 +681,6 @@ static int _process_config(struct cmd_context *cmd)
 	if (!_init_system_id(cmd))
 		return_0;

-	init_io_memory_size(find_config_tree_int(cmd, global_io_memory_size_CFG, NULL));
-
 	return 1;
 }

@@ -1068,7 +1032,7 @@ static int _init_dev_cache(struct cmd_context *cmd)

 #define MAX_FILTERS 10

-static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
+static struct dev_filter *_init_lvmetad_filter_chain(struct cmd_context *cmd)
 {
 	int nr_filt = 0;
 	const struct dm_config_node *cn;
@@ -1124,7 +1088,7 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
 	nr_filt++;

 	/* usable device filter. Required. */
-	if (!(filters[nr_filt] = usable_filter_create(cmd, cmd->dev_types, FILTER_MODE_NO_LVMETAD))) {
+	if (!(filters[nr_filt] = usable_filter_create(cmd->dev_types, FILTER_MODE_NO_LVMETAD))) {
 		log_error("Failed to create usabled device filter");
 		goto bad;
 	}
@@ -1177,45 +1141,65 @@ bad:
 }

 /*
- *   cmd->filter == 
- *     persistent(cache) filter -> sysfs filter -> internal filter -> global regex filter ->
- *     regex_filter -> type filter -> usable device filter ->
+ * The way the filtering is initialized depends on whether lvmetad is uesd or not.
+ *
+ * If lvmetad is used, there are three filter chains:
+ *
+ *   - cmd->lvmetad_filter - the lvmetad filter chain used when scanning devs for lvmetad update:
+ *     sysfs filter -> internal filter -> global regex filter -> type filter ->
+ *     usable device filter(FILTER_MODE_PRE_LVMETAD) ->
+ *     mpath component filter -> partitioned filter ->
+ *     md component filter -> fw raid filter
+ *
+ *   - cmd->filter - the filter chain used for lvmetad responses:
+ *     persistent filter -> regex_filter -> usable device filter(FILTER_MODE_POST_LVMETAD)
+ *
+ *   - cmd->full_filter - the filter chain used for all the remaining situations:
+ *     cmd->lvmetad_filter -> cmd->filter
+ *
+ * If lvmetad is not used, there's just one filter chain:
+ *
+ *   - cmd->filter == cmd->full_filter:
+ *     persistent filter -> sysfs filter -> internal filter -> global regex filter ->
+ *     regex_filter -> type filter -> usable device filter(FILTER_MODE_NO_LVMETAD) ->
 *     mpath component filter -> partitioned filter -> md component filter -> fw raid filter
 *
 */
 int init_filters(struct cmd_context *cmd, unsigned load_persistent_cache)
 {
-	struct dev_filter *pfilter, *filter = NULL, *filter_components[2] = {0};
+	struct dev_filter *filter = NULL, *filter_components[2] = {0};

 	if (!cmd->initialized.connections) {
 		log_error(INTERNAL_ERROR "connections must be initialized before filters");
 		return 0;
 	}

-	filter = _init_filter_chain(cmd);
-	if (!filter)
+	cmd->lvmetad_filter = _init_lvmetad_filter_chain(cmd);
+	if (!cmd->lvmetad_filter)
 		goto_bad;

 	init_ignore_suspended_devices(find_config_tree_bool(cmd, devices_ignore_suspended_devices_CFG, NULL));
 	init_ignore_lvm_mirrors(find_config_tree_bool(cmd, devices_ignore_lvm_mirrors_CFG, NULL));

 	/*
-	 * persisent filter is a cache of the previous result real filter result.
-	 * If a dev is found in persistent filter, the pass/fail result saved by
-	 * the pfilter is used.  If a dev does not existing in the persistent
-	 * filter, the dev is passed on to the real filter, and when the result
-	 * of the real filter is saved in the persistent filter.
-	 *
-	 * FIXME: we should apply the filter once at the start of the command,
-	 * and not call the filters repeatedly.  In that case we would not need
-	 * the persistent/caching filter layer.
+	 * If lvmetad is used, there's a separation between pre-lvmetad filter chain
+	 * ("cmd->lvmetad_filter") applied only if scanning for lvmetad update and
+	 * post-lvmetad filter chain ("filter") applied on each lvmetad response.
+	 * However, if lvmetad is not used, these two chains are not separated
+	 * and we use exactly one filter chain during device scanning ("filter"
+	 * that includes also "cmd->lvmetad_filter" chain).
 	 */
-	if (!(pfilter = persistent_filter_create(cmd->dev_types, filter))) {
+	filter = cmd->lvmetad_filter;
+	cmd->lvmetad_filter = NULL;
+
+	if (!(filter = persistent_filter_create(cmd->dev_types, filter))) {
 		log_verbose("Failed to create persistent device filter.");
 		goto bad;
 	}

-	cmd->filter = pfilter;
+	cmd->filter = filter;
+
+	cmd->full_filter = filter;

 	cmd->initialized.filters = 1;
 	return 1;
@@ -1237,6 +1221,10 @@ bad:
 		filter->destroy(filter);
 	}

+	/* if lvmetad is used, the cmd->lvmetad_filter is separate */
+	if (cmd->lvmetad_filter)
+		cmd->lvmetad_filter->destroy(cmd->lvmetad_filter);
+
 	cmd->initialized.filters = 0;
 	return 0;
 }
@@ -1276,7 +1264,7 @@ int init_lvmcache_orphans(struct cmd_context *cmd)
 	struct format_type *fmt;

 	dm_list_iterate_items(fmt, &cmd->formats)
-		if (!lvmcache_add_orphan_vginfo(cmd, fmt->orphan_vg_name, fmt))
+		if (!lvmcache_add_orphan_vginfo(fmt->orphan_vg_name, fmt))
 			return_0;

 	return 1;
@@ -1310,6 +1298,24 @@ int lvm_register_segtype(struct segtype_library *seglib,
 	return 1;
 }

+static int _init_single_segtype(struct cmd_context *cmd,
+				struct segtype_library *seglib)
+{
+	struct segment_type *(*init_segtype_fn) (struct cmd_context *);
+	struct segment_type *segtype;
+
+	if (!(init_segtype_fn = dlsym(seglib->lib, "init_segtype"))) {
+		log_error("Shared library %s does not contain segment type "
+			  "functions", seglib->libname);
+		return 0;
+	}
+
+	if (!(segtype = init_segtype_fn(seglib->cmd)))
+		return_0;
+
+	return lvm_register_segtype(seglib, segtype);
+}
+
 static int _init_segtypes(struct cmd_context *cmd)
 {
 	int i;
@@ -1330,6 +1336,10 @@ static int _init_segtypes(struct cmd_context *cmd)
 		NULL
 	};

+#ifdef HAVE_LIBDL
+	const struct dm_config_node *cn;
+#endif
+
 	for (i = 0; init_segtype_array[i]; i++) {
 		if (!(segtype = init_segtype_array[i](cmd)))
 			return 0;
@@ -1356,15 +1366,58 @@ static int _init_segtypes(struct cmd_context *cmd)
 	if (!init_vdo_segtypes(cmd, &seglib))
 		return_0;
 #endif
-
-#ifdef WRITECACHE_INTERNAL
 	if (!init_writecache_segtypes(cmd, &seglib))
 		return 0;
-#endif

-#ifdef INTEGRITY_INTERNAL
-	if (!init_integrity_segtypes(cmd, &seglib))
-		return 0;
+#ifdef HAVE_LIBDL
+	/* Load any formats in shared libs unless static */
+	if (!is_static() &&
+	    (cn = find_config_tree_array(cmd, global_segment_libraries_CFG, NULL))) {
+
+		const struct dm_config_value *cv;
+		int (*init_multiple_segtypes_fn) (struct cmd_context *,
+						  struct segtype_library *);
+
+		for (cv = cn->v; cv; cv = cv->next) {
+			if (cv->type != DM_CFG_STRING) {
+				log_error("Invalid string in config file: "
+					  "global/segment_libraries");
+				return 0;
+			}
+			seglib.libname = cv->v.str;
+			if (!(seglib.lib = load_shared_library(cmd,
+							seglib.libname,
+							"segment type", 0)))
+				return_0;
+
+			if ((init_multiple_segtypes_fn =
+			    dlsym(seglib.lib, "init_multiple_segtypes"))) {
+				if (dlsym(seglib.lib, "init_segtype"))
+					log_warn("WARNING: Shared lib %s has "
+						 "conflicting init fns.  Using"
+						 " init_multiple_segtypes().",
+						 seglib.libname);
+			} else
+				init_multiple_segtypes_fn =
+				    _init_single_segtype;
+ 
+			if (!init_multiple_segtypes_fn(cmd, &seglib)) {
+				struct dm_list *sgtl, *tmp;
+				log_error("init_multiple_segtypes() failed: "
+					  "Unloading shared library %s",
+					  seglib.libname);
+				dm_list_iterate_safe(sgtl, tmp, &cmd->segtypes) {
+					segtype = dm_list_item(sgtl, struct segment_type);
+					if (segtype->library == seglib.lib) {
+						dm_list_del(&segtype->list);
+						segtype->ops->destroy(segtype);
+					}
+				}
+				dlclose(seglib.lib);
+				return_0;
+			}
+		}
+	}
 #endif

 	return 1;
@@ -1497,8 +1550,6 @@ void destroy_config_context(struct cmd_context *cmd)
 		dm_pool_destroy(cmd->mem);
 	if (cmd->libmem)
 		dm_pool_destroy(cmd->libmem);
-	if (cmd->pending_delete_mem)
-		dm_pool_destroy(cmd->pending_delete_mem);

 	free(cmd);
 }
@@ -1527,12 +1578,8 @@ struct cmd_context *create_config_context(void)
 	if (!(cmd->mem = dm_pool_create("command", 4 * 1024)))
 		goto out;

-	if (!(cmd->pending_delete_mem = dm_pool_create("pending_delete", 1024)))
-		goto_out;
-
 	dm_list_init(&cmd->config_files);
 	dm_list_init(&cmd->tags);
-	dm_list_init(&cmd->hints);

 	if (!_init_lvm_conf(cmd))
 		goto_out;
@@ -1598,7 +1645,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 	dm_list_init(&cmd->formats);
 	dm_list_init(&cmd->segtypes);
 	dm_list_init(&cmd->tags);
-	dm_list_init(&cmd->hints);
 	dm_list_init(&cmd->config_files);
 	label_init();

@@ -1678,9 +1724,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 		goto out;
 	}

-	if (!(cmd->pending_delete_mem = dm_pool_create("pending_delete", 1024)))
-		goto_out;
-
 	if (!_init_lvm_conf(cmd))
 		goto_out;

@@ -1712,8 +1755,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 						find_config_tree_array(cmd, devices_types_CFG, NULL))))
 		goto_out;

-	init_use_aio(find_config_tree_bool(cmd, global_use_aio_CFG, NULL));
-
 	if (!_init_dev_cache(cmd))
 		goto_out;

@@ -1729,6 +1770,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 	if (!init_lvmcache_orphans(cmd))
 		goto_out;

+	dm_list_init(&cmd->unused_duplicate_devs);
+
 	if (!_init_segtypes(cmd))
 		goto_out;

@@ -1748,8 +1791,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 	cmd->current_settings = cmd->default_settings;

 	cmd->initialized.config = 1;
-
-	dm_list_init(&cmd->pending_delete);
 out:
 	if (!cmd->initialized.config) {
 		destroy_toolcontext(cmd);
@@ -1775,11 +1816,27 @@ static void _destroy_segtypes(struct dm_list *segtypes)
 {
 	struct dm_list *sgtl, *tmp;
 	struct segment_type *segtype;
+	void *lib;

 	dm_list_iterate_safe(sgtl, tmp, segtypes) {
 		segtype = dm_list_item(sgtl, struct segment_type);
 		dm_list_del(&segtype->list);
+		lib = segtype->library;
 		segtype->ops->destroy(segtype);
+#ifdef HAVE_LIBDL
+		/*
+		 * If no segtypes remain from this library, close it.
+		 */
+		if (lib) {
+			struct segment_type *segtype2;
+			dm_list_iterate_items(segtype2, segtypes)
+				if (segtype2->library == lib)
+					goto skip_dlclose;
+			dlclose(lib);
+skip_dlclose:
+			;
+		}
+#endif
 	}
 }

@@ -1794,9 +1851,9 @@ static void _destroy_dev_types(struct cmd_context *cmd)

 static void _destroy_filters(struct cmd_context *cmd)
 {
-	if (cmd->filter) {
-		cmd->filter->destroy(cmd->filter);
-		cmd->filter = NULL;
+	if (cmd->full_filter) {
+		cmd->full_filter->destroy(cmd->full_filter);
+		cmd->lvmetad_filter = cmd->filter = cmd->full_filter = NULL;
 	}
 	cmd->initialized.filters = 0;
 }
@@ -1835,7 +1892,6 @@ int refresh_toolcontext(struct cmd_context *cmd)
 	 */

 	activation_release();
-	hints_exit(cmd);
 	lvmcache_destroy(cmd, 0, 0);
 	label_scan_destroy(cmd);
 	label_exit();
@@ -1938,12 +1994,6 @@ int refresh_toolcontext(struct cmd_context *cmd)

 	cmd->initialized.config = 1;

-	if (!dm_list_empty(&cmd->pending_delete)) {
-		log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.",
-			  dm_list_size(&cmd->pending_delete));
-		dm_list_init(&cmd->pending_delete);
-	}
-
 	if (cmd->initialized.connections && !init_connections(cmd))
 		return_0;

@@ -1961,7 +2011,6 @@ void destroy_toolcontext(struct cmd_context *cmd)

 	archive_exit(cmd);
 	backup_exit(cmd);
-	hints_exit(cmd);
 	lvmcache_destroy(cmd, 0, 0);
 	label_scan_destroy(cmd);
 	label_exit();
@@ -1984,8 +2033,6 @@ void destroy_toolcontext(struct cmd_context *cmd)
 	if (cmd->libmem)
 		dm_pool_destroy(cmd->libmem);

-	if (cmd->pending_delete_mem)
-		dm_pool_destroy(cmd->pending_delete_mem);
 #ifndef VALGRIND_POOL
 	if (cmd->linebuffer) {
 		/* Reset stream buffering to defaults */
@@ -2014,6 +2061,7 @@ void destroy_toolcontext(struct cmd_context *cmd)

 	lvmpolld_disconnect();

+	release_log_memory();
 	activation_exit();
 	reset_log_duplicated();
 	fin_log();
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -44,6 +44,7 @@ struct config_info {
 	const char *fmt_name;
 	const char *dmeventd_executable;
 	uint64_t unit_factor;
+	int cmd_name;		/* Show command name? */
 	mode_t umask;
 	char unit_type;
 	char _padding[1];
@@ -148,12 +149,10 @@ 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 */
 	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;
@@ -161,10 +160,7 @@ struct cmd_context {
 	unsigned lockd_gl_removed:1;
 	unsigned lockd_vg_default_sh:1;
 	unsigned lockd_vg_enforce_sh:1;
-	unsigned lockd_lv_sh_for_ex:1;
-	unsigned lockd_global_ex:1;		/* set while global lock held ex (lockd) */
-	unsigned lockf_global_ex:1;		/* set while global lock held ex (flock) */
-	unsigned nolocking:1;
+	unsigned lockd_lv_sh:1;
 	unsigned vg_notify:1;
 	unsigned lv_notify:1;
 	unsigned pv_notify:1;
@@ -174,22 +170,15 @@ struct cmd_context {
 	unsigned pvscan_cache_single:1;
 	unsigned can_use_one_scan:1;
 	unsigned is_clvmd:1;
-	unsigned md_component_detection:1;
 	unsigned use_full_md_check:1;
 	unsigned is_activating:1;
-	unsigned enable_hints:1;		/* hints are enabled for cmds in general */
-	unsigned use_hints:1;			/* if hints are enabled this cmd can use them */
-	unsigned pvscan_recreate_hints:1;	/* enable special case hint handling for pvscan --cache */
-	unsigned scan_lvs:1;
-	unsigned wipe_outdated_pvs:1;
-	unsigned filter_nodata_only:1;          /* only use filters that do not require data from the dev */

 	/*
-	 * Devices and filtering.
+	 * Filtering.
 	 */
-	struct dev_filter *filter;
-	struct dm_list hints;
-	const char *md_component_checks;
+	struct dev_filter *lvmetad_filter;	/* pre-lvmetad filter chain */
+	struct dev_filter *filter;		/* post-lvmetad filter chain */
+	struct dev_filter *full_filter;		/* lvmetad_filter + filter */

 	/*
 	 * Configuration.
@@ -240,8 +229,7 @@ struct cmd_context {
 	const char *report_list_item_separator;
 	const char *time_format;
 	unsigned rand_seed;
-	struct dm_list pending_delete;		/* list of LVs for removal */
-	struct dm_pool *pending_delete_mem;	/* memory pool for pending deletes */
+	struct dm_list unused_duplicate_devs; /* save preferences between lvmcache instances */
 };

 /*
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -24,7 +24,6 @@
 #include "lib/misc/lvm-file.h"
 #include "lib/mm/memlock.h"
 #include "lib/label/label.h"
-#include "lib/metadata/metadata.h"

 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -503,10 +502,10 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r
 {
 	char *fb, *fe;
 	int r = 0;
-	int sz, use_plain_read = 1;
+	int use_mmap = 1;
+	off_t mmap_offset = 0;
 	char *buf = NULL;
 	struct config_source *cs = dm_config_get_custom(cft);
-	size_t rsize;

 	if (!_is_file_based_config_source(cs->type)) {
 		log_error(INTERNAL_ERROR "config_file_read_fd: expected file, special file "
@@ -515,28 +514,26 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r
 		return 0;
 	}

-	/* Only use plain read with regular files */
+	/* Only use mmap with regular files */
 	if (!(dev->flags & DEV_REGULAR) || size2)
-		use_plain_read = 0;
+		use_mmap = 0;

-	if (!(buf = malloc(size + size2))) {
-		log_error("Failed to allocate circular buffer.");
-		return 0;
-	}
-
-	if (use_plain_read) {
-		/* Note: also used for lvm.conf to read all settings */
-		for (rsize = 0; rsize < size; rsize += sz) {
-			do {
-				sz = read(dev_fd(dev), buf + rsize, size - rsize);
-			} while ((sz < 0) && ((errno == EINTR) || (errno == EAGAIN)));
-
-			if (sz < 0) {
-				log_sys_error("read", dev_name(dev));
-				goto out;
-			}
+	if (use_mmap) {
+		mmap_offset = offset % lvm_getpagesize();
+		/* memory map the file */
+		fb = mmap((caddr_t) 0, size + mmap_offset, PROT_READ,
+			  MAP_PRIVATE, dev_fd(dev), offset - mmap_offset);
+		if (fb == (caddr_t) (-1)) {
+			log_sys_error("mmap", dev_name(dev));
+			goto out;
 		}
+		fb = fb + mmap_offset;
 	} else {
+		if (!(buf = malloc(size + size2))) {
+			log_error("Failed to allocate circular buffer.");
+			return 0;
+		}
+
 		if (!dev_read_bytes(dev, offset, size, buf))
 			goto out;

@@ -544,9 +541,9 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r
 			if (!dev_read_bytes(dev, offset2, size2, buf + size))
 				goto out;
 		}
-	}

-	fb = buf;
+		fb = buf;
+	}

 	/*
 	 * The checksum passed in is the checksum from the mda_header
@@ -575,7 +572,15 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r
 	r = 1;

      out:
-	free(buf);
+	if (!use_mmap)
+		free(buf);
+	else {
+		/* unmap the file */
+		if (munmap(fb - mmap_offset, size + mmap_offset)) {
+			log_sys_error("munmap", dev_name(dev));
+			r = 0;
+		}
+	}

 	return r;
 }
@@ -2328,11 +2333,6 @@ int load_pending_profiles(struct cmd_context *cmd)
 	return r;
 }

-int get_default_metadata_pvmetadatasize_CFG(struct cmd_context *cmd, struct profile *profile)
-{
-	return get_default_pvmetadatasize_sectors();
-}
-
 const char *get_default_devices_cache_dir_CFG(struct cmd_context *cmd, struct profile *profile)
 {
 	static char buf[PATH_MAX];
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Teigland	0791eed33d	report: cachevol field for writecache LVs	2018-07-24 17:00:06 -05:00
David Teigland	19637a8d72	Add dm-writecache support Use dm-writecache to attach a cache volume (CV) to an LV. The LV type becomes "writecache" (--type writecache can be optionally specified when attaching.) lvconvert --cachevol-attach CV LV lvconvert --cachevol-detach CV LV The cachevol (CV) is a special LV that was created on cache devices, e.g. lvcreate --cachevol -L <size> -n <name> VG Cache devices are special PVs that are added to the VG to use for cachevols, e.g. vgextend --cachedev VG PV Example: Add persistent memory to a VG as a cache device: vgextend --cachedev vg /dev/pmem0 Create a cache volume from pmem0: lvcreate --cachevol -L1G -n cvol0 vg Create a second cache volume from pmem0: lvcreate --cachevol -L1G -n cvol1 vg Attach the cache volumes to LVs: lvconvert --cachevol-attach cvol0 vg/lv0 lvconvert --cachevol-attach cvol1 vg/lv1	2018-07-24 15:46:06 -05:00
David Teigland	4fc2bdb0ba	Add cache volumes A cache volume (CV) is a special LV that can be attached to a standard LV to do caching. A cache volume is allocated from cache devices (CDs) which are special PVs in the VG that are used for caching. To create a cache volume, add the --cachevol option to the lvcreate command. lvcreate will allocate extents for the CV from cache devs that have been added to the VG. lvcreate --cachevol -n <name> -L <size> VG [CD...]	2018-07-24 15:46:06 -05:00
David Teigland	7ac01dc7fa	Add cache devices A cache device is a special PV that is added to a VG to be used for caching, and not for allocating standard LVs. A cache device (CD) is used to create a cache volume. A cache volume (CV) is a special LV that can be attached to a standard LV to do caching. Terminology: PV used for caching = cache device = cachedev = CD LV used for caching = cache volume = cachevol = CV PV metadata for a cachedev includes the CACHEDEV flag. LV metadata for a cachevol includes the CACHEVOL flag. A cachedev is added to a VG with: vgextend --cachedev VG PV The --cachedev option tells lvm that the PV should be added to the VG as a cache device, not a standard PV. (cache volumes are added by the following commit)	2018-07-24 15:46:06 -05:00