tests: add missing-pv missing-pv-unused

vgck: dumpmetadata to dump metadata from disk
vgck --dumpmetadata dumps the exact metadata text from the mda to stdout or file. Specific PVs can be selected. This is useful for debugging, testing, and recovery.
2026-01-25 00:32:58 +03:00 · 2019-04-12 13:56:31 -05:00 · 2019-04-12 13:56:31 -05:00 · 2019-04-12 11:08:23 -05:00 · 2019-04-12 11:08:23 -05:00 · 2019-04-12 10:58:14 -05:00
614 changed files with 27558 additions and 56664 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -30,19 +30,14 @@ make.tmpl
 /config.log
 /config.status
 /configure.scan
-/cscope.*
+/cscope.out
 /html/
-/python/
 /reports/
 /tags
 /tmp/

 coverity/coverity_model.xml

-# gcov files:
-*.gcda
-*.gcno
-
 tools/man-generator
 tools/man-generator.c

--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@

-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools
+SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools

 ifeq ("@UDEV_RULES@", "yes")
  SUBDIRS += udev
@@ -47,6 +47,8 @@ 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)
 daemons: lib libdaemon tools
 scripts: lib
@@ -54,13 +56,16 @@ tools: lib libdaemon
 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
 daemons.device-mapper: libdm.device-mapper
 tools.device-mapper: libdm.device-mapper
+scripts.device-mapper: include.device-mapper
 device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
-device_mapper: device-mapper

 ifeq ("@INTL@", "yes")
 lib.pofile: include.pofile
@@ -76,10 +81,9 @@ daemons.cflow: tools.cflow
 cflow: include.cflow
 endif

-CSCOPE_DIRS = base daemons device_mapper include lib libdaemon scripts tools libdm test
 ifneq ("@CSCOPE_CMD@", "")
 cscope.out:
-	@CSCOPE_CMD@ -b -R $(patsubst %,-s%,$(addprefix $(srcdir)/,$(CSCOPE_DIRS)))
+	@CSCOPE_CMD@ -b -R -s$(top_srcdir)
 all: cscope.out
 endif
 DISTCLEAN_TARGETS += cscope.out
@@ -112,11 +116,11 @@ rpm: dist
 	$(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES
 	DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\
 	GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\
-	$(SED) -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
+	sed -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
 	    -e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
 	    -e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \
 	    $(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
-	V=$(V) rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
+	rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec

 generate: conf.generate man.generate
 	$(MAKE) -C conf generate
@@ -150,31 +154,6 @@ install_all_man:
 install_tmpfiles_configuration:
 	$(MAKE) -C scripts install_tmpfiles_configuration

-help:
-	@echo -e "\nAvailable targets:"
-	@echo "  all			Default target."
-	@echo "  all_man		Build all man pages with generators."
-	@echo "  clean			Remove all compile files."
-	@echo "  device-mapper		Device mapper part of lvm2."
-	@echo "  dist			Generate distributable file."
-	@echo "  distclean		Remove all build files."
-	@echo "  generate		Generate man pages for sources."
-	@echo "  help			Display callable targets."
-	@echo "  install		Install all files."
-	@echo "  install_all_man	Install all man pages."
-	@echo "  install_cluster	Install cmirrord."
-	@echo "  install_device-mapper	Install device mapper files."
-	@echo "  install_initscripts	Install initialization scripts."
-	@echo "  install_lvm2		Install lvm2 files."
-	@echo "  install_systemd_units	Install systemd units."
-	@echo "  lcov			Generate lcov output."
-	@echo "  lcov-dated		Generate lcov with timedate suffix."
-	@echo "  lcov-reset		Reset lcov counters"
-	@echo "  man			Build man pages."
-	@echo "  rpm			Build rpm."
-	@echo "  run-unit-test		Run unit tests."
-	@echo "  tags			Generate c/etags."
-
 ifneq ("$(LCOV)", "")
 .PHONY: lcov-reset lcov lcov-dated

@@ -204,8 +183,8 @@ endif
 ifneq ($(shell which ctags 2>/dev/null),)
 .PHONY: tags
 tags:
-	test -z "$(shell find $(addprefix $(top_srcdir)/,$(CSCOPE_DIRS)) -type f -name '*.[ch]' -newer tags 2>/dev/null | head -1)" || $(RM) tags
-	test -f tags || find $(addprefix $(top_srcdir)/,$(CSCOPE_DIRS)) -maxdepth 5 -type f -name '*.[ch]' -exec ctags -a '{}' +
+	test -z "$(shell find $(top_srcdir) -type f -name '*.[ch]' -newer tags 2>/dev/null | head -1)" || $(RM) tags
+	test -f tags || find $(top_srcdir) -maxdepth 5 -type f -name '*.[ch]' -exec ctags -a '{}' +

 CLEAN_TARGETS += tags
 endif
--- a/11
+++ b/11
@@ -1,6 +1,7 @@
 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.
+This is development branch, for stable 2.02 release see 2018-06-01-stable
+branch.

 For more information about LVM2 read the changelog in the WHATS_NEW file.
 Installation instructions are in INSTALL.
@@ -9,6 +10,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 +45,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.13(2)-git (2021-05-07)
+2.03.02(2)-git (2018-10-31)
--- a/2
+++ b/2
@@ -1 +1 @@
-1.02.179-git (2021-05-07)
+1.02.155-git (2018-10-31)
--- a/208
+++ b/208
@@ -1,200 +1,5 @@
-Version 2.03.13 - 
-===============================
-  Simplified handling of archive() and backup() internal calls.
-  Fix load of kvdo target when it is not present in memory (2.03.12).
-
-Version 2.03.12 - 07th May 2021
-===============================
-  Allow attaching cache to thin data volume.
-  Fix memleak when generating list of outdated pvs.
-  Better hyphenation usage in man pages.
-  Replace use of deprecated security_context_t with char*.
-  Configure supports AIO_LIBS and AIO_CFLAGS.
-  Improve build process for static builds.
-  New --setautoactivation option to modify LV or VG auto activation.
-  New metadata based autoactivation property for LVs and VGs.
-  Improve signal handling with lvmpolld.
-  Signal handler can interrupt command also for SIGTERM.
-  Lvreduce --yes support.
-  Add configure option --with/out-symvers for non-glibc builds.
-  Report error when the filesystem is missing on fsadm resized volume.
-  Handle better blockdev with --getsize64 support for fsadm.
-  Do not include editline/history.h when using editline library.
-  Support error and zero segtype for thin-pool data for testing.
-  Support mixed extension for striped, error and zero segtypes.
-  Support resize also for stacked virtual volumes.
-  Skip dm-zero devices just like with dm-error target.
-  Reduce ioctl() calls when checking target status.
-  Merge polling does not fail, when LV is found to be already merged.
-  Poll volumes with at least 100ms delays.
-  Do not flush dm cache when cached LV is going to be removed.
-  New lvmlockctl_kill_command configuration option.
-  Support interruption while waiting on device close before deactivation.
-  Flush thin-pool messages before removing more thin volumes.
-  Improve hash function with less collisions and make it faster.
-  Reduce ioctl count when deactivating volumes.
-  Reduce number of metadata parsing.
-  Enhance performance of lvremove and vgremove commands.
-  Support interruption when taking archive and backup.
-  Accelerate large lvremoves.
-  Speedup search for cached device nodes.
-  Speedup command initialization.
-  Add devices file feature, off by default for now.
-  Support extension of writecached volumes.
-  Fix problem with unbound variable usage within fsadm.
-  Fix IMSM MD RAID detection on 4k devices.
-  Check for presence of VDO target before starting any conversion.
-  Support metatadata profiles with volume VDO pool conversions.
-  Support -Zn for conversion of already formated VDO pools.
-  Avoid removing LVs on error path of lvconvert during creation volumes.
-  Fix crashing lvdisplay when thin volume was waiting for merge.
-  Support option --errorwhenfull when converting volume to thin-pool.
-  Improve thin-performance profile support conversion to thin-pool.
-  Add workaround to avoid read of internal 'converted' devices.
-  Prohibit merging snapshot into the read-only thick snapshot origin.
-  Restore support for flipping rw/r permissions for thin snapshot origin.
-  Support resize of cached volumes.
-  Disable autoactivation with global/event_activation=0.
-  Check if lvcreate passes read_only_volume_list with tags and skips zeroing.
-  Allocation prints better error when metadata cannot fit on a single PV.
-  Pvmove can better resolve full thin-pool tree move.
-  Limit pool metadata spare to 16GiB.
-  Improves conversion and allocation of pool metadata.
-  Support thin pool metadata 15.88GiB, adds 64MiB, thin_pool_crop_metadata=0.
-  Enhance lvdisplay to report raid available/partial.
-  Support online rename of VDO pools.
-  Improve removal of pmspare when last pool is removed.
-  Fix problem with wiping of converted LVs.
-  Fix memleak in scanning  (2.03.11).
-  Fix corner case allocation for thin-pools.
-
-Version 2.03.11 - 08th January 2021
+Version 2.03.02 - 
 ===================================
-  Fix pvck handling MDA at offset different from 4096.
-  Partial or degraded activation of writecache is not allowed.
-  Enhance error handling for fsadm and handle 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.
-  Allow pvmove of writecache origin.
-  Report integrity fields.
-  Integrity volumes defaults to journal mode.
-  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.
@@ -227,14 +32,10 @@ Version 2.03.03 - 07th June 2019
  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.
+  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
 ===================================
@@ -266,6 +67,7 @@ Version 2.03.00 - 10th October 2018
  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.

 Version 2.02.178-rc1 - 24th May 2018
@@ -1785,7 +1587,7 @@ Version 2.02.105 - 20th January 2014
  Allow lvmetad to reuse stale socket.
  Only unlink lvmetad socket on error if created by the same process.
  Append missing newline to lvmetad missing socket path error message.
-  Check for non-zero alignment in _text_pv_add_metadata_area() to not div by 0.
+  Check for non-zero aligment in _text_pv_add_metadata_area() to not div by 0.
  Add allocation/use_blkid_wiping to lvm.conf to enable blkid wiping.
  Enable blkid_wiping by default if the blkid library is present.
  Add configure --disable-blkid_wiping to disable libblkid signature detection.
--- a/50
+++ b/50
@@ -1,56 +1,10 @@
-Version 1.02.179 - 
-================================
-
-Version 1.02.177 - 07th May 2021
-================================
-  Configure proceeds without libaio to allow build of device-mapper only.
-  Fix symbol versioning build with -O2 -flto.
-  Add dm_tree_node_add_thin_pool_target_v1 with crop_metadata support.
-
-Version 1.02.175 - 08th January 2021
+Version 1.02.155 - 
 ====================================
-
-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
-====================================
-  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
 ====================================
@@ -560,7 +514,7 @@ Version 1.02.86 - 23rd June 2014
  Add DM_REPORT_FIELD_TYPE_STRING_LIST: separate string and string list fields.
  Add dm_str_list to libdevmapper for string list type definition and its reuse.
  Add dmsetup -S/--select to define selection criteria for dmsetup reports.
-  Add dm_report_init_with_selection to initialize report with selection criteria.
+  Add dm_report_init_with_selection to intialize report with selection criteria.
  Add DM_REPORT_FIELD_TYPE_SIZE: separate number and size reporting fields.
  Use RemoveOnStop for dm-event.socket systemd unit.
  Document env var 'DM_DEFAULT_NAME_MANGLING_MODE' in dmsetup man page.
--- 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])

@@ -496,14 +494,12 @@ AC_DEFUN([AM_PATH_PYTHON],
    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
  else

-  dnl Query Python for its version number.  Although site.py simply uses
-  dnl sys.version[:3], printing that failed with Python 3.10, since the
-  dnl trailing zero was eliminated. So now we output just the major
-  dnl and minor version numbers, as numbers. Apparently the tertiary
-  dnl version is not of interest.
+  dnl Query Python for its version number.  Getting [:3] seems to be
+  dnl the best way to do this; it's what "site.py" does in the standard
+  dnl library.

  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
+    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])

  dnl Use the values of $prefix and $exec_prefix for the corresponding
@@ -653,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/data-struct/hash.c
+++ b/base/data-struct/hash.c
@@ -22,26 +22,17 @@ struct dm_hash_node {
 	void *data;
 	unsigned data_len;
 	unsigned keylen;
-	unsigned hash;
-	char key[];
+	char key[0];
 };

 struct dm_hash_table {
 	unsigned num_nodes;
-	unsigned num_hint;
-	unsigned mask_slots;    /* (slots - 1) -> used as hash mask */
-	unsigned collisions;    /* Collissions of hash keys */
-	unsigned search;        /* How many keys were searched */
-	unsigned found;         /* How many nodes were found */
-	unsigned same_hash;     /* Was there a colision with same masked hash and len ? */
+	unsigned num_slots;
 	struct dm_hash_node **slots;
 };

-#if 0 /* TO BE REMOVED */
-static unsigned _hash(const void *key, unsigned len)
-{
-	/* Permutation of the Integers 0 through 255 */
-	static unsigned char _nums[] = {
+/* Permutation of the Integers 0 through 255 */
+static unsigned char _nums[] = {
 	1, 14, 110, 25, 97, 174, 132, 119, 138, 170, 125, 118, 27, 233, 140, 51,
 	87, 197, 177, 107, 234, 169, 56, 68, 30, 7, 173, 73, 188, 40, 36, 65,
 	49, 213, 104, 190, 57, 211, 148, 223, 48, 115, 15, 2, 67, 186, 210, 28,
@@ -66,16 +57,29 @@ static unsigned _hash(const void *key, unsigned len)
 	44, 38, 31, 149, 135, 0, 216, 52, 63, 23, 37, 69, 39, 117, 146, 184,
 	163, 200, 222, 235, 248, 243, 219, 10, 152, 131, 123, 229, 203, 76, 120,
 	209
-	};
+};

-	const uint8_t *str = key;
-	unsigned h = 0, g;
+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, str, len);
+		n->keylen = len;
+	}
+
+	return n;
+}
+
+static unsigned long _hash(const char *str, unsigned len)
+{
+	unsigned long h = 0, g;
 	unsigned i;

 	for (i = 0; i < len; i++) {
 		h <<= 4;
-		h += _nums[*str++];
-		g = h & ((unsigned) 0xf << 16u);
+		h += _nums[(unsigned char) *str++];
+		g = h & ((unsigned long) 0xf << 16u);
 		if (g) {
 			h ^= g >> 16u;
 			h ^= g >> 5u;
@@ -85,99 +89,30 @@ static unsigned _hash(const void *key, unsigned len)
 	return h;
 }

-/* In-kernel DM hashing, still lots of collisions */
-static unsigned _hash_in_kernel(const char *key, unsigned len)
-{
-	const unsigned char *str = (unsigned char *)key;
-	const unsigned hash_mult = 2654435387U;
-	unsigned hash = 0, i;
-
-	for (i = 0; i < len; ++i)
-		hash = (hash + str[i]) * hash_mult;
-
-	return hash;
-}
-#endif
-
-#undef get16bits
-#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-#define get16bits(d) (*((const uint16_t *) (d)))
-#endif
-
-#if !defined (get16bits)
-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
-                       +(uint32_t)(((const uint8_t *)(d))[0]) )
-#endif
-
-/*
- * Adapted Bob Jenkins hash to read by 2 bytes if possible.
- * https://secure.wikimedia.org/wikipedia/en/wiki/Jenkins_hash_function
- *
- * Reduces amount of hash collisions
- */
-static unsigned _hash(const void *key, unsigned len)
-{
-	const uint8_t *str = (uint8_t*) key;
-	unsigned hash = 0, i;
-	unsigned sz = len / 2;
-
-	for(i = 0; i < sz; ++i) {
-		hash += get16bits(str + 2 * i);
-		hash += (hash << 10);
-		hash ^= (hash >> 6);
-	}
-
-	if (len & 1) {
-		hash += str[len - 1];
-		hash += (hash << 10);
-		hash ^= (hash >> 6);
-	}
-
-	hash += (hash << 3);
-	hash ^= (hash >> 11);
-	hash += (hash << 15);
-
-	return hash;
-}
-
-static struct dm_hash_node *_create_node(const void *key, unsigned len)
-{
-	struct dm_hash_node *n = malloc(sizeof(*n) + len);
-
-	if (n) {
-		memcpy(n->key, key, len);
-		n->keylen = len;
-	}
-
-	return n;
-}
-
 struct dm_hash_table *dm_hash_create(unsigned size_hint)
 {
 	size_t len;
 	unsigned new_size = 16u;
 	struct dm_hash_table *hc = zalloc(sizeof(*hc));

-	if (!hc) {
-		log_error("Failed to allocate memory for hash.");
-		return 0;
-	}
-
-	hc->num_hint = size_hint;
+	if (!hc)
+		return_0;

 	/* round size hint up to a power of two */
 	while (new_size < size_hint)
 		new_size = new_size << 1;

-	hc->mask_slots = new_size - 1;
+	hc->num_slots = new_size;
 	len = sizeof(*(hc->slots)) * new_size;
-	if (!(hc->slots = zalloc(len))) {
-		free(hc);
-		log_error("Failed to allocate slots for hash.");
-		return 0;
-	}
+	if (!(hc->slots = zalloc(len)))
+		goto_bad;

 	return hc;
+
+      bad:
+	free(hc->slots);
+	free(hc);
+	return 0;
 }

 static void _free_nodes(struct dm_hash_table *t)
@@ -185,16 +120,7 @@ static void _free_nodes(struct dm_hash_table *t)
 	struct dm_hash_node *c, *n;
 	unsigned i;

-#ifdef DEBUG
-	log_debug("Free hash hint:%d slots:%d nodes:%d (s:%d f:%d c:%d h:%d)",
-		  t->num_hint, t->mask_slots + 1, t->num_nodes,
-		  t->search, t->found, t->collisions, t->same_hash);
-#endif
-
-	if (!t->num_nodes)
-		return;
-
-	for (i = 0; i <= t->mask_slots; i++)
+	for (i = 0; i < t->num_slots; i++)
 		for (c = t->slots[i]; c; c = n) {
 			n = c->next;
 			free(c);
@@ -208,30 +134,21 @@ void dm_hash_destroy(struct dm_hash_table *t)
 	free(t);
 }

-static struct dm_hash_node **_findh(struct dm_hash_table *t, const void *key,
-				    uint32_t len, unsigned hash)
-{
-	struct dm_hash_node **c;
-
-	++t->search;
-	for (c = &t->slots[hash & t->mask_slots]; *c; c = &((*c)->next)) {
-		if ((*c)->keylen == len && (*c)->hash == hash) {
-			if (!memcmp(key, (*c)->key, len)) {
-				++t->found;
-				break;
-			}
-			++t->same_hash;
-		}
-		++t->collisions;
-	}
-
-	return c;
-}
-
 static struct dm_hash_node **_find(struct dm_hash_table *t, const void *key,
 				   uint32_t len)
 {
-	return _findh(t, key, len, _hash(key, len));
+	unsigned h = _hash(key, len) & (t->num_slots - 1);
+	struct dm_hash_node **c;
+
+	for (c = &t->slots[h]; *c; c = &((*c)->next)) {
+		if ((*c)->keylen != len)
+			continue;
+
+		if (!memcmp(key, (*c)->key, len))
+			break;
+	}
+
+	return c;
 }

 void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key,
@@ -245,8 +162,7 @@ void *dm_hash_lookup_binary(struct dm_hash_table *t, const void *key,
 int dm_hash_insert_binary(struct dm_hash_table *t, const void *key,
 			  uint32_t len, void *data)
 {
-	unsigned hash = _hash(key, len);
-	struct dm_hash_node **c = _findh(t, key, len, hash);
+	struct dm_hash_node **c = _find(t, key, len);

 	if (*c)
 		(*c)->data = data;
@@ -257,7 +173,6 @@ int dm_hash_insert_binary(struct dm_hash_table *t, const void *key,
 			return 0;

 		n->data = data;
-		n->hash = hash;
 		n->next = 0;
 		*c = n;
 		t->num_nodes++;
@@ -301,7 +216,7 @@ static struct dm_hash_node **_find_str_with_val(struct dm_hash_table *t,
 	struct dm_hash_node **c;
 	unsigned h;
       
-	h = _hash(key, len) & t->mask_slots;
+	h = _hash(key, len) & (t->num_slots - 1);

 	for (c = &t->slots[h]; *c; c = &((*c)->next)) {
 		if ((*c)->keylen != len)
@@ -332,7 +247,7 @@ int dm_hash_insert_allow_multiple(struct dm_hash_table *t, const char *key,
 	n->data = (void *)val;
 	n->data_len = val_len;

-	h = _hash(key, len) & t->mask_slots;
+	h = _hash(key, len) & (t->num_slots - 1);

 	first = t->slots[h];

@@ -400,7 +315,7 @@ void *dm_hash_lookup_with_count(struct dm_hash_table *t, const char *key, int *c

 	*count = 0;

-	h = _hash(key, len) & t->mask_slots;
+	h = _hash(key, len) & (t->num_slots - 1);

 	for (c = &t->slots[h]; *c; c = &((*c)->next)) {
 		if ((*c)->keylen != len)
@@ -429,7 +344,7 @@ void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f)
 	struct dm_hash_node *c, *n;
 	unsigned i;

-	for (i = 0; i <= t->mask_slots; i++)
+	for (i = 0; i < t->num_slots; i++)
 		for (c = t->slots[i]; c; c = n) {
 			n = c->next;
 			f(c->data);
@@ -439,8 +354,8 @@ void dm_hash_iter(struct dm_hash_table *t, dm_hash_iterate_fn f)
 void dm_hash_wipe(struct dm_hash_table *t)
 {
 	_free_nodes(t);
-	memset(t->slots, 0, sizeof(struct dm_hash_node *) * (t->mask_slots + 1));
-	t->num_nodes = t->collisions = t->search = t->same_hash = 0u;
+	memset(t->slots, 0, sizeof(struct dm_hash_node *) * t->num_slots);
+	t->num_nodes = 0u;
 }

 char *dm_hash_get_key(struct dm_hash_table *t __attribute__((unused)),
@@ -460,7 +375,7 @@ static struct dm_hash_node *_next_slot(struct dm_hash_table *t, unsigned s)
 	struct dm_hash_node *c = NULL;
 	unsigned i;

-	for (i = s; i <= t->mask_slots && !c; i++)
+	for (i = s; i < t->num_slots && !c; i++)
 		c = t->slots[i];

 	return c;
@@ -473,5 +388,7 @@ struct dm_hash_node *dm_hash_get_first(struct dm_hash_table *t)

 struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_node *n)
 {
-	return n->next ? n->next : _next_slot(t, (n->hash & t->mask_slots) + 1);
+	unsigned h = _hash(n->key, n->keylen) & (t->num_slots - 1);
+
+	return n->next ? n->next : _next_slot(t, h + 1);
 }
--- 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
@@ -47,7 +47,7 @@ struct value_chain {
 struct prefix_chain {
 	struct value child;
 	unsigned len;
-	uint8_t prefix[];
+	uint8_t prefix[0];
 };

 struct node4 {
@@ -1032,7 +1032,7 @@ void radix_tree_iterate(struct radix_tree *rt, uint8_t *kb, uint8_t *ke,
 {
 	struct lookup_result lr = _lookup_prefix(&rt->root, kb, ke);
 	if (lr.kb == ke || _prefix_chain_matches(&lr, ke))
-		(void) _iterate(lr.v, it);
+        	_iterate(lr.v, it);
 }

 //----------------------------------------------------------------
--- 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/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -78,32 +78,16 @@ devices {
 	# routines to acquire this information. For example, this information
 	# is used to drive LVM filtering like MD component detection, multipath
 	# component detection, partition detection and others.
-	#
+	# 
 	# Accepted values:
 	#   none
 	#     No external device information source is used.
 	#   udev
 	#     Reuse existing udev database records. Applicable only if LVM is
 	#     compiled with udev support.
-	#
+	# 
 	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
@@ -118,44 +102,12 @@ devices {
 	# Prefer the name with the least number of slashes.
 	# Prefer a name that is a symlink.
 	# Prefer the path with least value in lexicographical order.
-	#
+	# 
 	# Example
 	# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

-	# Configuration option devices/use_devicesfile.
-	# Enable or disable the use of a devices file.
-	# When enabled, lvm will only use devices that
-	# are lised in the devices file. A devices file will
-	# be used, regardless of this setting, when the --devicesfile
-	# option is set to a specific file name.
-	# This configuration option has an automatic default value.
-	# use_devicesfile = 0
-
-	# Configuration option devices/devicesfile.
-	# The name of the system devices file, listing devices that LVM should use.
-	# This should not be used to select a non-system devices file.
-	# The --devicesfile option is intended for alternative devices files.
-	# This configuration option has an automatic default value.
-	# devicesfile = "system.devices"
-
-	# Configuration option devices/search_for_devnames.
-	# Look outside of the devices file for missing devname entries.
-	# A devname entry is used for a device that does not have a stable
-	# device id, e.g. wwid, so the unstable device name is used as
-	# the device id. After reboot, or if the device is reattached,
-	# the device name may change, in which case lvm will not find
-	# the expected PV on the device listed in the devices file.
-	# This setting controls whether lvm will search other devices,
-	# outside the devices file, to look for the missing PV on a
-	# renamed device. If "none", lvm will not look at other devices,
-	# and the PV may appear to be missing. If "auto", lvm will look
-	# at other devices, but only those that are likely to have the PV.
-	# If "all", lvm will look at all devices on the system.
-	# This configuration option has an automatic default value.
-	# search_for_devnames = "auto"
-
 	# Configuration option devices/filter.
 	# Limit the block devices that are used by LVM commands.
 	# This is a list of regular expressions used to accept or reject block
@@ -171,10 +123,10 @@ 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.
-	#
+	# 
 	# 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:
@@ -182,10 +134,10 @@ devices {
 	# Accept all loop devices and ide drives except hdc:
 	# filter = [ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ]
 	# Use anchors to be very specific:
-	# filter = [ "a|^/dev/hda8$|", "r|.*|" ]
-	#
+	# filter = [ "a|^/dev/hda8$|", "r|.*/|" ]
+	# 
 	# This configuration option has an automatic default value.
-	# filter = [ "a|.*|" ]
+	# filter = [ "a|.*/|" ]

 	# Configuration option devices/global_filter.
 	# Limit the block devices that are used by LVM system components.
@@ -195,16 +147,16 @@ devices {
 	# The syntax is the same as devices/filter. Devices rejected by
 	# global_filter are not opened by LVM.
 	# This configuration option has an automatic default value.
-	# global_filter = [ "a|.*|" ]
+	# global_filter = [ "a|.*/|" ]

 	# Configuration option devices/types.
 	# List of additional acceptable block device types.
 	# These are of device type names from /proc/devices, followed by the
 	# maximum number of partitions.
-	#
+	# 
 	# Example
 	# types = [ "fd", 16 ]
-	#
+	# 
 	# This configuration option is advanced.
 	# This configuration option does not have a default value defined.

@@ -215,52 +167,17 @@ devices {
 	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
+	# Scan LVM LVs for layered PVs.
+	scan_lvs = 1

 	# 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
@@ -270,16 +187,16 @@ devices {
 	# Configuration option devices/md_chunk_alignment.
 	# Align the start of a PV data area with md device's stripe-width.
 	# This applies if a PV is placed directly on an md device.
-	# default_data_alignment will be overridden if it is not aligned
+	# default_data_alignment will be overriden if it is not aligned
 	# with the value detected for this setting.
-	# This setting is overridden by data_alignment_detection,
+	# 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 overridden by data_alignment and the --dataalignment
+	# This setting is overriden by data_alignment and the --dataalignment
 	# option.
 	# This configuration option has an automatic default value.
 	# default_data_alignment = 1
@@ -293,9 +210,9 @@ 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 overridden
+	# 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 overridden by data_alignment and the --dataalignment
+	# This setting is overriden by data_alignment and the --dataalignment
 	# option.
 	data_alignment_detection = 1

@@ -304,7 +221,7 @@ devices {
 	# 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 overridden by the --dataalignment option.
+	# This setting is overriden by the --dataalignment option.
 	data_alignment = 0

 	# Configuration option devices/data_alignment_offset_detection.
@@ -315,7 +232,7 @@ devices {
 	# 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 overridden by the --dataalignmentoffset option.
+	# This setting is overriden by the --dataalignmentoffset option.
 	data_alignment_offset_detection = 1

 	# Configuration option devices/ignore_suspended_devices.
@@ -379,12 +296,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.
@@ -399,7 +310,7 @@ allocation {
 	# defined here, it will check whether any of them are attached to the
 	# PVs concerned and then seek to match those PV tags between existing
 	# extents and new extents.
-	#
+	# 
 	# Example
 	# Use the special tag "@*" as a wildcard to match any PV tag:
 	# cling_tag_list = [ "@*" ]
@@ -407,7 +318,7 @@ allocation {
 	# PVs are tagged with either @site1 or @site2 to indicate where
 	# they are situated:
 	# cling_tag_list = [ "@site1", "@site2" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option allocation/maximise_cling.
@@ -461,30 +372,29 @@ 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.
-	#
+	# 
 	# Accepted values:
 	#   0  Automatically detected best available format
 	#   1  Original format
 	#   2  Improved 2nd. generation format
-	#
+	# 
 	# This configuration option has an automatic default value.
 	# cache_metadata_format = 0

 	# Configuration option allocation/cache_mode.
 	# The default cache mode used for new cache.
-	#
+	# 
 	# Accepted values:
 	#   writethrough
 	#     Data blocks are immediately written from the cache to disk.
 	#   writeback
 	#     Data blocks are written from the cache back to disk after some
 	#     delay to improve performance.
-	#
+	# 
 	# This setting replaces allocation/cache_pool_cachemode.
 	# This configuration option has an automatic default value.
 	# cache_mode = "writethrough"
@@ -521,16 +431,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
-
-	# Configuration option allocation/thin_pool_crop_metadata.
-	# Older version of lvm2 cropped pool's metadata size to 15.81 GiB.
-	# This is slightly less then the actual maximum 15.88 GiB.
-	# For compatibility with older version and use of cropped size set to 1.
-	# This configuration option has an automatic default value.
-	# thin_pool_crop_metadata = 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.
@@ -540,18 +442,18 @@ allocation {

 	# Configuration option allocation/thin_pool_discards.
 	# The discards behaviour of thin pool volumes.
-	#
+	# 
 	# Accepted values:
 	#   ignore
 	#   nopassdown
 	#   passdown
-	#
+	# 
 	# This configuration option has an automatic default value.
 	# thin_pool_discards = "passdown"

 	# Configuration option allocation/thin_pool_chunk_size_policy.
 	# The chunk size calculation policy for thin pool volumes.
-	#
+	# 
 	# Accepted values:
 	#   generic
 	#     If thin_pool_chunk_size is defined, use it. Otherwise, calculate
@@ -563,15 +465,10 @@ allocation {
 	#     the chunk size for performance based on device hints exposed in
 	#     sysfs - the optimal_io_size. The chunk size is always at least
 	#     512KiB.
-	#
+	# 
 	# 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,
@@ -667,7 +564,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
@@ -823,8 +720,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.
@@ -850,20 +746,6 @@ log {
 	# available: memory, devices, io, activation, allocation,
 	# 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" ]
 }

 # Configuration section backup.
@@ -951,6 +833,9 @@ global {
 	# the error messages.
 	activation = 1

+	# 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.
@@ -976,7 +861,8 @@ global {
 	# a volume group's metadata, instead of always granting the read-only
 	# requests immediately, delay them to allow the read-write requests to
 	# be serviced. Without this setting, write access may be stalled by a
-	# high volume of read-only requests. This option only affects file locks.
+	# high volume of read-only requests. This option only affects
+	# locking_type 1 viz. local file-based locking.
 	prioritise_write_locks = 1

 	# Configuration option global/library_dir.
@@ -1000,7 +886,7 @@ global {
 	# Configuration option global/mirror_segtype_default.
 	# The segment type used by the short mirroring option -m.
 	# The --type mirror|raid1 option overrides this setting.
-	#
+	# 
 	# Accepted values:
 	#   mirror
 	#     The original RAID1 implementation from LVM/DM. It is
@@ -1020,19 +906,18 @@ global {
 	#     handling a failure. This mirror implementation is not
 	#     cluster-aware and cannot be used in a shared (active/active)
 	#     fashion in a cluster.
-	#
+	# 
 	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
+	support_mirrored_mirror_log = 0

 	# Configuration option global/raid10_segtype_default.
 	# The segment type used by the -i -m combination.
@@ -1040,7 +925,7 @@ global {
 	# The --stripes/-i and --mirrors/-m options can both be specified
 	# during the creation of a logical volume to use both striping and
 	# mirroring for the LV. There are two different implementations.
-	#
+	# 
 	# Accepted values:
 	#   raid10
 	#     LVM uses MD's RAID10 personality through DM. This is the
@@ -1050,7 +935,7 @@ global {
 	#     is done by creating a mirror LV on top of striped sub-LVs,
 	#     effectively creating a RAID 0+1 array. The layering is suboptimal
 	#     in terms of providing redundancy and performance.
-	#
+	# 
 	raid10_segtype_default = "@DEFAULT_RAID10_SEGTYPE@"

 	# Configuration option global/sparse_segtype_default.
@@ -1058,7 +943,7 @@ global {
 	# The --type snapshot|thin option overrides this setting.
 	# The combination of -V and -L options creates a sparse LV. There are
 	# two different implementations.
-	#
+	# 
 	# Accepted values:
 	#   snapshot
 	#     The original snapshot implementation from LVM/DM. It uses an old
@@ -1070,7 +955,7 @@ global {
 	#     bigger minimal chunk size (64KiB) and uses a separate volume for
 	#     metadata. It has better performance, especially when more data
 	#     is used. It also supports full snapshots.
-	#
+	# 
 	sparse_segtype_default = "@DEFAULT_SPARSE_SEGTYPE@"

 	# Configuration option global/lvdisplay_shows_full_device_path.
@@ -1084,17 +969,13 @@ global {

 	# Configuration option global/event_activation.
 	# Activate LVs based on system-generated device events.
-	# When a PV appears on the system, a system-generated uevent triggers
-	# the lvm2-pvscan service which runs the pvscan --cache -aay command.
-	# If the new PV completes a VG, pvscan autoactivates LVs in the VG.
-	# When event_activation is disabled, the lvm2-activation services are
-	# generated and run at fixed points during system startup.  These
-	# services run vgchange -aay to autoactivate LVs in VGs that happen
-	# to be present at that point in time.
-	# See the --setautoactivation option or the auto_activation_volume_list
-	# setting to configure autoactivation for specific VGs or LVs.
-	# This configuration option has an automatic default value.
-	# event_activation = 1
+	# 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.
+	event_activation = 1

 	# Configuration option global/use_aio.
 	# Use async I/O when reading and writing devices.
@@ -1125,17 +1006,6 @@ global {
 	# This configuration option has an automatic default value.
 	# sanlock_lv_extend = 256

-	# Configuration option global/lvmlockctl_kill_command.
-	# The command that lvmlockctl --kill should use to force LVs offline.
-	# The lvmlockctl --kill command is run when a shared VG has lost
-	# access to locks (e.g. when sanlock has lost access to storage.)
-	# An empty string means that there will be no automatic attempt by
-	# lvmlockctl --kill to forcibly shut down LVs in the VG, and the user
-	# can manually intervene as described in lvmlockd(8).
-	# The VG name will be appended to the command specified here.
-	# This configuration option has an automatic default value.
-	# lvmlockctl_kill_command = ""
-
 	# Configuration option global/thin_check_executable.
 	# The full path to the thin_check command.
 	# LVM uses this command to check that a thin metadata device is in a
@@ -1182,20 +1052,20 @@ global {
 	# causing problems. Features include: block_size, discards,
 	# discards_non_power_2, external_origin, metadata_resize,
 	# external_origin_extend, error_if_no_space.
-	#
+	# 
 	# Example
 	# thin_disabled_features = [ "discards", "block_size" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option global/cache_disabled_features.
 	# Features to not use in the cache driver.
 	# This can be helpful for testing, or to avoid using a feature that is
 	# causing problems. Features include: policy_mq, policy_smq, metadata2.
-	#
+	# 
 	# Example
 	# cache_disabled_features = [ "policy_smq" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option global/cache_check_executable.
@@ -1247,16 +1117,6 @@ global {
 	# This configuration option has an automatic default value.
 	# vdo_format_options = [ "" ]

-	# Configuration option global/vdo_disabled_features.
-	# Features to not use in the vdo driver.
-	# This can be helpful for testing, or to avoid using a feature that is
-	# causing problems. Features include: online_rename
-	#
-	# Example
-	# vdo_disabled_features = [ "online_rename" ]
-	#
-	# This configuration option does not have a default value defined.
-
 	# Configuration option global/fsadm_executable.
 	# The full path to the fsadm command.
 	# LVM uses this command to help with lvresize -r operations.
@@ -1269,7 +1129,7 @@ global {
 	# or vgimport.) A VG on shared storage devices is accessible only to
 	# the host with a matching system ID. See 'man lvmsystemid' for
 	# information on limitations and correct usage.
-	#
+	# 
 	# Accepted values:
 	#   none
 	#     The host has no system ID.
@@ -1286,7 +1146,7 @@ global {
 	#   file
 	#     Use the contents of another file (system_id_file) to set the
 	#     system ID.
-	#
+	# 
 	system_id_source = "none"

 	# Configuration option global/system_id_file.
@@ -1314,16 +1174,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.
@@ -1338,7 +1188,7 @@ activation {

 	# Configuration option activation/udev_sync.
 	# Use udev notifications to synchronize udev and LVM.
-	# The --noudevsync option overrides this setting.
+	# The --nodevsync option overrides this setting.
 	# When disabled, LVM commands will not wait for notifications from
 	# udev, but continue irrespective of any possible udev processing in
 	# the background. Only use this if udev is not running or has rules
@@ -1359,8 +1209,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.
@@ -1385,34 +1234,30 @@ 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.
 	# If this list is defined, an LV is only activated if it matches an
 	# entry in this list. If this list is undefined, it imposes no limits
 	# on LV activation (all are allowed).
-	#
+	# 
 	# Accepted values:
 	#   vgname
 	#     The VG name is matched exactly and selects all LVs in the VG.
@@ -1426,30 +1271,30 @@ activation {
 	#     or VG. See tags/hosttags. If any host tags exist but volume_list
 	#     is not defined, a default single-entry list containing '@*'
 	#     is assumed.
-	#
+	# 
 	# Example
 	# volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option activation/auto_activation_volume_list.
-	# A list of VGs or LVs that should be autoactivated.
-	# Autoactivation is an activation command run with -aay,
-	# i.e. vgchange -aay, lvchange -aay, or pvscan --cache -aay.
-	# When this list is defined, an autoactivation command will only
-	# activate LVs included in the list. If this list is undefined,
-	# it has no effect. If this list is defined but empty, then no
-	# LVs will be autoactivated. LVs can be included in the list by
-	# LV name, VG name (applies to all LVs in the VG), or tag name.
-	# VGs and LVs can also have an autoactivation property set in
-	# metadata, see --setautoactivation. LVs included in this list
-	# will not be autoactivated if the VG or LV autoactivation
-	# property is disabled (see vgs or lvs "-o autoactivation").
-	# The volume_list setting and the "activation skip" property
-	# also apply to autoactivation.
-	# The -aay option is meant to be used by activation commands that
-	# are run automatically by the system, e.g. from systemd services.
-	#
+	# Only LVs selected by this list are auto-activated.
+	# This list works like volume_list, but it is used only by
+	# auto-activation commands. It does not apply to direct activation
+	# commands. If this list is defined, an LV is only auto-activated
+	# if it matches an entry in this list. If this list is undefined, it
+	# imposes no limits on LV auto-activation (all are allowed.) If this
+	# list is defined and empty, i.e. "[]", then no LVs are selected for
+	# auto-activation. An LV that is selected by this list for
+	# auto-activation, must also be selected by volume_list (if defined)
+	# before it is activated. Auto-activation is an activation command that
+	# includes the 'a' argument: --activate ay or -a ay. The 'a' (auto)
+	# argument for auto-activation is meant to be used by activation
+	# commands that are run automatically by the system, as opposed to LVM
+	# commands run directly by a user. A user may also use the 'a' flag
+	# directly to perform auto-activation. Also see pvscan(8) for more
+	# information about auto-activation.
+	# 
 	# Accepted values:
 	#   vgname
 	#     The VG name is matched exactly and selects all LVs in the VG.
@@ -1463,10 +1308,10 @@ activation {
 	#     or VG. See tags/hosttags. If any host tags exist but volume_list
 	#     is not defined, a default single-entry list containing '@*'
 	#     is assumed.
-	#
+	# 
 	# Example
 	# auto_activation_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option activation/read_only_volume_list.
@@ -1475,7 +1320,7 @@ activation {
 	# against this list, and if it matches, it is activated in read-only
 	# mode. This overrides the permission setting stored in the metadata,
 	# e.g. from --permission rw.
-	#
+	# 
 	# Accepted values:
 	#   vgname
 	#     The VG name is matched exactly and selects all LVs in the VG.
@@ -1489,10 +1334,10 @@ activation {
 	#     or VG. See tags/hosttags. If any host tags exist but volume_list
 	#     is not defined, a default single-entry list containing '@*'
 	#     is assumed.
-	#
+	# 
 	# Example
 	# read_only_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
-	#
+	# 
 	# This configuration option does not have a default value defined.

 	# Configuration option activation/raid_region_size.
@@ -1515,15 +1360,14 @@ activation {

 	# Configuration option activation/readahead.
 	# Setting to use when there is no readahead setting in metadata.
-	#
+	# 
 	# Accepted values:
 	#   none
 	#     Disable readahead.
 	#   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.
@@ -1533,7 +1377,7 @@ activation {
 	# performed by dmeventd automatically, and the steps perfomed by the
 	# manual command lvconvert --repair --use-policies.
 	# Automatic handling requires dmeventd to be monitoring the LV.
-	#
+	# 
 	# Accepted values:
 	#   warn
 	#     Use the system log to warn the user that a device in the RAID LV
@@ -1544,7 +1388,7 @@ activation {
 	#   allocate
 	#     Attempt to use any extra physical volumes in the VG as spares and
 	#     replace faulty devices.
-	#
+	# 
 	raid_fault_policy = "warn"

 	# Configuration option activation/mirror_image_fault_policy.
@@ -1556,7 +1400,7 @@ activation {
 	# determines the steps perfomed by dmeventd automatically, and the steps
 	# performed by the manual command lvconvert --repair --use-policies.
 	# Automatic handling requires dmeventd to be monitoring the LV.
-	#
+	# 
 	# Accepted values:
 	#   remove
 	#     Simply remove the faulty device and run without it. If the log
@@ -1581,7 +1425,7 @@ activation {
 	#     the redundant nature of the mirror. This policy acts like
 	#     'remove' if no suitable device and space can be allocated for the
 	#     replacement.
-	#
+	# 
 	mirror_image_fault_policy = "remove"

 	# Configuration option activation/mirror_log_fault_policy.
@@ -1596,26 +1440,26 @@ activation {
 	# The minimum value is 50 (a smaller value is treated as 50.)
 	# Also see snapshot_autoextend_percent.
 	# Automatic extension requires dmeventd to be monitoring the LV.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 1G
 	# snapshot exceeds 700M, it is extended to 1.2G, and when it exceeds
 	# 840M, it is extended to 1.44G:
 	# snapshot_autoextend_threshold = 70
-	#
+	# 
 	snapshot_autoextend_threshold = 100

 	# Configuration option activation/snapshot_autoextend_percent.
 	# Auto-extending a snapshot adds this percent extra space.
 	# The amount of additional space added to a snapshot is this
 	# percent of its current size.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 1G
 	# snapshot exceeds 700M, it is extended to 1.2G, and when it exceeds
 	# 840M, it is extended to 1.44G:
 	# snapshot_autoextend_percent = 20
-	#
+	# 
 	snapshot_autoextend_percent = 20

 	# Configuration option activation/thin_pool_autoextend_threshold.
@@ -1624,26 +1468,26 @@ activation {
 	# The minimum value is 50 (a smaller value is treated as 50.)
 	# Also see thin_pool_autoextend_percent.
 	# Automatic extension requires dmeventd to be monitoring the LV.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 1G
 	# thin pool exceeds 700M, it is extended to 1.2G, and when it exceeds
 	# 840M, it is extended to 1.44G:
 	# thin_pool_autoextend_threshold = 70
-	#
+	# 
 	thin_pool_autoextend_threshold = 100

 	# Configuration option activation/thin_pool_autoextend_percent.
 	# Auto-extending a thin pool adds this percent extra space.
 	# The amount of additional space added to a thin pool is this
 	# percent of its current size.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 1G
 	# thin pool exceeds 700M, it is extended to 1.2G, and when it exceeds
 	# 840M, it is extended to 1.44G:
 	# thin_pool_autoextend_percent = 20
-	#
+	# 
 	thin_pool_autoextend_percent = 20

 	# Configuration option activation/vdo_pool_autoextend_threshold.
@@ -1652,21 +1496,20 @@ activation {
 	# The minimum value is 50 (a smaller value is treated as 50.)
 	# Also see vdo_pool_autoextend_percent.
 	# Automatic extension requires dmeventd to be monitoring the LV.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 10G
 	# VDO pool exceeds 7G, it is extended to 12G, and when it exceeds
 	# 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.
 	# The amount of additional space added to a VDO pool is this
 	# percent of its current size.
-	#
+	# 
 	# Example
 	# Using 70% autoextend threshold and 20% autoextend size, when a 10G
 	# VDO pool exceeds 7G, it is extended to 12G, and when it exceeds
@@ -1685,10 +1528,10 @@ activation {
 	# pages corresponding to lines that match are not pinned. On some
 	# systems, locale-archive was found to make up over 80% of the memory
 	# used by the process.
-	#
+	# 
 	# Example
 	# mlock_filter = [ "locale/locale-archive", "gconv/gconv-modules.cache" ]
-	#
+	# 
 	# This configuration option is advanced.
 	# This configuration option does not have a default value defined.

@@ -1696,8 +1539,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.
@@ -1712,8 +1554,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.
@@ -1729,7 +1570,7 @@ activation {
 	# Configuration option activation/activation_mode.
 	# How LVs with missing devices are activated.
 	# The --activationmode option overrides this setting.
-	#
+	# 
 	# Accepted values:
 	#   complete
 	#     Only allow activation of an LV if all of the Physical Volumes it
@@ -1744,7 +1585,7 @@ activation {
 	#     could cause data loss with a portion of the LV inaccessible.
 	#     This setting should not normally be used, but may sometimes
 	#     assist with data recovery.
-	#
+	# 
 	activation_mode = "degraded"

 	# Configuration option activation/lock_start_list.
@@ -1792,7 +1633,7 @@ activation {
 	# Configuration option metadata/pvmetadatacopies.
 	# Number of copies of metadata to store on each PV.
 	# The --pvmetadatacopies option overrides this setting.
-	#
+	# 
 	# Accepted values:
 	#   2
 	#     Two copies of the VG metadata are stored on the PV, one at the
@@ -1802,7 +1643,7 @@ activation {
 	#   0
 	#     No copies of VG metadata are stored on the PV. This may be
 	#     useful for VGs containing large numbers of PVs.
-	#
+	# 
 	# This configuration option is advanced.
 	# This configuration option has an automatic default value.
 	# pvmetadatacopies = 1
@@ -1834,6 +1675,7 @@ activation {
 	# additional space for VG metadata. The --metadatasize option overrides
 	# this setting.
 	# This configuration option does not have a default value defined.
+	# This configuration option has an automatic default value.

 	# Configuration option metadata/pvmetadataignore.
 	# Ignore metadata areas on a new PV.
@@ -1952,7 +1794,7 @@ activation {
 	# sequences are copied verbatim. Each special character sequence is
 	# introduced by the '%' character and such sequence is then
 	# substituted with a value as described below.
-	#
+	# 
 	# Accepted values:
 	#   %a
 	#     The abbreviated name of the day of the week according to the
@@ -2075,7 +1917,7 @@ activation {
 	#     The timezone name or abbreviation.
 	#   %%
 	#     A literal '%' character.
-	#
+	# 
 	# This configuration option has an automatic default value.
 	# time_format = "%Y-%m-%d %T %z"

@@ -2269,8 +2111,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.
@@ -2281,16 +2122,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
@@ -2344,12 +2183,12 @@ dmeventd {
 	# applied to the local machine as a 'host tag'. If this subsection is
 	# empty (has no host_list), then the subsection name is always applied
 	# as a 'host tag'.
-	#
+	# 
 	# Example
 	# The host tag foo is given to all hosts, and the host tag
 	# bar is given to the hosts named machine1 and machine2.
 	# tags { foo { } bar { host_list = [ "machine1", "machine2" ] } }
-	#
+	# 
 	# This configuration section has variable name.
 	# This configuration section has an automatic default value.
 	# tag {
--- a/conf/lvmlocal.conf.in
+++ b/conf/lvmlocal.conf.in
@@ -28,13 +28,13 @@ local {
 	# main configuration file, e.g. lvm.conf. When used, it must be set to
 	# a unique value among all hosts sharing access to the storage,
 	# e.g. a host name.
-	#
+	# 
 	# Example
 	# Set no system ID:
 	# system_id = ""
 	# Set the system_id to a specific name:
 	# system_id = "host1"
-	#
+	# 
 	# This configuration option has an automatic default value.
 	# system_id = ""

--- a/635
+++ b/635
--- a/configure.ac
+++ b/configure.ac
@@ -30,18 +30,19 @@ AC_CANONICAL_TARGET([])
 AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
 case "$host_os" in
 	linux*)
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
 		# equivalent to -rdynamic
 		ELDFLAGS="-Wl,--export-dynamic"
 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+		LDDEPS="$LDDEPS .export.sym"
 		LIB_SUFFIX=so
 		DEVMAPPER=yes
 		BUILD_LVMPOLLD=no
 		LOCKDSANLOCK=no
 		LOCKDDLM=no
 		LOCKDDLM_CONTROL=no
-		LOCKDIDM=no
 		ODIRECT=yes
 		DM_IOCTLS=yes
 		SELINUX=yes
@@ -50,6 +51,7 @@ case "$host_os" in
 		;;
 	darwin*)
 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
 		ELDFLAGS=
 		CLDWHOLEARCHIVE="-all_load"
 		CLDNOWHOLEARCHIVE=
@@ -62,7 +64,7 @@ case "$host_os" in
 		BLKDEACTIVATE=no
 		;;
 	*)
-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
+		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
 		;;
 esac

@@ -102,14 +104,14 @@ AC_HEADER_SYS_WAIT
 AC_HEADER_TIME

 AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h \
-  getopt.h inttypes.h langinfo.h libgen.h limits.h locale.h paths.h \
+  getopt.h inttypes.h langinfo.h libaio.h libgen.h limits.h locale.h paths.h \
  signal.h stdarg.h stddef.h stdio.h stdlib.h string.h sys/file.h \
  sys/ioctl.h syslog.h sys/mman.h sys/param.h sys/resource.h sys/stat.h \
  sys/time.h sys/types.h sys/utsname.h sys/wait.h time.h \
  unistd.h], , [AC_MSG_ERROR(bailing out)])

 AC_CHECK_HEADERS(termios.h sys/statvfs.h sys/timerfd.h sys/vfs.h linux/magic.h linux/fiemap.h)
-AC_CHECK_HEADERS(libaio.h,LVM_NEEDS_LIBAIO_WARN=,LVM_NEEDS_LIBAIO_WARN=y)
+
 case "$host_os" in
 	linux*)
 		AC_CHECK_HEADERS(asm/byteorder.h linux/fs.h malloc.h,,AC_MSG_ERROR(bailing out)) ;;
@@ -151,10 +153,9 @@ 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
@@ -290,7 +291,7 @@ AC_ARG_WITH(default-name-mangling,
 	    MANGLING=$withval, MANGLING=auto)
 case "$MANGLING" in
 auto) mangling=DM_STRING_MANGLING_AUTO;;
- no|none|disabled) mangling=DM_STRING_MANGLING_NONE;;
+ none|disabled) mangling=DM_STRING_MANGLING_NONE;;
 hex) mangling=DM_STRING_MANGLING_HEX;;
 *) AC_MSG_ERROR([--with-default-name-mangling parameter invalid]);;
 esac
@@ -302,12 +303,12 @@ dnl -- snapshots inclusion type
 AC_MSG_CHECKING(whether to include snapshots)
 AC_ARG_WITH(snapshots,
 	    AC_HELP_STRING([--with-snapshots=TYPE],
-			   [snapshot support: internal/none [internal]]),
+			   [snapshot support: internal/shared/none [internal]]),
 	    SNAPSHOTS=$withval, SNAPSHOTS=internal)
 AC_MSG_RESULT($SNAPSHOTS)

 case "$SNAPSHOTS" in
-  no|none|shared) ;;
+  none|shared) ;;
  internal) AC_DEFINE([SNAPSHOT_INTERNAL], 1,
 		      [Define to 1 to include built-in support for snapshots.]) ;;
  *) AC_MSG_ERROR([--with-snapshots parameter invalid]) ;;
@@ -318,12 +319,12 @@ dnl -- mirrors inclusion type
 AC_MSG_CHECKING(whether to include mirrors)
 AC_ARG_WITH(mirrors,
 	    AC_HELP_STRING([--with-mirrors=TYPE],
-			   [mirror support: internal/none [internal]]),
+			   [mirror support: internal/shared/none [internal]]),
 	    MIRRORS=$withval, MIRRORS=internal)
 AC_MSG_RESULT($MIRRORS)

 case "$MIRRORS" in
-  no|none|shared) ;;
+  none|shared) ;;
  internal) AC_DEFINE([MIRRORED_INTERNAL], 1,
 		      [Define to 1 to include built-in support for mirrors.]) ;;
  *) AC_MSG_ERROR([--with-mirrors parameter invalid]) ;;
@@ -353,17 +354,14 @@ AC_DEFINE_UNQUOTED([DEFAULT_RAID10_SEGTYPE], ["$DEFAULT_RAID10_SEGTYPE"],
 AC_ARG_WITH(default-sparse-segtype,
 	    AC_HELP_STRING([--with-default-sparse-segtype=TYPE],
 			   [default sparse segtype: thin/snapshot [thin]]),
-			   [ case "$withval" in
-				thin|snapshot) DEFAULT_SPARSE_SEGTYPE=$withval ;;
-				*) AC_MSG_ERROR(--with-default-sparse-segtype parameter invalid) ;;
-			     esac], DEFAULT_SPARSE_SEGTYPE="thin")
+			   DEFAULT_SPARSE_SEGTYPE=$withval, DEFAULT_SPARSE_SEGTYPE="thin")

 ################################################################################
 dnl -- thin provisioning
 AC_MSG_CHECKING(whether to include thin provisioning)
 AC_ARG_WITH(thin,
 	    AC_HELP_STRING([--with-thin=TYPE],
-			   [thin provisioning support: internal/none [internal]]),
+			   [thin provisioning support: internal/shared/none [internal]]),
 	    THIN=$withval, THIN=internal)
 AC_ARG_WITH(thin-check,
 	    AC_HELP_STRING([--with-thin-check=PATH],
@@ -385,7 +383,7 @@ AC_ARG_WITH(thin-restore,
 AC_MSG_RESULT($THIN)

 case "$THIN" in
-  no|none)  test "$DEFAULT_SPARSE_SEGTYPE" = "thin" && DEFAULT_SPARSE_SEGTYPE="snapshot" ;;
+  none)  test "$DEFAULT_SPARSE_SEGTYPE" = "thin" && DEFAULT_SPARSE_SEGTYPE="snapshot" ;;
  shared) ;;
  internal) AC_DEFINE([THIN_INTERNAL], 1,
 		      [Define to 1 to include built-in support for thin provisioning.]) ;;
@@ -462,6 +460,7 @@ case "$THIN" in
 	if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
 		AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option])
 	fi
+
 	;;
 esac

@@ -482,7 +481,7 @@ dnl -- cache inclusion type
 AC_MSG_CHECKING(whether to include cache)
 AC_ARG_WITH(cache,
 	    AC_HELP_STRING([--with-cache=TYPE],
-			   [cache support: internal/none [internal]]),
+			   [cache support: internal/shared/none [internal]]),
 			   CACHE=$withval, CACHE="internal")
 AC_ARG_WITH(cache-check,
 	    AC_HELP_STRING([--with-cache-check=PATH],
@@ -503,7 +502,7 @@ AC_ARG_WITH(cache-restore,
 AC_MSG_RESULT($CACHE)

 case "$CACHE" in
- no|none|shared) ;;
+ none|shared) ;;
 internal) AC_DEFINE([CACHE_INTERNAL], 1, [Define to 1 to include built-in support for cache.]) ;;
 *) AC_MSG_ERROR([--with-cache parameter invalid]) ;;
 esac
@@ -607,7 +606,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)

@@ -616,8 +615,8 @@ AC_ARG_WITH(vdo-format,
 			   [vdoformat tool: [autodetect]]),
 			   VDO_FORMAT_CMD=$withval, VDO_FORMAT_CMD="autodetect")
 case "$VDO" in
- no|none) ;;
- internal)
+ none) ;;
+ internal) 
 	AC_DEFINE([VDO_INTERNAL], 1, [Define to 1 to include built-in support for vdo.])
 	if test "$VDO_FORMAT_CMD" = "autodetect"; then
 		AC_PATH_TOOL(VDO_FORMAT_CMD, vdoformat, [], [$PATH])
@@ -646,7 +645,7 @@ AC_DEFINE_UNQUOTED([VDO_FORMAT_CMD], ["$VDO_FORMAT_CMD"],
 #AC_ARG_WITH(vdo-lib,
 #            AC_HELP_STRING([--with-vdo-lib=PATH],
 #                           [vdo support: Path to utils lib: [/usr/lib]]),
-#                           VDO_LIB=$withval, VDO_LIB="/usr/lib")
+#                           VDO_LIB=$withval, VDO_LIB="/usr/lib") 
 #AC_MSG_RESULT($VDO_LIB)

 ################################################################################
@@ -655,56 +654,24 @@ 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")
+			   WRITECACHE=$withval, WRITECACHE="none")

 AC_MSG_RESULT($WRITECACHE)

 case "$WRITECACHE" in
- no|none) ;;
- internal)
+ 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
- no|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
-
-################################################################################
-# Allow users to override default location for libaio
-# there seems to be no pkg-config support available
-AIO_CFLAGS=
-AIO_LIBS=${AIO_LIBS:--laio}
-AC_ARG_VAR([AIO_CFLAGS], [C compiler flags for AIO])
-AC_ARG_VAR([AIO_LIBS], [linker flags for AIO])
-
 ################################################################################
 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)
@@ -748,7 +715,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.])
@@ -756,7 +723,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.])
@@ -764,7 +731,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.])
@@ -833,29 +800,6 @@ AC_ARG_WITH(optimisation,
 	    COPTIMISE_FLAG=$withval)
 AC_MSG_RESULT($COPTIMISE_FLAG)

-################################################################################
-dnl -- Symbol versioning
-AC_MSG_CHECKING(whether to use symbol versioning)
-AC_ARG_WITH(symvers,
-	    AC_HELP_STRING([--with-symvers=STYLE],
-			   [use symbol versioning of the shared library [default=gnu]]),
-			   [ case "$withval" in
-				gnu|no) symvers=$withval ;;
-				*) AC_MSG_ERROR(--with-symvers parameter invalid) ;;
-			     esac], symvers=gnu)
-AC_MSG_RESULT($symvers)
-
-if test "$GCC" = "yes" && test "$symvers" = "gnu" ; then
-	AC_DEFINE(GNU_SYMVER, 1,
-		  [Define to use GNU versioning in the shared library.])
-		   case "$host_os" in
-			linux*)
-			CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
-			LDDEPS="$LDDEPS .export.sym"
-			;;
-		   esac
-fi
-
 ################################################################################
 dnl -- Enable profiling
 AC_MSG_CHECKING(whether to gather gcov profiling data)
@@ -890,6 +834,7 @@ TESTSUITE_DATA='${datarootdir}/lvm2-testsuite'
 # double eval needed ${datarootdir} -> ${prefix}/share -> real path
 AC_DEFINE_UNQUOTED(TESTSUITE_DATA, ["$(eval echo $(eval echo $TESTSUITE_DATA))"], [Path to testsuite data])

+
 ################################################################################
 dnl -- Enable valgrind awareness of memory pools
 AC_MSG_CHECKING(whether to enable valgrind awareness of pools)
@@ -990,25 +935,6 @@ if test "$BUILD_LOCKDDLM_CONTROL" = yes; then
 	BUILD_LVMLOCKD=yes
 fi

-################################################################################
-dnl -- Build lvmlockdidm
-AC_MSG_CHECKING(whether to build lvmlockdidm)
-AC_ARG_ENABLE(lvmlockd-idm,
-	      AC_HELP_STRING([--enable-lvmlockd-idm],
-			     [enable the LVM lock daemon using idm]),
-	      LOCKDIDM=$enableval)
-AC_MSG_RESULT($LOCKDIDM)
-
-BUILD_LOCKDIDM=$LOCKDIDM
-
-dnl -- Look for Seagate IDM libraries
-if test "$BUILD_LOCKDIDM" = yes; then
-	PKG_CHECK_MODULES(LOCKD_IDM, libseagate_ilm >= 0.1.0, [HAVE_LOCKD_IDM=yes], $bailout)
-	PKG_CHECK_MODULES(BLKID, blkid >= 2.24, [HAVE_LOCKD_IDM=yes], $bailout)
-	AC_DEFINE([LOCKDIDM_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd IDM option.])
-	BUILD_LVMLOCKD=yes
-fi
-
 ################################################################################
 dnl -- Build lvmlockd
 AC_MSG_CHECKING(whether to build lvmlockd)
@@ -1273,9 +1199,6 @@ if test "$BUILD_LVMDBUSD" = yes; then
 	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])
@@ -1403,33 +1326,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=
@@ -1463,16 +1359,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-editline option.])
-	)
-fi
-
 ################################################################################
 dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
 if test "$READLINE" != no; then
@@ -1605,12 +1491,6 @@ fi
 AC_MSG_CHECKING(whether to enable readline)
 AC_MSG_RESULT($READLINE)

-if test "$EDITLINE" = yes; then
-	AC_CHECK_HEADERS(editline/readline.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
@@ -1828,7 +1708,6 @@ AC_SUBST(BLKDEACTIVATE)
 AC_SUBST(HAVE_LIBDL)
 AC_SUBST(HAVE_REALTIME)
 AC_SUBST(HAVE_VALGRIND)
-AC_SUBST(INTEGRITY)
 AC_SUBST(INTL)
 AC_SUBST(JOBS)
 AC_SUBST(LDDEPS)
@@ -1867,7 +1746,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)
@@ -1905,7 +1783,6 @@ AC_SUBST(VDO)
 AC_SUBST(VDO_FORMAT_CMD)
 AC_SUBST(VDO_INCLUDE)
 AC_SUBST(VDO_LIB)
-AC_SUBST(WRITECACHE)
 AC_SUBST(WRITE_INSTALL)
 AC_SUBST(DMEVENTD_PIDFILE)
 AC_SUBST(LVMPOLLD_PIDFILE)
@@ -2004,10 +1881,8 @@ 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 -n "$LVM_NEEDS_LIBAIO_WARN"],
-      [AC_MSG_WARN([Only libdm part can be build without libaio:  make [[install_]]device-mapper])])

 AS_IF([test "$ODIRECT" != yes],
      [AC_MSG_WARN([O_DIRECT disabled: low-memory pvmove may lock up])])
--- 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
@@ -22,9 +22,6 @@ SOURCES = clogd.c cluster.c compat.c functions.c link_mon.c local.c logging.c

 TARGETS = cmirrord

-CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-CFLOW_TARGET := $(TARGETS)
-
 include $(top_builddir)/make.tmpl

 LMLIBS += $(CPG_LIBS)
@@ -36,8 +33,6 @@ cmirrord: $(OBJECTS)
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
 		$(LMLIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS)

-install_cluster: $(TARGETS)
+install: $(TARGETS)
 	@echo "    [INSTALL] $<"
-	$(Q) $(INSTALL_PROGRAM) -D $< $(usrsbindir)/$(<F)
-
-install: install_cluster
+	$(Q) $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord
--- a/daemons/cmirrord/cluster.c
+++ b/daemons/cmirrord/cluster.c
@@ -1548,7 +1548,7 @@ static void cpg_config_callback(cpg_handle_t handle, const struct cpg_name *gnam
 				   member_list, member_list_entries);
 }

-static cpg_callbacks_t cpg_callbacks = {
+cpg_callbacks_t cpg_callbacks = {
 	.cpg_deliver_fn = cpg_message_callback,
 	.cpg_confchg_fn = cpg_config_callback,
 };
--- 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 "libdm/libdevmapper.h"

 #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */
 #define DM_ULOG_CHECKPOINT_READY 21
@@ -39,7 +39,7 @@ struct clog_request {
 	 * machine.  If the two are equal, there is no need
 	 * to do endian conversions.
 	 */
-	union version_u {
+	union {
 		uint64_t version[2]; /* LE version and native version */
 		struct dm_list list;
 	} u;
--- a/daemons/cmirrord/functions.c
+++ b/daemons/cmirrord/functions.c
@@ -658,7 +658,8 @@ static int clog_dtr(struct dm_ulog_request *rq)
 	if (lc->disk_fd != -1 && close(lc->disk_fd))
 		LOG_ERROR("Failed to close disk log: %s",
 			  strerror(errno));
-	free(lc->disk_buffer);
+	if (lc->disk_buffer)
+		free(lc->disk_buffer);
 	free(lc->clean_bits);
 	free(lc->sync_bits);
 	free(lc);
--- 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/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -14,21 +14,11 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-abs_srcdir = @abs_srcdir@

 SOURCES = libdevmapper-event.c
 SOURCES2 = dmeventd.c

 TARGETS = dmeventd
-CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES) $(SOURCES2) \
-	plugins/lvm2/dmeventd_lvm.c \
-	plugins/mirror/dmeventd_mirror.c \
-	plugins/raid/dmeventd_raid.c \
-	plugins/snapshot/dmeventd_snapshot.c \
-	plugins/thin/dmeventd_thin.c \
-	plugins/vdo/dmeventd_vdo.c \
-	)
-CFLOW_TARGET := $(TARGETS)

 .PHONY: install_lib_dynamic install_lib_static install_include \
 	install_pkgconfig install_dmeventd_dynamic install_dmeventd_static \
@@ -47,7 +37,6 @@ endif

 LIB_VERSION = $(LIB_VERSION_DM)
 LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
-LIBS = $(PTHREAD_LIBS) -L$(interfacebuilddir) -ldevmapper

 CLEAN_TARGETS = dmeventd.static $(LIB_NAME).a

@@ -57,6 +46,7 @@ endif

 CFLOW_LIST = $(SOURCES)
 CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+CFLOW_TARGET = dmeventd

 EXPORTED_HEADER = $(srcdir)/libdevmapper-event.h
 EXPORTED_FN_PREFIX = dm_event
@@ -65,26 +55,34 @@ include $(top_builddir)/make.tmpl

 all: device-mapper
 device-mapper: $(TARGETS)
-plugins.device-mapper: $(LIB_SHARED)

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

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

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

 ifeq ("@PKGCONFIG@", "yes")
  INSTALL_LIB_TARGETS += install_pkgconfig
 endif

+ifneq ("$(CFLOW_CMD)", "")
+CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
+-include $(top_builddir)/lib/liblvm-internal.cflow
+-include $(top_builddir)/lib/liblvm2cmd.cflow
+-include $(top_builddir)/daemons/dmeventd/$(LIB_NAME).cflow
+-include $(top_builddir)/daemons/dmeventd/plugins/mirror/$(LIB_NAME)-lvm2mirror.cflow
+endif
+
 install_include: $(srcdir)/libdevmapper-event.h
-	@echo "    [INSTALL] $(<F)"
+	@echo "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)

 install_pkgconfig: libdevmapper-event.pc
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -752,7 +752,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 +763,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 +1485,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;
 }

 /*
@@ -1742,8 +1736,7 @@ static void _init_thread_signals(void)
 	sigset_t my_sigset;
 	struct sigaction act = { .sa_handler = _sig_alarm };

-	if (sigaction(SIGALRM, &act, NULL))
-		log_sys_debug("sigaction", "SIGLARM");
+	sigaction(SIGALRM, &act, NULL);
 	sigfillset(&my_sigset);

 	/* These are used for exiting */
@@ -1752,8 +1745,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);
 }

 /*
@@ -2029,8 +2021,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
@@ -2244,8 +2236,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
@@ -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/plugins/lvm2/dmeventd_lvm.c
+++ b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c
@@ -71,7 +71,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;

 		/*
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -25,6 +25,9 @@ LIB_NAME = libdevmapper-event-lvm2mirror
 LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)

+CFLOW_LIST = $(SOURCES)
+CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+
 include $(top_builddir)/make.tmpl

 install_lvm2: install_dm_plugin
--- a/daemons/dmeventd/plugins/raid/Makefile.in
+++ b/daemons/dmeventd/plugins/raid/Makefile.in
@@ -24,6 +24,9 @@ LIB_NAME = libdevmapper-event-lvm2raid
 LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)

+CFLOW_LIST = $(SOURCES)
+CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+
 include $(top_builddir)/make.tmpl

 install_lvm2: install_dm_plugin
--- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c
+++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
@@ -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 additional 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/thin/Makefile.in
+++ b/daemons/dmeventd/plugins/thin/Makefile.in
@@ -24,6 +24,9 @@ LIB_NAME = libdevmapper-event-lvm2thin
 LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)

+CFLOW_LIST = $(SOURCES)
+CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+
 include $(top_builddir)/make.tmpl

 install_lvm2: install_dm_plugin
--- a/daemons/dmeventd/plugins/vdo/Makefile.in
+++ b/daemons/dmeventd/plugins/vdo/Makefile.in
@@ -24,6 +24,9 @@ LIB_NAME = libdevmapper-event-lvm2vdo
 LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
 LIB_VERSION = $(LIB_VERSION_LVM)

+CFLOW_LIST = $(SOURCES)
+CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+
 include $(top_builddir)/make.tmpl

 install_lvm2: install_dm_plugin
--- a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
+++ b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
@@ -16,12 +16,7 @@
 #include "daemons/dmeventd/plugins/lvm2/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
- */
+/* Use parser from new device_mapper library */
 #include "device_mapper/vdo/status.c"

 #include <sys/wait.h>
--- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in
@@ -15,8 +15,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

-lvmdbuspydir = $(python3dir)/lvmdbusd
-lvmdbusdir = $(DESTDIR)$(lvmdbuspydir)
+lvmdbusdir = $(python3dir)/lvmdbusd

 LVMDBUS_SRCDIR_FILES = \
 	automatedproperties.py \
@@ -54,16 +53,16 @@ include $(top_builddir)/make.tmpl
 all:
 	$(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)

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

--- 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

--- a/daemons/lvmdbusd/cmdhandler.py
+++ b/daemons/lvmdbusd/cmdhandler.py
@@ -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


@@ -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),
@@ -634,7 +556,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 +652,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 +699,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
@@ -29,26 +29,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


--- a/daemons/lvmdbusd/lv.py
+++ b/daemons/lvmdbusd/lv.py
@@ -10,14 +10,14 @@
 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, log_error
 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
@@ -74,66 +74,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 +194,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 +220,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 +275,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):
@@ -388,7 +321,6 @@ 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)

@@ -524,7 +456,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 +477,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 +528,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 +570,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 +607,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 +643,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 +682,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 +705,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/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:
@@ -243,7 +241,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 +262,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)

--- 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(
--- 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,7 +46,7 @@ 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)


@@ -99,11 +98,7 @@ class VgState(State):
 		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)
+		return Vg(path, self)

 	# noinspection PyMethodMayBeStatic
 	def creation_signature(self):
@@ -159,7 +154,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 +176,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(
+			uuid, new_name, rename_options)
+		Vg.handle_execute(rc, out, err)
 		return '/'

 	@dbus.service.method(
@@ -195,7 +197,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,7 +214,8 @@ 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
@@ -247,8 +251,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 +283,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 +339,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 +380,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 +406,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 +434,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 +459,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 +560,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 +603,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 +644,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 +705,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(
@@ -777,71 +795,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
@@ -30,31 +30,18 @@ ifeq ("@BUILD_LOCKDDLM@", "yes")
  LOCK_LIBS += -ldlmcontrol
 endif

-ifeq ("@BUILD_LOCKDIDM@", "yes")
-  SOURCES += lvmlockd-idm.c
-  LOCK_LIBS += -lseagate_ilm -lblkid
-endif
-
 SOURCES2 = lvmlockctl.c

 TARGETS = lvmlockd lvmlockctl

-CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-CFLOW_TARGET = lvmlockd
-
-.PHONY: install_lvmlockd install_lvmlockctl
+.PHONY: install_lvmlockd

 include $(top_builddir)/make.tmpl

-CFLAGS += $(EXTRA_EXEC_CFLAGS)
+CFLAGS += $(EXTRA_EXEC_CFLAGS) $(SYSTEMD_CFLAGS)
 INCLUDES += -I$(top_srcdir)/libdaemon/server
-LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
-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
+LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
+LIBS += $(PTHREAD_LIBS) $(SYSTEMD_LIBS)

 lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
 	@echo "    [CC] $@"
--- a/daemons/lvmlockd/lvmlockctl.c
+++ b/daemons/lvmlockd/lvmlockctl.c
@@ -18,11 +18,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <syslog.h>
-#include <ctype.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
-#include <sys/wait.h>

 static int quit = 0;
 static int info = 0;
@@ -33,7 +30,6 @@ static int kill_vg = 0;
 static int drop_vg = 0;
 static int gl_enable = 0;
 static int gl_disable = 0;
-static int use_stderr = 0;
 static int stop_lockspaces = 0;
 static char *arg_vg_name = NULL;

@@ -51,22 +47,6 @@ do { \
 	printf(fmt "\n", ##args); \
 } while (0)

-#define log_sys_emerg(fmt, args...) \
-do { \
-	if (use_stderr) \
-		fprintf(stderr, fmt "\n", ##args); \
-	else \
-		syslog(LOG_EMERG, fmt, ##args); \
-} while (0)
-
-#define log_sys_warn(fmt, args...) \
-do { \
-	if (use_stderr) \
-		fprintf(stderr, fmt "\n", ##args); \
-	else \
-		syslog(LOG_WARNING, fmt, ##args); \
-} while (0)
-
 #define MAX_LINE 512

 /* copied from lvmlockd-internal.h */
@@ -300,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];
@@ -345,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;
@@ -358,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;
 	}
@@ -522,274 +501,51 @@ static int do_stop_lockspaces(void)
 	return rv;
 }

-static int _reopen_fd_to_null(int fd)
+static int do_kill(void)
 {
-	int null_fd;
-	int r = 0;
-
-	if ((null_fd = open("/dev/null", O_RDWR)) == -1) {
-		log_error("open error /dev/null %d", errno);
-		return 0;
-	}
-
-	if (close(fd)) {
-		log_error("close error fd %d %d", fd, errno);
-		goto out;
-	}
-
-	if (dup2(null_fd, fd) == -1) {
-		log_error("dup2 error %d", errno);
-		goto out;
-	}
-
-	r = 1;
-out:
-	if (close(null_fd)) {
-		log_error("close error fd %d %d", null_fd, errno);
-		return 0;
-	}
-
-	return r;
-}
-
-#define MAX_AV_COUNT 32
-#define ONE_ARG_LEN 1024
-
-static void _run_command_pipe(const char *cmd_str, pid_t *pid_out, FILE **fp_out)
-{
-	char arg[ONE_ARG_LEN];
-	char *av[MAX_AV_COUNT + 1]; /* +1 for NULL */
-	char *arg_dup;
-	int av_count = 0;
-	int cmd_len;
-	int arg_len;
-	pid_t pid = 0;
-	FILE *fp = NULL;
-	int pipefd[2];
-	int i;
-
-	for (i = 0; i < MAX_AV_COUNT + 1; i++)
-		av[i] = NULL;
-
-	cmd_len = strlen(cmd_str);
-
-	memset(&arg, 0, sizeof(arg));
-	arg_len = 0;
-
-	for (i = 0; i < cmd_len; i++) {
-		if (!cmd_str[i])
-			break;
-
-		if (av_count == MAX_AV_COUNT)
-			goto out;
-
-		if (cmd_str[i] == '\\') {
-			if (i == (cmd_len - 1))
-				break;
-			i++;
-
-			if (cmd_str[i] == '\\') {
-				arg[arg_len++] = cmd_str[i];
-				continue;
-			}
-			if (isspace(cmd_str[i])) {
-				arg[arg_len++] = cmd_str[i];
-				continue;
-			} else {
-				break;
-			}
-		}
-
-		if (isalnum(cmd_str[i]) || ispunct(cmd_str[i])) {
-			arg[arg_len++] = cmd_str[i];
-		} else if (isspace(cmd_str[i])) {
-			if (arg_len) {
-				if (!(arg_dup = strdup(arg)))
-					goto out;
-				av[av_count++] = arg_dup;
-			}
-
-			memset(arg, 0, sizeof(arg));
-			arg_len = 0;
-		} else {
-			break;
-		}
-	}
-
-	if (arg_len) {
-		if (av_count >= MAX_AV_COUNT)
-			goto out;
-		if (!(arg_dup = strdup(arg)))
-			goto out;
-		av[av_count++] = arg_dup;
-	}
-
-	if (pipe(pipefd)) {
-		log_error("pipe error %d", errno);
-		goto out;
-	}
-
-	pid = fork();
-
-	if (pid < 0) {
-		log_error("fork error %d", errno);
-		pid = 0;
-		goto out;
-	}
-
-	if (pid == 0) {
-		/* Child -> writer, convert pipe[0] to STDOUT */
-		if (!_reopen_fd_to_null(STDIN_FILENO))
-			log_error("reopen STDIN error");
-		else if (close(pipefd[0 /*read*/]))
-			log_error("close error pipe[0] %d", errno);
-		else if (close(STDOUT_FILENO))
-			log_error("close error STDOUT %d", errno);
-		else if (dup2(pipefd[1 /*write*/], STDOUT_FILENO) == -1)
-			log_error("dup2 error STDOUT %d", errno);
-		else if (close(pipefd[1]))
-			log_error("close error pipe[1] %d", errno);
-		else {
-			execvp(av[0], av);
-			log_error("execvp error %d", errno);
-		}
-		_exit(errno);
-	}
-
-	/* Parent -> reader */
-	if (close(pipefd[1 /*write*/]))
-		log_error("close error STDOUT %d", errno);
-
-	if (!(fp = fdopen(pipefd[0 /*read*/],  "r"))) {
-		log_error("fdopen STDIN error %d", errno);
-		if (close(pipefd[0]))
-			log_error("close error STDIN %d", errno);
-	}
-
- out:
-	for (i = 0; i < MAX_AV_COUNT + 1; i++)
-		free(av[i]);
-
-	*pid_out = pid;
-	*fp_out = fp;
-}
-
-/* Returns -1 on error, 0 on success. */
-
-static int _close_command_pipe(pid_t pid, FILE *fp)
-{
-	int status, estatus;
-	int ret = -1;
-
-	if (waitpid(pid, &status, 0) != pid) {
-		log_error("waitpid error pid %d %d", pid, errno);
-		goto out;
-	}
-
-	if (WIFEXITED(status)) {
-		/* pid exited with an exit code */
-		estatus = WEXITSTATUS(status);
-
-		/* exit status 0: child success */
-		if (!estatus) {
-			ret = 0;
-			goto out;
-		}
-
-		/* exit status not zero: child error */
-		log_error("child exit error %d", estatus);
-		goto out;
-	}
-
-	if (WIFSIGNALED(status)) {
-		/* pid terminated due to a signal */
-		log_error("child exit from signal");
-		goto out;
-	}
-
-	log_error("child exit problem");
-
-out:
-	if (fp && fclose(fp))
-		log_error("fclose error STDIN %d", errno);
-	return ret;
-}
-
-/* Returns -1 on error, 0 on success. */
-
-static int _get_kill_command(char *kill_cmd)
-{
-	char config_cmd[PATH_MAX + 128] = { 0 };
-	char config_val[1024] = { 0 };
-	char line[PATH_MAX] = { 0 };
-	pid_t pid = 0;
-	FILE *fp = NULL;
-
-	snprintf(config_cmd, PATH_MAX, "%s config --typeconfig full global/lvmlockctl_kill_command", LVM_PATH);
-
-	_run_command_pipe(config_cmd, &pid, &fp);
-
-	if (!pid) {
-		log_error("failed to run %s", config_cmd);
-		return -1;
-	}
-
-	if (!fp) {
-		log_error("failed to get output %s", config_cmd);
-		_close_command_pipe(pid, fp);
-		return -1;
-	}
-
-	if (!fgets(line, sizeof(line), fp)) {
-		log_error("no output from %s", config_cmd);
-		goto bad;
-	}
-
-	if (sscanf(line, "lvmlockctl_kill_command=\"%256[^\n\"]\"", config_val) != 1) {
-		log_error("unrecognized config value from %s", config_cmd);
-		goto bad;
-	}
-
-	if (!config_val[0] || (config_val[0] == ' ')) {
-		log_error("invalid config value from %s", config_cmd);
-		goto bad;
-	}
-
-	if (config_val[0] != '/') {
-		log_error("lvmlockctl_kill_command must be full path");
-		goto bad;
-	}
-
-	printf("Found lvmlockctl_kill_command: %s\n", config_val);
-
-	snprintf(kill_cmd, PATH_MAX, "%s %s", config_val, arg_vg_name);
-	kill_cmd[PATH_MAX-1] = '\0';
-
-	_close_command_pipe(pid, fp);
-	return 0;
-bad:
-	_close_command_pipe(pid, fp);
-	return -1;
-}
-
-/* Returns -1 on error, 0 on success. */
-
-static int _run_kill_command(char *kill_cmd)
-{
-	pid_t pid = 0;
-	FILE *fp = NULL;
+	daemon_reply reply;
+	int result;
 	int rv;

-	_run_command_pipe(kill_cmd, &pid, &fp);
-	rv = _close_command_pipe(pid, fp);
+	syslog(LOG_EMERG, "Lost access to sanlock lease storage in VG %s.", arg_vg_name);
+	/* These two lines explain the manual alternative to the FIXME below. */
+	syslog(LOG_EMERG, "Immediately deactivate LVs in VG %s.", arg_vg_name);
+	syslog(LOG_EMERG, "Once VG is unused, run lvmlockctl --drop %s.", arg_vg_name);

-	if (!pid)
-		return -1;
+	/*
+	 * It may not be strictly necessary to notify lvmlockd of the kill, but
+	 * lvmlockd can use this information to avoid attempting any new lock
+	 * requests in the VG (which would fail anyway), and can return an
+	 * error indicating that the VG has been killed.
+	 */

-	if (rv < 0)
-		return -1;
+	reply = _lvmlockd_send("kill_vg",
+				"cmd = %s", "lvmlockctl",
+				"pid = " FMTd64, (int64_t) getpid(),
+				"vg_name = %s", arg_vg_name,
+				NULL);

-	return 0;
+	if (!_lvmlockd_result(reply, &result)) {
+		log_error("lvmlockd result %d", result);
+		rv = result;
+	} else {
+		rv = 0;
+	}
+
+	daemon_reply_destroy(reply);
+
+	/*
+	 * FIXME: here is where we should implement a strong form of
+	 * blkdeactivate, and if it completes successfully, automatically call
+	 * do_drop() afterward.  (The drop step may not always be necessary
+	 * if the lvm commands run while shutting things down release all the
+	 * leases.)
+	 *
+	 * run_strong_blkdeactivate();
+	 * do_drop();
+	 */
+
+	return rv;
 }

 static int do_drop(void)
@@ -798,7 +554,7 @@ static int do_drop(void)
 	int result;
 	int rv;

-	log_sys_warn("Dropping locks for VG %s.", arg_vg_name);
+	syslog(LOG_WARNING, "Dropping locks for VG %s.", arg_vg_name);

 	/*
 	 * Check for misuse by looking for any active LVs in the VG
@@ -826,84 +582,6 @@ static int do_drop(void)
 	return rv;
 }

-static int do_kill(void)
-{
-	char kill_cmd[PATH_MAX] = { 0 };
-	daemon_reply reply;
-	int no_kill_command = 0;
-	int result;
-	int rv;
-
-	log_sys_emerg("lvmlockd lost access to locks in VG %s.", arg_vg_name);
-
-	rv = _get_kill_command(kill_cmd);
-	if (rv < 0) {
-		log_sys_emerg("Immediately deactivate LVs in VG %s.", arg_vg_name);
-		log_sys_emerg("Once VG is unused, run lvmlockctl --drop %s.", arg_vg_name);
-		no_kill_command = 1;
-	}
-
-	/*
-	 * It may not be strictly necessary to notify lvmlockd of the kill, but
-	 * lvmlockd can use this information to avoid attempting any new lock
-	 * requests in the VG (which would fail anyway), and can return an
-	 * error indicating that the VG has been killed.
-	 */
-	_lvmlockd = lvmlockd_open(NULL);
-	if (_lvmlockd.socket_fd < 0 || _lvmlockd.error) {
-		log_error("Cannot connect to lvmlockd for kill_vg.");
-		goto run;
-	}
-	reply = _lvmlockd_send("kill_vg",
-				"cmd = %s", "lvmlockctl",
-				"pid = " FMTd64, (int64_t) getpid(),
-				"vg_name = %s", arg_vg_name,
-				NULL);
-	if (!_lvmlockd_result(reply, &result))
-		log_error("lvmlockd result %d kill_vg", result);
-	daemon_reply_destroy(reply);
-	lvmlockd_close(_lvmlockd);
-
- run:
-	if (no_kill_command)
-		return 0;
-
-	rv = _run_kill_command(kill_cmd);
-	if (rv < 0) {
-		log_sys_emerg("Failed to run VG %s kill command %s", arg_vg_name, kill_cmd);
-		log_sys_emerg("Immediately deactivate LVs in VG %s.", arg_vg_name);
-		log_sys_emerg("Once VG is unused, run lvmlockctl --drop %s.", arg_vg_name);
-		return -1;
-	}
-
-	log_sys_warn("Successful VG %s kill command %s", arg_vg_name, kill_cmd);
-
-	/*
-	 * If kill command was successfully, call do_drop().  (The drop step
-	 * may not always be necessary if the lvm commands run while shutting
-	 * things down release all the leases.)
-	 */
-	rv = 0;
-	_lvmlockd = lvmlockd_open(NULL);
-	if (_lvmlockd.socket_fd < 0 || _lvmlockd.error) {
-		log_sys_emerg("Failed to connect to lvmlockd to drop locks in VG %s.", arg_vg_name);
-		return -1;
-	}
-	reply = _lvmlockd_send("drop_vg",
-				"cmd = %s", "lvmlockctl",
-				"pid = " FMTd64, (int64_t) getpid(),
-				"vg_name = %s", arg_vg_name,
-				NULL);
-	if (!_lvmlockd_result(reply, &result)) {
-		log_sys_emerg("Failed to drop locks in VG %s", arg_vg_name);
-		rv = result;
-	}
-	daemon_reply_destroy(reply);
-	lvmlockd_close(_lvmlockd);
-
-	return rv;
-}
-
 static void print_usage(void)
 {
 	printf("lvmlockctl options\n");
@@ -921,7 +599,7 @@ static void print_usage(void)
 	printf("--force | -f 0|1>\n");
 	printf("      Force option for other commands.\n");
 	printf("--kill | -k <vgname>\n");
-	printf("      Kill access to the VG locks are lost (see lvmlockctl_kill_command).\n");
+	printf("      Kill access to the VG when sanlock cannot renew lease.\n");
 	printf("--drop | -r <vgname>\n");
 	printf("      Clear locks for the VG when it is unused after kill (-k).\n");
 	printf("--gl-enable | -E <vgname>\n");
@@ -930,8 +608,6 @@ static void print_usage(void)
 	printf("      Tell lvmlockd to disable the global lock in a sanlock VG.\n");
 	printf("--stop-lockspaces | -S\n");
 	printf("      Stop all lockspaces.\n");
-	printf("--stderr | -e\n");
-	printf("      Send kill and drop messages to stderr instead of syslog\n");
 }

 static int read_options(int argc, char *argv[])
@@ -951,7 +627,6 @@ static int read_options(int argc, char *argv[])
 		{"gl-enable",       required_argument, 0,  'E' },
 		{"gl-disable",      required_argument, 0,  'D' },
 		{"stop-lockspaces", no_argument,       0,  'S' },
-		{"stderr",          no_argument,       0,  'e' },
 		{0, 0, 0, 0 }
 	};

@@ -961,7 +636,7 @@ static int read_options(int argc, char *argv[])
 	}

 	while (1) {
-		c = getopt_long(argc, argv, "hqidE:D:w:k:r:Se", long_options, &option_index);
+		c = getopt_long(argc, argv, "hqidE:D:w:k:r:S", long_options, &option_index);
 		if (c == -1)
 			break;

@@ -987,30 +662,23 @@ static int read_options(int argc, char *argv[])
 			break;
 		case 'k':
 			kill_vg = 1;
-			free(arg_vg_name);
 			arg_vg_name = strdup(optarg);
 			break;
 		case 'r':
 			drop_vg = 1;
-			free(arg_vg_name);
 			arg_vg_name = strdup(optarg);
 			break;
 		case 'E':
 			gl_enable = 1;
-			free(arg_vg_name);
 			arg_vg_name = strdup(optarg);
 			break;
 		case 'D':
 			gl_disable = 1;
-			free(arg_vg_name);
 			arg_vg_name = strdup(optarg);
 			break;
 		case 'S':
 			stop_lockspaces = 1;
 			break;
-		case 'e':
-			use_stderr = 1;
-			break;
 		default:
 			print_usage();
 			exit(1);
@@ -1029,12 +697,8 @@ int main(int argc, char **argv)
 	if (rv < 0)
 		return rv;

-	/* do_kill handles lvmlockd connections itself */
-	if (kill_vg)
-		return do_kill();
-
-
 	_lvmlockd = lvmlockd_open(NULL);
+
 	if (_lvmlockd.socket_fd < 0 || _lvmlockd.error) {
 		log_error("Cannot connect to lvmlockd.");
 		return -1;
@@ -1055,6 +719,11 @@ int main(int argc, char **argv)
 		goto out;
 	}

+	if (kill_vg) {
+		rv = do_kill();
+		goto out;
+	}
+
 	if (drop_vg) {
 		rv = do_drop();
 		goto out;
--- 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
--- a/daemons/lvmlockd/lvmlockd-dlm.c
+++ b/daemons/lvmlockd/lvmlockd-dlm.c
@@ -128,18 +128,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 +149,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);
@@ -327,7 +323,8 @@ int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r)
 		log_error("S %s R %s rem_resource_dlm unlock error %d", ls->name, r->name, rv);
 	}
 out:
-	free(rdd->vb);
+	if (rdd->vb)
+		free(rdd->vb);

 	memset(rdd, 0, sizeof(struct rd_dlm));
 	r->lm_init = 0;
@@ -397,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);
--- a/daemons/lvmlockd/lvmlockd-idm.c
+++ b/daemons/lvmlockd/lvmlockd-idm.c
@@ -1,837 +0,0 @@
-/*
- * Copyright (C) 2020-2021 Seagate Ltd.
- *
- * 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.
- */
-
-#define _XOPEN_SOURCE 500  /* pthread */
-#define _ISOC99_SOURCE
-
-#include "tools/tool.h"
-
-#include "daemon-server.h"
-#include "lib/mm/xlate.h"
-
-#include "lvmlockd-internal.h"
-#include "daemons/lvmlockd/lvmlockd-client.h"
-
-#include "ilm.h"
-
-#include <blkid/blkid.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <poll.h>
-#include <regex.h>
-#include <stddef.h>
-#include <syslog.h>
-#include <sys/sysmacros.h>
-#include <time.h>
-
-#define IDM_TIMEOUT	60000	/* unit: millisecond, 60 seconds */
-
-/*
- * Each lockspace thread has its own In-Drive Mutex (IDM) lock manager's
- * connection.  After established socket connection, the lockspace has
- * been created in IDM lock manager and afterwards use the socket file
- * descriptor to send any requests for lock related operations.
- */
-
-struct lm_idm {
-	int sock;	/* IDM lock manager connection */
-};
-
-struct rd_idm {
-	struct idm_lock_id id;
-	struct idm_lock_op op;
-	uint64_t vb_timestamp;
-	struct val_blk *vb;
-};
-
-int lm_data_size_idm(void)
-{
-	return sizeof(struct rd_idm);
-}
-
-static uint64_t read_utc_us(void)
-{
-	struct timespec cur_time;
-
-	clock_gettime(CLOCK_REALTIME, &cur_time);
-
-	/*
-	 * Convert to microseconds unit.  IDM reserves the MSB in 8 bytes
-	 * and the low 56 bits are used for timestamp; 56 bits can support
-	 * calendar year to 2284, so it has 260 years for overflow.  Thus it
-	 * is quite safe for overflow issue when wrote this code.
-	 */
-	return cur_time.tv_sec * 1000000 + cur_time.tv_nsec / 1000;
-}
-
-static int uuid_read_format(char *uuid_str, const char *buffer)
-{
-	int out = 0;
-
-	/* just strip out any dashes */
-	while (*buffer) {
-
-		if (*buffer == '-') {
-			buffer++;
-			continue;
-		}
-
-		if (out >= 32) {
-			log_error("Too many characters to be uuid.");
-			return -1;
-		}
-
-		uuid_str[out++] = *buffer;
-		buffer++;
-	}
-
-	if (out != 32) {
-		log_error("Couldn't read uuid: incorrect number of "
-			  "characters.");
-		return -1;
-	}
-
-	return 0;
-}
-
-#define SYSFS_ROOT		"/sys"
-#define BUS_SCSI_DEVS		"/bus/scsi/devices"
-
-static struct idm_lock_op glb_lock_op;
-
-static void lm_idm_free_dir_list(struct dirent **dir_list, int dir_num)
-{
-	int i;
-
-	for (i = 0; i < dir_num; ++i)
-		free(dir_list[i]);
-	free(dir_list);
-}
-
-static int lm_idm_scsi_directory_select(const struct dirent *s)
-{
-	regex_t regex;
-	int ret;
-
-	/* Only select directory with the format x:x:x:x */
-	ret = regcomp(&regex, "^[0-9]+:[0-9]+:[0-9]+:[0-9]+$", REG_EXTENDED);
-	if (ret)
-		return 0;
-
-	ret = regexec(&regex, s->d_name, 0, NULL, 0);
-	if (!ret) {
-		regfree(&regex);
-		return 1;
-	}
-
-	regfree(&regex);
-	return 0;
-}
-
-static int lm_idm_scsi_find_block_dirctory(const char *block_path)
-{
-	struct stat stats;
-
-	if ((stat(block_path, &stats) >= 0) && S_ISDIR(stats.st_mode))
-		return 0;
-
-	return -1;
-}
-
-static int lm_idm_scsi_block_node_select(const struct dirent *s)
-{
-	if (DT_LNK != s->d_type && DT_DIR != s->d_type)
-		return 0;
-
-	if (DT_DIR == s->d_type) {
-		/* Skip this directory: '.' and parent: '..' */
-		if (!strcmp(s->d_name, ".") || !strcmp(s->d_name, ".."))
-			return 0;
-	}
-
-	return 1;
-}
-
-static int lm_idm_scsi_find_block_node(const char *blk_path, char **blk_dev)
-{
-        struct dirent **dir_list;
-        int dir_num;
-
-        dir_num = scandir(blk_path, &dir_list, lm_idm_scsi_block_node_select, NULL);
-        if (dir_num < 0) {
-		log_error("Cannot find valid directory entry in %s", blk_path);
-                return -1;
-	}
-
-	/*
-	 * Should have only one block name under the path, if the dir_num is
-	 * not 1 (e.g. 0 or any number bigger than 1), it must be wrong and
-	 * should never happen.
-	 */
-	if (dir_num == 1)
-		*blk_dev = strdup(dir_list[0]->d_name);
-	else
-		*blk_dev = NULL;
-
-	lm_idm_free_dir_list(dir_list, dir_num);
-
-	if (!*blk_dev)
-		return -1;
-
-        return dir_num;
-}
-
-static int lm_idm_scsi_search_propeller_partition(char *dev)
-{
-	int i, nparts;
-	blkid_probe pr;
-	blkid_partlist ls;
-	int found = -1;
-
-	pr = blkid_new_probe_from_filename(dev);
-	if (!pr) {
-		log_error("%s: failed to create a new libblkid probe", dev);
-		return -1;
-	}
-
-	/* Binary interface */
-	ls = blkid_probe_get_partitions(pr);
-	if (!ls) {
-		log_error("%s: failed to read partitions", dev);
-		return -1;
-	}
-
-	/* List partitions */
-	nparts = blkid_partlist_numof_partitions(ls);
-	if (!nparts)
-		goto done;
-
-	for (i = 0; i < nparts; i++) {
-		const char *p;
-		blkid_partition par = blkid_partlist_get_partition(ls, i);
-
-		p = blkid_partition_get_name(par);
-		if (p) {
-			log_debug("partition name='%s'", p);
-
-			if (!strcmp(p, "propeller"))
-				found = blkid_partition_get_partno(par);
-		}
-
-		if (found >= 0)
-			break;
-	}
-
-done:
-	blkid_free_probe(pr);
-	return found;
-}
-
-static char *lm_idm_scsi_get_block_device_node(const char *scsi_path)
-{
-	char *blk_path = NULL;
-	char *blk_dev = NULL;
-	char *dev_node = NULL;
-	int ret;
-
-	/*
-	 * Locate the "block" directory, such like:
-	 * /sys/bus/scsi/devices/1:0:0:0/block
-	 */
-	ret = asprintf(&blk_path, "%s/%s", scsi_path, "block");
-	if (ret < 0) {
-		log_error("Fail to allocate block path for %s", scsi_path);
-		goto fail;
-	}
-
-	ret = lm_idm_scsi_find_block_dirctory(blk_path);
-	if (ret < 0) {
-		log_error("Fail to find block path %s", blk_path);
-		goto fail;
-	}
-
-	/*
-	 * Locate the block device name, such like:
-	 * /sys/bus/scsi/devices/1:0:0:0/block/sdb
-	 *
-	 * After return from this function and if it makes success,
-	 * the global variable "blk_dev" points to the block device
-	 * name, in this example it points to string "sdb".
-	 */
-	ret = lm_idm_scsi_find_block_node(blk_path, &blk_dev);
-	if (ret < 0) {
-		log_error("Fail to find block node");
-		goto fail;
-	}
-
-	ret = asprintf(&dev_node, "/dev/%s", blk_dev);
-	if (ret < 0) {
-		log_error("Fail to allocate memory for blk node path");
-		goto fail;
-	}
-
-	ret = lm_idm_scsi_search_propeller_partition(dev_node);
-	if (ret < 0)
-		goto fail;
-
-	free(blk_path);
-	free(blk_dev);
-	return dev_node;
-
-fail:
-	free(blk_path);
-	free(blk_dev);
-	free(dev_node);
-	return NULL;
-}
-
-static int lm_idm_get_gl_lock_pv_list(void)
-{
-	struct dirent **dir_list;
-	char scsi_bus_path[PATH_MAX];
-	char *drive_path;
-	int i, dir_num, ret;
-
-	if (glb_lock_op.drive_num)
-		return 0;
-
-	snprintf(scsi_bus_path, sizeof(scsi_bus_path), "%s%s",
-		 SYSFS_ROOT, BUS_SCSI_DEVS);
-
-	dir_num = scandir(scsi_bus_path, &dir_list,
-			  lm_idm_scsi_directory_select, NULL);
-	if (dir_num < 0) {  /* scsi mid level may not be loaded */
-		log_error("Attached devices: none");
-		return -1;
-	}
-
-	for (i = 0; i < dir_num; i++) {
-		char *scsi_path;
-
-		ret = asprintf(&scsi_path, "%s/%s", scsi_bus_path,
-			       dir_list[i]->d_name);
-		if (ret < 0) {
-			log_error("Fail to allocate memory for scsi directory");
-			goto failed;
-		}
-
-		if (glb_lock_op.drive_num >= ILM_DRIVE_MAX_NUM) {
-			log_error("Global lock: drive number %d exceeds limitation (%d) ?!",
-				  glb_lock_op.drive_num, ILM_DRIVE_MAX_NUM);
-			free(scsi_path);
-			goto failed;
-		}
-
-		drive_path = lm_idm_scsi_get_block_device_node(scsi_path);
-		if (!drive_path) {
-			free(scsi_path);
-			continue;
-		}
-
-		glb_lock_op.drives[glb_lock_op.drive_num] = drive_path;
-		glb_lock_op.drive_num++;
-
-		free(scsi_path);
-	}
-
-	lm_idm_free_dir_list(dir_list, dir_num);
-	return 0;
-
-failed:
-	lm_idm_free_dir_list(dir_list, dir_num);
-
-	for (i = 0; i < glb_lock_op.drive_num; i++) {
-		if (glb_lock_op.drives[i]) {
-			free(glb_lock_op.drives[i]);
-			glb_lock_op.drives[i] = NULL;
-		}
-	}
-
-	return -1;
-}
-
-static void lm_idm_update_vb_timestamp(uint64_t *vb_timestamp)
-{
-	uint64_t utc_us = read_utc_us();
-
-	/*
-	 * It's possible that the multiple nodes have no clock
-	 * synchronization with microsecond prcision and the time
-	 * is going backward.  For this case, simply increment the
-	 * existing timestamp and write out to drive.
-	 */
-	if (*vb_timestamp >= utc_us)
-		(*vb_timestamp)++;
-	else
-		*vb_timestamp = utc_us;
-}
-
-int lm_prepare_lockspace_idm(struct lockspace *ls)
-{
-	struct lm_idm *lm = NULL;
-
-	lm = malloc(sizeof(struct lm_idm));
-	if (!lm) {
-		log_error("S %s prepare_lockspace_idm fail to allocate lm_idm for %s",
-			  ls->name, ls->vg_name);
-		return -ENOMEM;
-	}
-	memset(lm, 0x0, sizeof(struct lm_idm));
-
-	ls->lm_data = lm;
-	log_debug("S %s prepare_lockspace_idm done", ls->name);
-	return 0;
-}
-
-int lm_add_lockspace_idm(struct lockspace *ls, int adopt)
-{
-	char killpath[IDM_FAILURE_PATH_LEN];
-	char killargs[IDM_FAILURE_ARGS_LEN];
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	int rv;
-
-	if (daemon_test)
-		return 0;
-
-	if (!strcmp(ls->name, S_NAME_GL_IDM)) {
-		/*
-		 * Prepare the pv list for global lock, if the drive contains
-		 * "propeller" partition, then this drive will be considered
-		 * as a member of pv list.
-		 */
-		rv = lm_idm_get_gl_lock_pv_list();
-		if (rv < 0) {
-			log_error("S %s add_lockspace_idm fail to get pv list for glb lock",
-				  ls->name);
-			return -EIO;
-		} else {
-			log_error("S %s add_lockspace_idm get pv list for glb lock",
-				  ls->name);
-		}
-	}
-
-	/*
-	 * Construct the execution path for command "lvmlockctl" by using the
-	 * path to the lvm binary and appending "lockctl".
-	 */
-	memset(killpath, 0, sizeof(killpath));
-	snprintf(killpath, IDM_FAILURE_PATH_LEN, "%slockctl", LVM_PATH);
-
-	/* Pass the argument "--kill vg_name" for killpath */
-	memset(killargs, 0, sizeof(killargs));
-	snprintf(killargs, IDM_FAILURE_ARGS_LEN, "--kill %s", ls->vg_name);
-
-	/* Connect with IDM lock manager per every lockspace. */
-	rv = ilm_connect(&lmi->sock);
-	if (rv < 0) {
-		log_error("S %s add_lockspace_idm fail to connect the lock manager %d",
-			  ls->name, lmi->sock);
-		lmi->sock = 0;
-		rv = -EMANAGER;
-		goto fail;
-	}
-
-	rv = ilm_set_killpath(lmi->sock, killpath, killargs);
-	if (rv < 0) {
-		log_error("S %s add_lockspace_idm fail to set kill path %d",
-			  ls->name, rv);
-		rv = -EMANAGER;
-		goto fail;
-	}
-
-	log_debug("S %s add_lockspace_idm kill path is: \"%s %s\"",
-		  ls->name, killpath, killargs);
-
-	log_debug("S %s add_lockspace_idm done", ls->name);
-	return 0;
-
-fail:
-	if (lmi && lmi->sock)
-		close(lmi->sock);
-	if (lmi)
-		free(lmi);
-	return rv;
-}
-
-int lm_rem_lockspace_idm(struct lockspace *ls, int free_vg)
-{
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	int i, rv = 0;
-
-	if (daemon_test)
-		goto out;
-
-	rv = ilm_disconnect(lmi->sock);
-	if (rv < 0)
-		log_error("S %s rem_lockspace_idm error %d", ls->name, rv);
-
-	/* Release pv list for global lock */
-	if (!strcmp(ls->name, "lvm_global")) {
-		for (i = 0; i < glb_lock_op.drive_num; i++) {
-			if (glb_lock_op.drives[i]) {
-				free(glb_lock_op.drives[i]);
-				glb_lock_op.drives[i] = NULL;
-			}
-		}
-	}
-
-out:
-	free(lmi);
-	ls->lm_data = NULL;
-	return rv;
-}
-
-static int lm_add_resource_idm(struct lockspace *ls, struct resource *r)
-{
-	struct rd_idm *rdi = (struct rd_idm *)r->lm_data;
-
-	if (r->type == LD_RT_GL || r->type == LD_RT_VG) {
-		rdi->vb = zalloc(sizeof(struct val_blk));
-		if (!rdi->vb)
-			return -ENOMEM;
-	}
-
-	return 0;
-}
-
-int lm_rem_resource_idm(struct lockspace *ls, struct resource *r)
-{
-	struct rd_idm *rdi = (struct rd_idm *)r->lm_data;
-
-	if (rdi->vb)
-		free(rdi->vb);
-
-	memset(rdi, 0, sizeof(struct rd_idm));
-	r->lm_init = 0;
-	return 0;
-}
-
-static int to_idm_mode(int ld_mode)
-{
-	switch (ld_mode) {
-	case LD_LK_EX:
-		return IDM_MODE_EXCLUSIVE;
-	case LD_LK_SH:
-		return IDM_MODE_SHAREABLE;
-	default:
-		break;
-	};
-
-	return -1;
-}
-
-int lm_lock_idm(struct lockspace *ls, struct resource *r, int ld_mode,
-		struct val_blk *vb_out, char *lv_uuid, struct pvs *pvs,
-		int adopt)
-{
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	struct rd_idm *rdi = (struct rd_idm *)r->lm_data;
-	char **drive_path = NULL;
-	uint64_t timestamp;
-	int reset_vb = 0;
-	int rv, i;
-
-	if (!r->lm_init) {
-		rv = lm_add_resource_idm(ls, r);
-		if (rv < 0)
-			return rv;
-		r->lm_init = 1;
-	}
-
-	rdi->op.mode = to_idm_mode(ld_mode);
-	if (rv < 0) {
-		log_error("lock_idm invalid mode %d", ld_mode);
-		return -EINVAL;
-	}
-
-	log_debug("S %s R %s lock_idm", ls->name, r->name);
-
-	if (daemon_test) {
-		if (rdi->vb) {
-			vb_out->version = le16_to_cpu(rdi->vb->version);
-			vb_out->flags = le16_to_cpu(rdi->vb->flags);
-			vb_out->r_version = le32_to_cpu(rdi->vb->r_version);
-		}
-		return 0;
-	}
-
-	rdi->op.timeout = IDM_TIMEOUT;
-
-	/*
-	 * Generate the UUID string, for RT_VG, it only needs to generate
-	 * UUID string for VG level, for RT_LV, it needs to generate
-	 * UUID strings for both VG and LV levels.  At the end, these IDs
-	 * are used as identifier for IDM in drive firmware.
-	 */
-	if (r->type == LD_RT_VG || r->type == LD_RT_LV)
-		log_debug("S %s R %s VG uuid %s", ls->name, r->name, ls->vg_uuid);
-	if (r->type == LD_RT_LV)
-		log_debug("S %s R %s LV uuid %s", ls->name, r->name, lv_uuid);
-
-	memset(&rdi->id, 0x0, sizeof(struct idm_lock_id));
-	if (r->type == LD_RT_VG) {
-		uuid_read_format(rdi->id.vg_uuid, ls->vg_uuid);
-	} else if (r->type == LD_RT_LV) {
-		uuid_read_format(rdi->id.vg_uuid, ls->vg_uuid);
-		uuid_read_format(rdi->id.lv_uuid, lv_uuid);
-	}
-
-	/*
-	 * Establish the drive path list for lock, since different lock type
-	 * has different drive list; the GL lock uses the global pv list,
-	 * the VG lock uses the pv list spanned for the whole volume group,
-	 * the LV lock uses the pv list for the logical volume.
-	 */
-	switch (r->type) {
-	case LD_RT_GL:
-		drive_path = glb_lock_op.drives;
-		rdi->op.drive_num = glb_lock_op.drive_num;
-		break;
-	case LD_RT_VG:
-		drive_path = (char **)ls->pvs.path;
-		rdi->op.drive_num = ls->pvs.num;
-		break;
-	case LD_RT_LV:
-		drive_path = (char **)pvs->path;
-		rdi->op.drive_num = pvs->num;
-		break;
-	default:
-		break;
-	}
-
-	if (!drive_path) {
-		log_error("S %s R %s cannot find the valid drive path array",
-			  ls->name, r->name);
-		return -EINVAL;
-	}
-
-	if (rdi->op.drive_num >= ILM_DRIVE_MAX_NUM) {
-		log_error("S %s R %s exceeds limitation for drive path array",
-			  ls->name, r->name);
-		return -EINVAL;
-	}
-
-	for (i = 0; i < rdi->op.drive_num; i++)
-		rdi->op.drives[i] = drive_path[i];
-
-	log_debug("S %s R %s mode %d drive_num %d timeout %d",
-		  ls->name, r->name, rdi->op.mode,
-		  rdi->op.drive_num, rdi->op.timeout);
-
-	for (i = 0; i < rdi->op.drive_num; i++)
-		log_debug("S %s R %s drive path[%d] %s",
-			  ls->name, r->name, i, rdi->op.drives[i]);
-
-	rv = ilm_lock(lmi->sock, &rdi->id, &rdi->op);
-	if (rv < 0) {
-		log_debug("S %s R %s lock_idm acquire mode %d rv %d",
-			  ls->name, r->name, ld_mode, rv);
-		return -ELOCKIO;
-	}
-
-	if (rdi->vb) {
-		rv = ilm_read_lvb(lmi->sock, &rdi->id, (char *)&timestamp,
-				  sizeof(uint64_t));
-
-		/*
-		 * If fail to read value block, which might be caused by drive
-		 * failure, notify up layer to invalidate metadata.
-		 */
-		if (rv < 0) {
-			log_error("S %s R %s lock_idm get_lvb error %d",
-				  ls->name, r->name, rv);
-			reset_vb = 1;
-
-			/* Reset timestamp */
-			rdi->vb_timestamp = 0;
-
-		/*
-		 * If the cached timestamp mismatches with the stored value
-		 * in the IDM, this means another host has updated timestamp
-		 * for the new VB.  Let's reset VB and notify up layer to
-		 * invalidate metadata.
-		 */
-		} else if (rdi->vb_timestamp != timestamp) {
-			log_debug("S %s R %s lock_idm get lvb timestamp %lu:%lu",
-				  ls->name, r->name, rdi->vb_timestamp,
-				  timestamp);
-
-			rdi->vb_timestamp = timestamp;
-			reset_vb = 1;
-		}
-
-		if (reset_vb == 1) {
-			memset(rdi->vb, 0, sizeof(struct val_blk));
-			memset(vb_out, 0, sizeof(struct val_blk));
-
-			/*
-			 * The lock is still acquired, but the vb values has
-			 * been invalidated.
-			 */
-			rv = 0;
-			goto out;
-		}
-
-		/* Otherwise, copy the cached VB to up layer */
-		memcpy(vb_out, rdi->vb, sizeof(struct val_blk));
-	}
-
-out:
-	return rv;
-}
-
-int lm_convert_idm(struct lockspace *ls, struct resource *r,
-		   int ld_mode, uint32_t r_version)
-{
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	struct rd_idm *rdi = (struct rd_idm *)r->lm_data;
-	int mode, rv;
-
-	if (rdi->vb && r_version && (r->mode == LD_LK_EX)) {
-		if (!rdi->vb->version) {
-			/* first time vb has been written */
-			rdi->vb->version = VAL_BLK_VERSION;
-		}
-		rdi->vb->r_version = r_version;
-
-		log_debug("S %s R %s convert_idm set r_version %u",
-			  ls->name, r->name, r_version);
-
-		lm_idm_update_vb_timestamp(&rdi->vb_timestamp);
-		log_debug("S %s R %s convert_idm vb %x %x %u timestamp %lu",
-			  ls->name, r->name, rdi->vb->version, rdi->vb->flags,
-			  rdi->vb->r_version, rdi->vb_timestamp);
-	}
-
-	mode = to_idm_mode(ld_mode);
-	if (mode < 0) {
-		log_error("S %s R %s convert_idm invalid mode %d",
-			  ls->name, r->name, ld_mode);
-		return -EINVAL;
-	}
-
-	log_debug("S %s R %s convert_idm", ls->name, r->name);
-
-	if (daemon_test)
-		return 0;
-
-	if (rdi->vb && r_version && (r->mode == LD_LK_EX)) {
-		rv = ilm_write_lvb(lmi->sock, &rdi->id,
-				   (char *)rdi->vb_timestamp, sizeof(uint64_t));
-		if (rv < 0) {
-			log_error("S %s R %s convert_idm write lvb error %d",
-				  ls->name, r->name, rv);
-			return -ELMERR;
-		}
-	}
-
-	rv = ilm_convert(lmi->sock, &rdi->id, mode);
-	if (rv < 0)
-		log_error("S %s R %s convert_idm convert error %d",
-			  ls->name, r->name, rv);
-
-	return rv;
-}
-
-int lm_unlock_idm(struct lockspace *ls, struct resource *r,
-		  uint32_t r_version, uint32_t lmu_flags)
-{
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	struct rd_idm *rdi = (struct rd_idm *)r->lm_data;
-	int rv;
-
-	if (rdi->vb && r_version && (r->mode == LD_LK_EX)) {
-		if (!rdi->vb->version) {
-			/* first time vb has been written */
-			rdi->vb->version = VAL_BLK_VERSION;
-		}
-		if (r_version)
-			rdi->vb->r_version = r_version;
-
-		lm_idm_update_vb_timestamp(&rdi->vb_timestamp);
-		log_debug("S %s R %s unlock_idm vb %x %x %u timestamp %lu",
-			  ls->name, r->name, rdi->vb->version, rdi->vb->flags,
-			  rdi->vb->r_version, rdi->vb_timestamp);
-	}
-
-	log_debug("S %s R %s unlock_idm", ls->name, r->name);
-
-	if (daemon_test)
-		return 0;
-
-	if (rdi->vb && r_version && (r->mode == LD_LK_EX)) {
-		rv = ilm_write_lvb(lmi->sock, &rdi->id,
-				   (char *)&rdi->vb_timestamp, sizeof(uint64_t));
-		if (rv < 0) {
-			log_error("S %s R %s unlock_idm set_lvb error %d",
-				  ls->name, r->name, rv);
-			return -ELMERR;
-		}
-	}
-
-	rv = ilm_unlock(lmi->sock, &rdi->id);
-	if (rv < 0)
-		log_error("S %s R %s unlock_idm error %d", ls->name, r->name, rv);
-
-	return rv;
-}
-
-int lm_hosts_idm(struct lockspace *ls, int notify)
-{
-	struct resource *r;
-	struct lm_idm *lmi = (struct lm_idm *)ls->lm_data;
-	struct rd_idm *rdi;
-	int count, self, found_others = 0;
-	int rv;
-
-	list_for_each_entry(r, &ls->resources, list) {
-		if (!r->lm_init)
-			continue;
-
-		rdi = (struct rd_idm *)r->lm_data;
-
-		rv = ilm_get_host_count(lmi->sock, &rdi->id, &rdi->op,
-					&count, &self);
-		if (rv < 0) {
-			log_error("S %s lm_hosts_idm error %d", ls->name, rv);
-			return rv;
-		}
-
-		/* Fixup: need to reduce self count */
-		if (count > found_others)
-			found_others = count;
-	}
-
-	return found_others;
-}
-
-int lm_get_lockspaces_idm(struct list_head *ls_rejoin)
-{
-	/* TODO: Need to add support for adoption. */
-	return -1;
-}
-
-int lm_is_running_idm(void)
-{
-	int sock, rv;
-
-	if (daemon_test)
-		return gl_use_idm;
-
-	rv = ilm_connect(&sock);
-	if (rv < 0) {
-		log_error("Fail to connect seagate IDM lock manager %d", rv);
-		return 0;
-	}
-
-	ilm_disconnect(sock);
-	return 1;
-}
--- 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

@@ -20,7 +18,6 @@
 #define R_NAME_GL          "GLLK"
 #define R_NAME_VG          "VGLK"
 #define S_NAME_GL_DLM      "lvm_global"
-#define S_NAME_GL_IDM      "lvm_global"
 #define LVM_LS_PREFIX      "lvm_"           /* ls name is prefix + vg_name */
 /* global lockspace name for sanlock is a vg name */

@@ -30,7 +27,6 @@ enum {
 	LD_LM_UNUSED = 1, /* place holder so values match lib/locking/lvmlockd.h */
 	LD_LM_DLM = 2,
 	LD_LM_SANLOCK = 3,
-	LD_LM_IDM = 4,
 };

 /* operation types */
@@ -120,11 +116,6 @@ struct client {
 */
 #define DEFAULT_MAX_RETRIES 4

-struct pvs {
-	char **path;
-	int num;
-};
-
 struct action {
 	struct list_head list;
 	uint32_t client_id;
@@ -147,7 +138,6 @@ struct action {
 	char vg_args[MAX_ARGS+1];
 	char lv_args[MAX_ARGS+1];
 	char vg_sysid[MAX_NAME+1];
-	struct pvs pvs;			/* PV list for idm */
 };

 struct resource {
@@ -155,7 +145,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 */
@@ -166,7 +155,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
@@ -192,7 +181,6 @@ struct lockspace {
 	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 */
-	struct pvs pvs;			/* for idm: PV list */

 	uint32_t start_client_id;	/* client_id that started the lockspace */
 	pthread_t thread;		/* makes synchronous lock requests */
@@ -228,6 +216,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;
@@ -334,13 +326,10 @@ static inline int list_empty(const struct list_head *head)
 EXTERN int gl_type_static;
 EXTERN int gl_use_dlm;
 EXTERN int gl_use_sanlock;
-EXTERN int gl_use_idm;
 EXTERN int gl_vg_removed;
 EXTERN char gl_lsname_dlm[MAX_NAME+1];
 EXTERN char gl_lsname_sanlock[MAX_NAME+1];
-EXTERN char gl_lsname_idm[MAX_NAME+1];
 EXTERN int global_dlm_lockspace_exists;
-EXTERN int global_idm_lockspace_exists;

 EXTERN int daemon_test; /* run as much as possible without a live lock manager */
 EXTERN int daemon_debug;
@@ -631,102 +620,4 @@ static inline int lm_support_sanlock(void)

 #endif /* sanlock support */

-#ifdef LOCKDIDM_SUPPORT
-
-int lm_data_size_idm(void);
-int lm_init_vg_idm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
-int lm_prepare_lockspace_idm(struct lockspace *ls);
-int lm_add_lockspace_idm(struct lockspace *ls, int adopt);
-int lm_rem_lockspace_idm(struct lockspace *ls, int free_vg);
-int lm_lock_idm(struct lockspace *ls, struct resource *r, int ld_mode,
-		struct val_blk *vb_out, char *lv_uuid, struct pvs *pvs,
-		int adopt);
-int lm_convert_idm(struct lockspace *ls, struct resource *r,
-		   int ld_mode, uint32_t r_version);
-int lm_unlock_idm(struct lockspace *ls, struct resource *r,
-		  uint32_t r_version, uint32_t lmu_flags);
-int lm_hosts_idm(struct lockspace *ls, int notify);
-int lm_get_lockspaces_idm(struct list_head *ls_rejoin);
-int lm_is_running_idm(void);
-int lm_rem_resource_idm(struct lockspace *ls, struct resource *r);
-
-static inline int lm_support_idm(void)
-{
-	return 1;
-}
-
-#else
-
-static inline int lm_data_size_idm(void)
-{
-	return -1;
-}
-
-static inline int lm_init_vg_idm(char *ls_name, char *vg_name, uint32_t flags,
-			  char *vg_args)
-{
-	return -1;
-}
-
-static inline int lm_prepare_lockspace_idm(struct lockspace *ls)
-{
-	return -1;
-}
-
-static inline int lm_add_lockspace_idm(struct lockspace *ls, int adopt)
-{
-	return -1;
-}
-
-static inline int lm_rem_lockspace_idm(struct lockspace *ls, int free_vg)
-{
-	return -1;
-}
-
-static inline int lm_lock_idm(struct lockspace *ls, struct resource *r, int ld_mode,
-		       struct val_blk *vb_out, char *lv_uuid, struct pvs *pvs,
-		       int adopt)
-{
-	return -1;
-}
-
-static inline int lm_convert_idm(struct lockspace *ls, struct resource *r,
-			  int ld_mode, uint32_t r_version)
-{
-	return -1;
-}
-
-static inline int lm_unlock_idm(struct lockspace *ls, struct resource *r,
-			 uint32_t r_version, uint32_t lmu_flags)
-{
-	return -1;
-}
-
-static inline int lm_hosts_idm(struct lockspace *ls, int notify)
-{
-	return -1;
-}
-
-static inline int lm_get_lockspaces_idm(struct list_head *ls_rejoin)
-{
-	return -1;
-}
-
-static inline int lm_is_running_idm(void)
-{
-	return 0;
-}
-
-static inline int lm_rem_resource_idm(struct lockspace *ls, struct resource *r)
-{
-	return -1;
-}
-
-static inline int lm_support_idm(void)
-{
-	return 0;
-}
-
-#endif /* Seagate IDM support */
-
 #endif	/* _LVM_LVMLOCKD_INTERNAL_H */
--- a/daemons/lvmlockd/lvmlockd-sanlock.c
+++ b/daemons/lvmlockd/lvmlockd-sanlock.c
@@ -500,15 +500,13 @@ 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;
@@ -528,7 +526,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 +543,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;
 	}

@@ -639,9 +635,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);

@@ -698,7 +692,7 @@ int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name,
 {
 	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 rv;

@@ -713,7 +707,7 @@ 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) {
@@ -1503,7 +1497,8 @@ out:
 fail:
 	if (lms && lms->sock)
 		close(lms->sock);
-	free(lms);
+	if (lms)
+		free(lms);
 	return ret;
 }

@@ -1633,7 +1628,8 @@ int lm_rem_resource_sanlock(struct lockspace *ls, struct resource *r)

 	/* FIXME: assert r->mode == UN or unlock if it's not? */

-	free(rds->vb);
+	if (rds->vb)
+		free(rds->vb);

 	memset(rds, 0, sizeof(struct rd_sanlock));
 	r->lm_init = 0;
--- a/daemons/lvmpolld/Makefile.in
+++ b/daemons/lvmpolld/Makefile.in
@@ -19,11 +19,12 @@ SOURCES = lvmpolld-core.c lvmpolld-data-utils.c lvmpolld-cmd-utils.c

 TARGETS = lvmpolld

-CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-CFLOW_TARGET := $(TARGETS)
-
 .PHONY: install_lvmpolld

+CFLOW_LIST = $(SOURCES)
+CFLOW_LIST_TARGET = $(LIB_NAME).cflow
+CFLOW_TARGET = lvmpolld
+
 include $(top_builddir)/make.tmpl

 CFLAGS += $(EXTRA_EXEC_CFLAGS)
--- a/daemons/lvmpolld/lvmpolld-cmd-utils.c
+++ b/daemons/lvmpolld/lvmpolld-cmd-utils.c
@@ -92,12 +92,6 @@ const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary,
 	if (!add_to_cmd_arr(&cmd_argv, "-An", &i))
 		goto err;

-	if (pdlv->devicesfile) {
-		if (!add_to_cmd_arr(&cmd_argv, "--devicesfile", &i) ||
-		    !add_to_cmd_arr(&cmd_argv, pdlv->devicesfile, &i))
-			goto err;
-	}
-
 	/* terminating NULL */
 	if (!add_to_cmd_arr(&cmd_argv, NULL, &i))
 		goto err;
--- a/daemons/lvmpolld/lvmpolld-core.c
+++ b/daemons/lvmpolld/lvmpolld-core.c
@@ -149,7 +149,7 @@ static void _lvmpolld_global_unlock(struct lvmpolld_state *ls)
 static int _fini(struct daemon_state *s)
 {
 	int done;
-	const struct timespec t = { .tv_nsec = 10000000 }; /* .01 sec */
+	const struct timespec t = { .tv_nsec = 250000000 }; /* .25 sec */
 	struct lvmpolld_state *ls = s->private;

 	DEBUGLOG(s, "fini");
@@ -236,7 +236,9 @@ static int poll_for_output(struct lvmpolld_lv *pdlv, struct lvmpolld_thread_data
 	}

 	while (1) {
-		r = poll(fds, 2, pdlv_get_timeout(pdlv) * 1000);
+		do {
+			r = poll(fds, 2, pdlv_get_timeout(pdlv) * 1000);
+		} while (r < 0 && errno == EINTR);

 		DEBUGLOG(pdlv->ls, "%s: %s %d", PD_LOG_PREFIX, "poll() returned", r);
 		if (r < 0) {
@@ -553,15 +555,14 @@ static struct lvmpolld_lv *construct_pdlv(request req, struct lvmpolld_state *ls
 				     const char *interval, const char *id,
 				     const char *vgname, const char *lvname,
 				     const char *sysdir, enum poll_type type,
-				     unsigned abort_polling, unsigned uinterval,
-				     const char *devicesfile)
+				     unsigned abort_polling, unsigned uinterval)
 {
 	const char **cmdargv, **cmdenvp;
 	struct lvmpolld_lv *pdlv;
 	unsigned handle_missing_pvs = daemon_request_int(req, LVMPD_PARM_HANDLE_MISSING_PVS, 0);

 	pdlv = pdlv_create(ls, id, vgname, lvname, sysdir, type,
-			   interval, uinterval, pdst, devicesfile);
+			   interval, uinterval, pdst);

 	if (!pdlv) {
 		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "failed to create internal LV data structure.");
@@ -620,7 +621,6 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re
 	const char *lvname = daemon_request_str(req, LVMPD_PARM_LVNAME, NULL);
 	const char *vgname = daemon_request_str(req, LVMPD_PARM_VGNAME, NULL);
 	const char *sysdir = daemon_request_str(req, LVMPD_PARM_SYSDIR, NULL);
-	const char *devicesfile = daemon_request_str(req, LVMPD_PARM_DEVICESFILE, NULL);
 	unsigned abort_polling = daemon_request_int(req, LVMPD_PARM_ABORT, 0);

 	assert(type < POLL_TYPE_MAX);
@@ -680,7 +680,7 @@ static response poll_init(client_handle h, struct lvmpolld_state *ls, request re
 		pdlv->init_rq_count++; /* safe. protected by store lock */
 	} else {
 		pdlv = construct_pdlv(req, ls, pdst, interval, id, vgname,
-				      lvname, sysdir, type, abort_polling, 2 * uinterval, devicesfile);
+				      lvname, sysdir, type, abort_polling, 2 * uinterval);
 		if (!pdlv) {
 			pdst_unlock(pdst);
 			free(id);
@@ -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/daemons/lvmpolld/lvmpolld-data-utils.c
+++ b/daemons/lvmpolld/lvmpolld-data-utils.c
@@ -93,13 +93,11 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
 			   const char *vgname, const char *lvname,
 			   const char *sysdir, enum poll_type type,
 			   const char *sinterval, unsigned pdtimeout,
-			   struct lvmpolld_store *pdst,
-			   const char *devicesfile)
+			   struct lvmpolld_store *pdst)
 {
 	char *lvmpolld_id = strdup(id), /* copy */
 	     *full_lvname = _construct_full_lvname(vgname, lvname), /* copy */
 	     *lvm_system_dir_env = _construct_lvm_system_dir_env(sysdir); /* copy */
-	char *devicesfile_dup = devicesfile ? strdup(devicesfile) : NULL;

 	struct lvmpolld_lv tmp = {
 		.ls = ls,
@@ -107,7 +105,6 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
 		.lvmpolld_id = lvmpolld_id,
 		.lvid = _get_lvid(lvmpolld_id, sysdir),
 		.lvname = full_lvname,
-		.devicesfile = devicesfile_dup,
 		.lvm_system_dir_env = lvm_system_dir_env,
 		.sinterval = strdup(sinterval), /* copy */
 		.pdtimeout = pdtimeout < MIN_POLLING_TIMEOUT ? MIN_POLLING_TIMEOUT : pdtimeout,
@@ -127,7 +124,6 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
 	return pdlv;

 err:
-	free((void *)devicesfile_dup);
 	free((void *)full_lvname);
 	free((void *)lvmpolld_id);
 	free((void *)lvm_system_dir_env);
@@ -140,7 +136,6 @@ err:
 void pdlv_destroy(struct lvmpolld_lv *pdlv)
 {
 	free((void *)pdlv->lvmpolld_id);
-	free((void *)pdlv->devicesfile);
 	free((void *)pdlv->lvname);
 	free((void *)pdlv->sinterval);
 	free((void *)pdlv->lvm_system_dir_env);
--- a/daemons/lvmpolld/lvmpolld-data-utils.h
+++ b/daemons/lvmpolld/lvmpolld-data-utils.h
@@ -49,7 +49,6 @@ struct lvmpolld_lv {
 	const enum poll_type type;
 	const char *const lvid;
 	const char *const lvmpolld_id;
-	const char *const devicesfile;
 	const char *const lvname; /* full vg/lv name */
 	const unsigned pdtimeout; /* in seconds */
 	const char *const sinterval;
@@ -102,8 +101,7 @@ struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
 			   const char *vgname, const char *lvname,
 			   const char *sysdir, enum poll_type type,
 			   const char *sinterval, unsigned pdtimeout,
-			   struct lvmpolld_store *pdst,
-			   const char *devicesfile);
+			   struct lvmpolld_store *pdst);

 /* only call with appropriate struct lvmpolld_store lock held */
 void pdlv_destroy(struct lvmpolld_lv *pdlv);
--- a/daemons/lvmpolld/lvmpolld-protocol.h
+++ b/daemons/lvmpolld/lvmpolld-protocol.h
@@ -35,7 +35,6 @@
 #define LVMPD_PARM_SYSDIR		"sysdir"
 #define LVMPD_PARM_VALUE		"value" /* either retcode or signal value */
 #define LVMPD_PARM_VGNAME		"vgname"
-#define LVMPD_PARM_DEVICESFILE		"devicesfile"

 #define LVMPD_RESP_FAILED	"failed"
 #define LVMPD_RESP_FINISHED	"finished"
--- a/device_mapper/all.h
+++ b/device_mapper/all.h
@@ -121,9 +121,7 @@ enum {

 	DM_DEVICE_SET_GEOMETRY,

-	DM_DEVICE_ARM_POLL,
-
-	DM_DEVICE_GET_TARGET_VERSION
+	DM_DEVICE_ARM_POLL
 };

 /*
@@ -164,20 +162,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 +232,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 +381,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 +390,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 +903,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;
 /*
@@ -951,8 +938,6 @@ struct writecache_settings {
 	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
@@ -972,8 +957,6 @@ struct writecache_settings {
 	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,
@@ -984,42 +967,12 @@ int dm_tree_node_add_writecache_target(struct dm_tree_node *node,
 				uint32_t writecache_block_size,
 				struct writecache_settings *settings);

-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);
@@ -1072,10 +1025,10 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
 #define DM_THIN_MIN_DATA_BLOCK_SIZE (UINT32_C(128))
 #define DM_THIN_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152))
 /*
- * Max supported size for thin pool metadata device (17045913600 bytes)
+ * Max supported size for thin pool  metadata device (17112760320 bytes)
+ * Limitation is hardcoded into the kernel and bigger device size
+ * is not accepted.
 * drivers/md/dm-thin-metadata.h THIN_METADATA_MAX_SECTORS
- * But here DM_THIN_MAX_METADATA_SIZE got defined incorrectly
- * Correct size is (UINT64_C(255) * ((1 << 14) - 64) * (4096 / (1 << 9)))
 */
 #define DM_THIN_MAX_METADATA_SIZE   (UINT64_C(255) * (1 << 14) * (4096 / (1 << 9)) - 256 * 1024)

@@ -1088,16 +1041,6 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node,
 				      uint64_t low_water_mark,
 				      unsigned skip_block_zeroing);

-int dm_tree_node_add_thin_pool_target_v1(struct dm_tree_node *node,
-					 uint64_t size,
-					 uint64_t transaction_id,
-					 const char *metadata_uuid,
-					 const char *pool_uuid,
-					 uint32_t data_block_size,
-					 uint64_t low_water_mark,
-					 unsigned skip_block_zeroing,
-					 unsigned crop_metadata);
-
 /* Supported messages for thin provision target */
 typedef enum {
 	DM_THIN_MESSAGE_CREATE_SNAP,		/* device_id, origin_id */
@@ -1328,7 +1271,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/datastruct/bitset.c
+++ b/device_mapper/datastruct/bitset.c
@@ -242,3 +242,18 @@ bad:
 	}
 	return NULL;
 }
+
+#if defined(__GNUC__)
+/*
+ * Maintain backward compatibility with older versions that did not
+ * accept a 'min_num_bits' argument to dm_bitset_parse_list().
+ */
+dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem);
+dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem)
+{
+	return dm_bitset_parse_list(str, mem, 0);
+}
+
+#else /* if defined(__GNUC__) */
+
+#endif
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -119,9 +119,6 @@ static struct cmd_data _cmd_data_v4[] = {
 #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 +202,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;
@@ -493,10 +490,7 @@ static void _dm_task_free_targets(struct dm_task *dmt)

 	for (t = dmt->head; t; t = n) {
 		n = t->next;
-		if (dmt->secure_data)
-			_dm_zfree_string(t->params);
-		else
-			free(t->params);
+		_dm_zfree_string(t->params);
 		free(t->type);
 		free(t);
 	}
@@ -507,10 +501,7 @@ static void _dm_task_free_targets(struct dm_task *dmt)
 void dm_task_destroy(struct dm_task *dmt)
 {
 	_dm_task_free_targets(dmt);
-	if (dmt->secure_data)
-		_dm_zfree_dmi(dmt->dmi.v4);
-	else
-		free(dmt->dmi.v4);
+	_dm_zfree_dmi(dmt->dmi.v4);
 	free(dmt->dev_name);
 	free(dmt->mangled_dev_name);
 	free(dmt->newname);
@@ -811,11 +802,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) {
@@ -1118,7 +1104,7 @@ static int _add_params(int type)

 static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 {
-	size_t min_size;
+	const size_t min_size = 16 * 1024;
 	const int (*version)[3];

 	struct dm_ioctl *dmi;
@@ -1137,18 +1123,6 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 	else if (dmt->head)
 		log_debug_activation(INTERNAL_ERROR "dm '%s' ioctl should not define parameters.",
 				     _cmd_data_v4[dmt->type].name);
-	switch (dmt->type) {
-	case DM_DEVICE_CREATE:
-	case DM_DEVICE_DEPS:
-	case DM_DEVICE_LIST:
-	case DM_DEVICE_STATUS:
-	case DM_DEVICE_TABLE:
-	case DM_DEVICE_TARGET_MSG:
-		min_size = 16 * 1024;
-		break;
-	default:
-		min_size = 2 * 1024;
-	}

 	if (count && (dmt->sector || dmt->message)) {
 		log_error("targets and message are incompatible");
@@ -1352,7 +1326,7 @@ static int _process_mapper_dir(struct dm_task *dmt)
 	}

 	if (closedir(d))
-		log_sys_debug("closedir", dir);
+		log_sys_error("closedir", dir);

 	return r;
 }
@@ -1598,36 +1572,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 diff start %llu %llu type %s %s", task->major, task->minor,
-				   (unsigned long long)t1->start, (unsigned long long)t2->start, t1->type, t2->type);
+		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 diff length %llu %llu type %s %s", task->major, task->minor,
-				  (unsigned long long)t1->length, (unsigned long long)t2->length, t1->type, t2->type);
-			goto no_match;
-		}
-		if (strcmp(t1->type, t2->type)) {
-			log_debug("reload %u:%u diff type %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 diff params ignore for type %s",
-					  task->major, task->minor, t1->type);
-				log_debug("reload params1 %s", t1->params);
-				log_debug("reload params2 %s", t2->params);
-			} else {
-				log_debug("reload %u:%u diff params for type %s",
-					  task->major, task->minor, t1->type);
-				log_debug("reload params1 %s", t1->params);
-				log_debug("reload params2 %s", t2->params);
-				goto no_match;
-			}
-		}
-
 		t1 = t1->next;
 		t2 = t2->next;
 	}
@@ -2209,3 +2158,52 @@ void dm_lib_exit(void)
 	_version_ok = 1;
 	_version_checked = 0;
 }
+
+#if defined(__GNUC__)
+/*
+ * Maintain binary backward compatibility.
+ * Version script mechanism works with 'gcc' compatible compilers only.
+ */
+
+/*
+ * This following code is here to retain ABI compatibility after adding
+ * the field deferred_remove to struct dm_info in version 1.02.89.
+ *
+ * Binaries linked against version 1.02.88 of libdevmapper or earlier
+ * will use this function that returns dm_info without the
+ * deferred_remove field.
+ *
+ * Binaries compiled against version 1.02.89 onwards will use
+ * the new function dm_task_get_info_with_deferred_remove due to the
+ * #define.
+ *
+ * N.B. Keep this function at the end of the file to make sure that
+ * no code in this file accidentally calls it.
+ */
+
+int dm_task_get_info_base(struct dm_task *dmt, struct dm_info *info);
+int dm_task_get_info_base(struct dm_task *dmt, struct dm_info *info)
+{
+	struct dm_info new_info;
+
+	if (!dm_task_get_info(dmt, &new_info))
+		return 0;
+
+	memcpy(info, &new_info, offsetof(struct dm_info, deferred_remove));
+
+	return 1;
+}
+
+int dm_task_get_info_with_deferred_remove(struct dm_task *dmt, struct dm_info *info);
+int dm_task_get_info_with_deferred_remove(struct dm_task *dmt, struct dm_info *info)
+{
+	struct dm_info new_info;
+
+	if (!dm_task_get_info(dmt, &new_info))
+		return 0;
+
+	memcpy(info, &new_info, offsetof(struct dm_info, internal_suspend));
+
+	return 1;
+}
+#endif
--- 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
@@ -382,7 +382,7 @@ static int _find_dm_name_of_device(dev_t st_rdev, char *buf, size_t buf_len)
 	}

 	if (closedir(d))
-		log_sys_debug("closedir", _dm_dir);
+		log_sys_error("closedir", _dm_dir);

 	return r;
 }
@@ -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)
@@ -931,7 +931,7 @@ int dm_task_add_target(struct dm_task *dmt, uint64_t start, uint64_t size,

 #ifdef HAVE_SELINUX
 static int _selabel_lookup(const char *path, mode_t mode,
-			   char **scontext)
+			   security_context_t *scontext)
 {
 #ifdef HAVE_SELINUX_LABEL_H
 	if (!_selabel_handle &&
@@ -974,7 +974,7 @@ static int _is_selinux_enabled(void)
 int dm_prepare_selinux_context(const char *path, mode_t mode)
 {
 #ifdef HAVE_SELINUX
-	char *scontext = NULL;
+	security_context_t scontext = NULL;

 	if (_is_selinux_enabled() <= 0)
 		return 1;
@@ -1002,7 +1002,7 @@ int dm_prepare_selinux_context(const char *path, mode_t mode)
 int dm_set_selinux_context(const char *path, mode_t mode)
 {
 #ifdef HAVE_SELINUX
-	char *scontext = NULL;
+	security_context_t scontext = NULL;

 	if (_is_selinux_enabled() <= 0)
 		return 1;
@@ -1224,7 +1224,7 @@ int get_dev_node_read_ahead(const char *dev_name, uint32_t major, uint32_t minor
 	int len;
 	int r = 1;
 	int fd;
-	long read_ahead_long = 0;
+	long read_ahead_long;

 	/*
 	 * If we know the device number, use sysfs if we can.
@@ -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)
@@ -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;
@@ -599,7 +597,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
 		match(TOK_IDENTIFIER);
 	}

-	if (!*str) {
+	if (!strlen(str)) {
 		log_error("Parse error at byte %" PRIptrdiff_t " (line %d): empty section identifier",
 			  p->tb - p->fb + 1, p->line);
 		return NULL;
@@ -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;
@@ -983,7 +971,7 @@ static const char *_find_config_str(const void *start, node_lookup_fn find_fn,
 	}

 	if (fail)
-		log_very_verbose("%s not found in config: defaulting to \"%s\"",
+		log_very_verbose("%s not found in config: defaulting to %s",
 				 path, fail);
 	return fail;
 }
--- a/device_mapper/libdm-deptree.c
+++ b/device_mapper/libdm-deptree.c
@@ -38,7 +38,6 @@ enum {
 	SEG_STRIPED,
 	SEG_ZERO,
 	SEG_WRITECACHE,
-	SEG_INTEGRITY,
 	SEG_THIN_POOL,
 	SEG_THIN,
 	SEG_VDO,
@@ -79,7 +78,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" },
@@ -223,11 +221,6 @@ struct load_segment {
 	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 */
 };

 /* Per-device properties */
@@ -274,16 +267,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
@@ -380,13 +363,13 @@ struct dm_tree *dm_tree_create(void)
 	dtree->mem = dmem;
 	dtree->optional_uuid_suffixes = NULL;

-	if (!(dtree->devs = dm_hash_create(61))) {
+	if (!(dtree->devs = dm_hash_create(8))) {
 		log_error("dtree hash creation failed");
 		dm_pool_destroy(dtree->mem);
 		return NULL;
 	}

-	if (!(dtree->uuids = dm_hash_create(31))) {
+	if (!(dtree->uuids = dm_hash_create(32))) {
 		log_error("dtree uuid hash creation failed");
 		dm_hash_destroy(dtree->devs);
 		dm_pool_destroy(dtree->mem);
@@ -1589,37 +1572,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 +1620,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;
@@ -2136,7 +2081,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 +2130,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)) {
@@ -2382,7 +2350,7 @@ static int _mirror_emit_segment_line(struct dm_task *dmt, struct load_segment *s

 	EMIT_PARAMS(pos, " %u ", seg->mirror_area_count);

-	if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
+	if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0)
 		return_0;

 	if (handle_errors)
@@ -2584,7 +2552,7 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major,
 	/* Print number of metadata/data device pairs */
 	EMIT_PARAMS(pos, " %u", area_count);

-	if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
+	if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0)
 		return_0;

 	return 1;
@@ -2685,10 +2653,6 @@ static int _writecache_emit_segment_line(struct dm_task *dmt,
 		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;

@@ -2732,14 +2696,6 @@ static int _writecache_emit_segment_line(struct dm_task *dmt,
 		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,
@@ -2749,87 +2705,6 @@ static int _writecache_emit_segment_line(struct dm_task *dmt,
 	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);
-
-	if (!dm_task_secure_data(dmt))
-		stack;
-
-	return 1;
-}
-
 static int _thin_pool_emit_segment_line(struct dm_task *dmt,
 					struct load_segment *seg,
 					char *params, size_t paramsize)
@@ -2880,7 +2755,7 @@ static int _vdo_emit_segment_line(struct dm_task *dmt,
 		    "maxDiscard %u 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.minimum_io_size,
 		    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" ,
@@ -2930,6 +2805,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 			      size_t paramsize)
 {
 	int pos = 0;
+	int r;
 	int target_type_is_raid = 0;
 	char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE];

@@ -2940,7 +2816,8 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 		break;
 	case SEG_MIRRORED:
 		/* Mirrors are pretty complicated - now in separate function */
-		if (!_mirror_emit_segment_line(dmt, seg, params, paramsize))
+		r = _mirror_emit_segment_line(dmt, seg, params, paramsize);
+		if (!r)
 			return_0;
 		break;
 	case SEG_SNAPSHOT:
@@ -2961,7 +2838,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 		EMIT_PARAMS(pos, "%u %u ", seg->area_count, seg->stripe_size);
 		break;
 	case SEG_VDO:
-		if (!_vdo_emit_segment_line(dmt, seg, params, paramsize))
+		if (!(r = _vdo_emit_segment_line(dmt, seg, params, paramsize)))
 		      return_0;
 		break;
 	case SEG_CRYPT:
@@ -2990,8 +2867,9 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
 	case SEG_RAID6_LA_6:
 	case SEG_RAID6_RA_6:
 		target_type_is_raid = 1;
-		if (!_raid_emit_segment_line(dmt, major, minor, seg, seg_start,
-					     params, paramsize))
+		r = _raid_emit_segment_line(dmt, major, minor, seg, seg_start,
+					    params, paramsize);
+		if (!r)
 			return_0;

 		break;
@@ -3011,10 +2889,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,14 +2901,14 @@ 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:
 	case SEG_STRIPED:
-		if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
-			return_0;
-
+		if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) {
+			stack;
+			return r;
+		}
 		if (!params[0]) {
 			log_error("No parameters supplied for %s target "
 				  "%u:%u.", _dm_segtypes[seg->type].target,
@@ -3131,9 +3005,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)
@@ -3152,8 +3023,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.)");

@@ -3205,16 +3076,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)
@@ -3244,7 +3105,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 */
@@ -3254,22 +3115,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)
@@ -3280,19 +3147,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;
 			}
@@ -3862,48 +3738,6 @@ int dm_tree_node_add_writecache_target(struct dm_tree_node *node,
 	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;
-}
-
 int dm_tree_node_add_replicator_target(struct dm_tree_node *node,
 				       uint64_t size,
 				       const char *rlog_uuid,
@@ -3977,24 +3811,6 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node,
 				      uint32_t data_block_size,
 				      uint64_t low_water_mark,
 				      unsigned skip_block_zeroing)
-{
-	return dm_tree_node_add_thin_pool_target_v1(node, size, transaction_id,
-						    metadata_uuid, pool_uuid,
-						    data_block_size,
-						    low_water_mark,
-						    skip_block_zeroing,
-						    1);
-}
-
-int dm_tree_node_add_thin_pool_target_v1(struct dm_tree_node *node,
-					 uint64_t size,
-					 uint64_t transaction_id,
-					 const char *metadata_uuid,
-					 const char *pool_uuid,
-					 uint32_t data_block_size,
-					 uint64_t low_water_mark,
-					 unsigned skip_block_zeroing,
-					 unsigned crop_metadata)
 {
 	struct load_segment *seg, *mseg;
 	uint64_t devsize = 0;
@@ -4022,18 +3838,17 @@ int dm_tree_node_add_thin_pool_target_v1(struct dm_tree_node *node,
 	if (!_link_tree_nodes(node, seg->metadata))
 		return_0;

-	if (crop_metadata)
-		/* FIXME: more complex target may need more tweaks */
-		dm_list_iterate_items(mseg, &seg->metadata->props.segs) {
-			devsize += mseg->size;
-			if (devsize > DM_THIN_MAX_METADATA_SIZE) {
-				log_debug_activation("Ignoring %" PRIu64 " of device.",
-						     devsize - DM_THIN_MAX_METADATA_SIZE);
-				mseg->size -= (devsize - DM_THIN_MAX_METADATA_SIZE);
-				devsize = DM_THIN_MAX_METADATA_SIZE;
-				/* FIXME: drop remaining segs */
-			}
+	/* FIXME: more complex target may need more tweaks */
+	dm_list_iterate_items(mseg, &seg->metadata->props.segs) {
+		devsize += mseg->size;
+		if (devsize > DM_THIN_MAX_METADATA_SIZE) {
+			log_debug_activation("Ignoring %" PRIu64 " of device.",
+					     devsize - DM_THIN_MAX_METADATA_SIZE);
+			mseg->size -= (devsize - DM_THIN_MAX_METADATA_SIZE);
+			devsize = DM_THIN_MAX_METADATA_SIZE;
+			/* FIXME: drop remaining segs */
 		}
+	}

 	if (!(seg->pool = dm_tree_find_node_by_uuid(node->dtree, pool_uuid))) {
 		log_error("Missing pool uuid %s.", pool_uuid);
@@ -4328,9 +4143,63 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
 	dnode->callback_data = data;
 }

+#if defined(__GNUC__)
+/*
+ * Backward compatible implementations.
+ *
+ * Keep these at the end of the file to make sure that
+ * no code in this file accidentally calls it.
+ */
+
+/* Backward compatible dm_tree_node_size_changed() implementations. */
+int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode);
+int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode)
+{
+	/* Base does not make difference between smaller and bigger */
+	return dm_tree_node_size_changed(dnode) ? 1 : 0;
+}
+
+/*
+ * Retain ABI compatibility after adding the DM_CACHE_FEATURE_METADATA2
+ * in version 1.02.138.
+ *
+ * Binaries compiled against version 1.02.138 onwards will use
+ * the new function dm_tree_node_add_cache_target which detects unknown
+ * feature flags and returns error for them.
+ */
+int dm_tree_node_add_cache_target_base(struct dm_tree_node *node,
+				       uint64_t size,
+				       uint64_t feature_flags, /* DM_CACHE_FEATURE_* */
+				       const char *metadata_uuid,
+				       const char *data_uuid,
+				       const char *origin_uuid,
+				       const char *policy_name,
+				       const struct dm_config_node *policy_settings,
+				       uint32_t data_block_size);
+int dm_tree_node_add_cache_target_base(struct dm_tree_node *node,
+				       uint64_t size,
+				       uint64_t feature_flags,
+				       const char *metadata_uuid,
+				       const char *data_uuid,
+				       const char *origin_uuid,
+				       const char *policy_name,
+				       const struct dm_config_node *policy_settings,
+				       uint32_t data_block_size)
+{
+	/* Old version supported only these FEATURE bits, others were ignored so masked them */
+	static const uint64_t _mask =
+		DM_CACHE_FEATURE_WRITEBACK |
+		DM_CACHE_FEATURE_WRITETHROUGH |
+		DM_CACHE_FEATURE_PASSTHROUGH;
+
+	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);
+}
+#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)
@@ -4352,7 +4221,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_name = node->name;
 	seg->vdo_data_size = data_size;

 	node->props.send_messages = 2;
--- a/device_mapper/libdm-file.c
+++ b/device_mapper/libdm-file.c
@@ -110,7 +110,7 @@ int dm_is_empty_dir(const char *dir)
 	DIR *d;

 	if (!(d = opendir(dir))) {
-		log_sys_debug("opendir", dir);
+		log_sys_error("opendir", dir);
 		return 0;
 	}

@@ -119,7 +119,7 @@ int dm_is_empty_dir(const char *dir)
 			break;

 	if (closedir(d))
-		log_sys_debug("closedir", dir);
+		log_sys_error("closedir", dir);

 	return dirent ? 0 : 1;
 }
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -492,7 +492,7 @@ static int _report_field_string_list(struct dm_report *rh,
 		delimiter = ",";
 	delimiter_len = strlen(delimiter);

-	i = pos = 0;
+	i = pos = len = 0;
 	dm_list_iterate_items(sl, data) {
 		arr[i].str = sl->str;
 		if (!sort) {
@@ -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(" ");
@@ -2474,7 +2473,7 @@ dm_percent_t dm_make_percent(uint64_t numerator, uint64_t denominator)

 int dm_report_value_cache_set(struct dm_report *rh, const char *name, const void *data)
 {
-	if (!rh->value_cache && (!(rh->value_cache = dm_hash_create(63)))) {
+	if (!rh->value_cache && (!(rh->value_cache = dm_hash_create(64)))) {
 		log_error("Failed to create cache for values used during reporting.");
 		return 0;
 	}
@@ -3774,7 +3773,7 @@ static struct selection_node *_parse_selection(struct dm_report *rh,
 	struct field_selection *fs;
 	struct selection_node *sn;
 	const char *ws, *we; /* field name */
-	const char *vs = NULL, *ve = NULL; /* value */
+	const char *vs, *ve; /* value */
 	const char *last;
 	uint32_t flags, field_num;
 	int implicit;
--- 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/mm/pool.c
+++ b/device_mapper/mm/pool.c
@@ -98,7 +98,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/target.h
+++ b/device_mapper/vdo/target.h
@@ -74,7 +74,7 @@ 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 minimum_io_size;
 	uint32_t block_map_cache_size_mb;
 	uint32_t block_map_era_length;	// format period

--- a/device_mapper/vdo/vdo_target.c
+++ b/device_mapper/vdo/vdo_target.c
@@ -23,9 +23,8 @@ 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)) {
+	if ((vtp->minimum_io_size != 512) &&
+	    (vtp->minimum_io_size != 4096)) {
 		log_error("VDO minimum io size %u is unsupported.",
 			  vtp->minimum_io_size);
 		valid = false;
--- a/doc/kernel/integrity.txt
+++ b/doc/kernel/integrity.txt
@@ -94,7 +94,7 @@ journal_watermark:number

 commit_time:number
 	Commit time in milliseconds. When this time passes, the journal is
-	written. The journal is also written immediately if the FLUSH
+	written. The journal is also written immediatelly if the FLUSH
 	request is received.

 internal_hash:algorithm(:key)	(the key is optional)
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,3 +1 @@
 *.h
-.symlinks
-.symlinks_created
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -126,15 +126,9 @@
 /* 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

-/* Define to use GNU versioning in the shared library. */
-#undef GNU_SYMVER
-
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM

@@ -157,9 +151,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

@@ -185,9 +176,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/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 +292,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,27 +525,18 @@
 /* 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

 /* Define to 1 to include code that uses lvmlockd sanlock option. */
 #undef LOCKDSANLOCK_SUPPORT

-/* Define to 1 to include code that uses lvmlockd IDM option. */
-#undef LOCKDIDM_SUPPORT
-
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
   slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -15,13 +15,11 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-abs_srcdir = @abs_srcdir@

 SOURCES =\
 	activate/activate.c \
 	cache/lvmcache.c \
 	writecache/writecache.c \
-	integrity/integrity.c \
 	cache_segtype/cache.c \
 	commands/toolcontext.c \
 	config/config.c \
@@ -30,7 +28,6 @@ SOURCES =\
 	device/bcache.c \
 	device/bcache-utils.c \
 	device/dev-cache.c \
-	device/device_id.c \
 	device/dev-ext.c \
 	device/dev-io.c \
 	device/dev-md.c \
@@ -54,7 +51,6 @@ SOURCES =\
 	filters/filter-usable.c \
 	filters/filter-internal.c \
 	filters/filter-signature.c \
-	filters/filter-deviceid.c \
 	format_text/archive.c \
 	format_text/archiver.c \
 	format_text/export.c \
@@ -70,16 +66,14 @@ SOURCES =\
 	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 \
 	metadata/metadata.c \
+	metadata/read.c \
 	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 \
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -29,7 +29,6 @@
 #include "lib/metadata/segtype.h"
 #include "lib/misc/sharedlib.h"
 #include "lib/metadata/metadata.h"
-#include "lib/misc/lvm-signal.h"

 #include <limits.h>
 #include <fcntl.h>
@@ -178,22 +177,6 @@ int lv_passes_auto_activation_filter(struct cmd_context *cmd, struct logical_vol
 	return _lv_passes_volumes_filter(cmd, lv, cn, activation_auto_activation_volume_list_CFG);
 }

-static int _passes_readonly_filter(struct cmd_context *cmd,
-				   const struct logical_volume *lv)
-{
-	const struct dm_config_node *cn;
-
-	if (!(cn = find_config_tree_array(cmd, activation_read_only_volume_list_CFG, NULL)))
-		return 0;
-
-	return _lv_passes_volumes_filter(cmd, lv, cn, activation_read_only_volume_list_CFG);
-}
-
-int lv_passes_readonly_filter(const struct logical_volume *lv)
-{
-	return _passes_readonly_filter(lv->vg->cmd, lv);
-}
-
 #ifndef DEVMAPPER_SUPPORT
 void set_activation(int act, int silent)
 {
@@ -202,8 +185,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;
 }
@@ -238,13 +221,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)
 {
@@ -291,21 +284,18 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
 {
 	return 0;
 }
-int lv_raid_status(const struct logical_volume *lv, struct lv_status_raid **status)
+int lv_thin_pool_percent(const struct logical_volume *lv, int metadata,
+			 dm_percent_t *percent)
 {
 	return 0;
 }
-int lv_writecache_message(const struct logical_volume *lv, const char *msg)
+int lv_thin_percent(const struct logical_volume *lv, int mapped,
+		    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)
-{
-	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;
 }
@@ -313,15 +303,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;
@@ -413,7 +394,7 @@ int add_areas_line(struct dev_manager *dm, struct lv_segment *seg,
 {
        return 0;
 }
-int device_is_usable(struct device *dev, struct dev_usable_check_params check, int *is_lv)
+int device_is_usable(struct device *dev, struct dev_usable_check_params check)
 {
        return 0;
 }
@@ -476,6 +457,17 @@ static int _passes_activation_filter(struct cmd_context *cmd,
 	return _lv_passes_volumes_filter(cmd, lv, cn, activation_volume_list_CFG);
 }

+static int _passes_readonly_filter(struct cmd_context *cmd,
+				   const struct logical_volume *lv)
+{
+	const struct dm_config_node *cn;
+
+	if (!(cn = find_config_tree_array(cmd, activation_read_only_volume_list_CFG, NULL)))
+		return 0;
+
+	return _lv_passes_volumes_filter(cmd, lv, cn, activation_read_only_volume_list_CFG);
+}
+
 int library_version(char *version, size_t size)
 {
 	if (!activation())
@@ -574,9 +566,13 @@ int module_present(struct cmd_context *cmd, const char *target_name)
 	}

 #ifdef MODPROBE_CMD
-	if (strcmp(target_name, TARGET_NAME_VDO) == 0)
-		argv[1] = MODULE_NAME_VDO; /* ATM kvdo is without dm- prefix */
-	else if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) {
+	if (strcmp(target_name, MODULE_NAME_VDO) == 0) {
+		argv[1] = target_name;		/* ATM kvdo is without dm- prefix */
+		if ((ret = exec_cmd(cmd, argv, NULL, 0)))
+			return ret;
+	}
+
+	if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) {
 		log_error("module_present module name too long: %s",
 			  target_name);
 		return 0;
@@ -624,7 +620,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;

@@ -642,7 +638,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;
@@ -655,9 +651,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;

@@ -686,16 +681,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);
 }

 /*
@@ -725,16 +711,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 */
 		}
@@ -743,10 +729,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;
 	}

@@ -759,13 +745,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;
 	}

@@ -774,11 +760,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));
 				/*
@@ -796,48 +781,33 @@ 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
 #define OPEN_COUNT_CHECK_USLEEP_DELAY 200000

 /* Only report error if error_if_used is set */
-/* Returns 0 if in use,  1 if it is unused, 2 when it is not present in table */
 int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used)
 {
 	struct lvinfo info;
 	unsigned int open_count_check_retries;

-	if (!lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) || !info.exists)
-		return 2;
-	else if (!info.open_count)
+	if (!lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) || !info.exists || !info.open_count)
 		return 1;

 	/* If sysfs is not used, use open_count information only. */
@@ -864,24 +834,25 @@ int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used)
 	}

 	open_count_check_retries = retry_deactivation() ? OPEN_COUNT_CHECK_RETRIES : 1;
-	while (open_count_check_retries--) {
-		if (interruptible_usleep(OPEN_COUNT_CHECK_USLEEP_DELAY))
-			break;  /* interrupted */
+	while (info.open_count > 0 && open_count_check_retries--) {
+		if (!open_count_check_retries) {
+			if (error_if_used)
+				log_error("Logical volume %s in use.", display_lvname(lv));
+			else
+				log_debug_activation("Logical volume %s in use.", display_lvname(lv));
+			return 0;
+		}

+		usleep(OPEN_COUNT_CHECK_USLEEP_DELAY);
 		log_debug_activation("Retrying open_count check for %s.",
 				     display_lvname(lv));
-		if (!lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) || !info.exists) {
+		if (!lv_info(lv->vg->cmd, lv, 0, &info, 1, 0)) {
 			stack; /* device dissappeared? */
-			return 1;
-		} else if (!info.open_count)
-			return 1;
+			break;
+		}
 	}

-	if (error_if_used)
-		log_error("Logical volume %s in use.", display_lvname(lv));
-	else
-		log_debug_activation("Logical volume %s in use.", display_lvname(lv));
-	return 0;
+	return 1;
 }

 /*
@@ -972,28 +943,35 @@ int lv_raid_percent(const struct logical_volume *lv, dm_percent_t *percent)

 int lv_raid_data_offset(const struct logical_volume *lv, uint64_t *data_offset)
 {
-	struct lv_status_raid *raid_status;
+	int r;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;

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

 	log_debug_activation("Checking raid data offset and dev sectors for LV %s/%s",
 			     lv->vg->name, lv->name);
+	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
+		return_0;

-	if (!lv_raid_status(lv, &raid_status))
-                return_0;
+	if (!(r = dev_manager_raid_status(dm, lv, &status))) {
+		dev_manager_destroy(dm);
+		return_0;
+	}

-	*data_offset = raid_status->raid->data_offset;
+	*data_offset = status->data_offset;

-	dm_pool_destroy(raid_status->mem);
+	dev_manager_destroy(dm);

-	return 1;
+	return r;
 }

 int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
 {
-	int r = 1;
-	struct lv_status_raid *raid_status;
+	int r;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;

 	*dev_health = NULL;

@@ -1003,23 +981,25 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
 	log_debug_activation("Checking raid device health for LV %s.",
 			     display_lvname(lv));

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

-	if (!(*dev_health = dm_pool_strdup(lv->vg->cmd->mem,
-					  raid_status->raid->dev_health))) {
-		stack;
-                r = 0;
+	if (!(r = dev_manager_raid_status(dm, lv, &status)) ||
+	    !(*dev_health = dm_pool_strdup(lv->vg->cmd->mem,
+					   status->dev_health))) {
+		dev_manager_destroy(dm);
+		return_0;
 	}

-	dm_pool_destroy(raid_status->mem);
+	dev_manager_destroy(dm);

 	return r;
 }

 int lv_raid_dev_count(const struct logical_volume *lv, uint32_t *dev_cnt)
 {
-	struct lv_status_raid *raid_status;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;

 	*dev_cnt = 0;

@@ -1028,20 +1008,24 @@ int lv_raid_dev_count(const struct logical_volume *lv, uint32_t *dev_cnt)

 	log_debug_activation("Checking raid device count for LV %s/%s",
 			     lv->vg->name, lv->name);
-
-	if (!lv_raid_status(lv, &raid_status))
+	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
 		return_0;

-	*dev_cnt = raid_status->raid->dev_count;
+	if (!dev_manager_raid_status(dm, lv, &status)) {
+		dev_manager_destroy(dm);
+		return_0;
+	}
+	*dev_cnt = status->dev_count;

-	dm_pool_destroy(raid_status->mem);
+	dev_manager_destroy(dm);

 	return 1;
 }

 int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt)
 {
-	struct lv_status_raid *raid_status;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;

 	*cnt = 0;

@@ -1051,20 +1035,25 @@ int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt)
 	log_debug_activation("Checking raid mismatch count for LV %s.",
 			     display_lvname(lv));

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

-	*cnt = raid_status->raid->mismatch_count;
+	if (!dev_manager_raid_status(dm, lv, &status)) {
+		dev_manager_destroy(dm);
+		return_0;
+	}
+	*cnt = status->mismatch_count;

-	dm_pool_destroy(raid_status->mem);
+	dev_manager_destroy(dm);

 	return 1;
 }

 int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action)
 {
-	struct lv_status_raid *raid_status;
-	int r = 1;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;
+	char *action;

 	*sync_action = NULL;

@@ -1074,27 +1063,30 @@ int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action)
 	log_debug_activation("Checking raid sync_action for LV %s.",
 			     display_lvname(lv));

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

 	/* status->sync_action can be NULL if dm-raid version < 1.5.0 */
-	if (!raid_status->raid->sync_action ||
-	    !(*sync_action = dm_pool_strdup(lv->vg->cmd->mem,
-					    raid_status->raid->sync_action))) {
-		stack;
-		r = 0;
+	if (!dev_manager_raid_status(dm, lv, &status) ||
+	    !status->sync_action ||
+	    !(action = dm_pool_strdup(lv->vg->cmd->mem,
+				      status->sync_action))) {
+		dev_manager_destroy(dm);
+		return_0;
 	}

-	dm_pool_destroy(raid_status->mem);
+	*sync_action = action;

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

 int lv_raid_message(const struct logical_volume *lv, const char *msg)
 {
-	struct lv_status_raid *raid_status;
-	struct dev_manager *dm = NULL;
 	int r = 0;
+	struct dev_manager *dm;
+	struct dm_status_raid *status;

 	if (!seg_is_raid(first_seg(lv))) {
 		/*
@@ -1119,10 +1111,16 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
 		return 0;
 	}

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

-	if (!raid_status->raid->sync_action) {
+	if (!(r = dev_manager_raid_status(dm, lv, &status))) {
+		log_error("Failed to retrieve status of %s.",
+			  display_lvname(lv));
+		goto out;
+	}
+
+	if (!status->sync_action) {
 		log_error("Kernel driver does not support this action: %s", msg);
 		goto out;
 	}
@@ -1144,43 +1142,19 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
 		log_error("\"%s\" is not a supported sync operation.", msg);
 		goto out;
 	}
-	if (strcmp(raid_status->raid->sync_action, "idle")) {
+	if (strcmp(status->sync_action, "idle")) {
 		log_error("%s state is currently \"%s\".  Unable to switch to \"%s\".",
-			  display_lvname(lv), raid_status->raid->sync_action, msg);
+			  display_lvname(lv), status->sync_action, msg);
 		goto out;
 	}

-	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
-		return_0;
-
 	r = dev_manager_raid_message(dm, lv, msg);
 out:
-	if (dm)
-		dev_manager_destroy(dm);
-	dm_pool_destroy(raid_status->mem);
+	dev_manager_destroy(dm);

 	return r;
 }

-int lv_raid_status(const struct logical_volume *lv, struct lv_status_raid **status)
-{
-	struct dev_manager *dm;
-	int exists;
-
-	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
-		return_0;
-
-	if (!dev_manager_raid_status(dm, lv, status, &exists)) {
-		dev_manager_destroy(dm);
-		if (exists)
-			stack;
-		return 0;
-	}
-	/* User has to call dm_pool_destroy(status->mem)! */
-
-	return 1;
-}
-
 int lv_writecache_message(const struct logical_volume *lv, const char *msg)
 {
 	int r = 0;
@@ -1213,7 +1187,6 @@ int lv_cache_status(const struct logical_volume *cache_lv,
 {
 	struct dev_manager *dm;
 	struct lv_segment *cache_seg;
-	int exists;

 	if (lv_is_cache_pool(cache_lv)) {
 		if (dm_list_empty(&cache_lv->segs_using_this_lv) ||
@@ -1231,74 +1204,125 @@ int lv_cache_status(const struct logical_volume *cache_lv,
 		return 0;
 	}

+	if (!lv_info(cache_lv->vg->cmd, cache_lv, 1, NULL, 0, 0)) {
+		log_error("Cannot check status for locally inactive cache volume %s.",
+			  display_lvname(cache_lv));
+		return 0;
+	}
+
+	log_debug_activation("Checking status for cache volume %s.",
+			     display_lvname(cache_lv));
+
 	if (!(dm = dev_manager_create(cache_lv->vg->cmd, cache_lv->vg->name, 1)))
 		return_0;

-	if (!dev_manager_cache_status(dm, cache_lv, status, &exists)) {
+	if (!dev_manager_cache_status(dm, cache_lv, status)) {
 		dev_manager_destroy(dm);
-		if (exists)
-			stack;
-		return 0;
+		return_0;
 	}
 	/* User has to call dm_pool_destroy(status->mem)! */

 	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;
-	int exists;
+
+	if (!lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
+		return 0;
+
+	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, &exists)) {
-		dev_manager_destroy(dm);
-		if (exists)
-			stack;
-		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;
-	int exists;
+
+	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
+		return 0;
+
+	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, &exists)) {
-		dev_manager_destroy(dm);
-		if (exists)
-			stack;
+	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;
-	}

-	/* User has to call dm_pool_destroy(thin_status->mem)! */
+	log_debug_activation("Checking thin-pool transaction id for LV %s.",
+			     display_lvname(lv));

-	return 1;
+	if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
+		return_0;
+
+	if (!(r = dev_manager_thin_pool_status(dm, lv, &status, 0)))
+		stack;
+	else
+		*transaction_id = status->transaction_id;
+
+	dev_manager_destroy(dm);
+
+	return r;
 }

 int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id)
 {
-	struct dev_manager *dm;
-	int exists;
 	int r;
+	struct dev_manager *dm;
+
+	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
+		return 0;
+
+	log_debug_activation("Checking device id for LV %s.",
+			     display_lvname(lv));

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

-	if (!(r = dev_manager_thin_device_id(dm, lv, device_id, &exists)))
-		if (exists)
-			stack;
+	if (!(r = dev_manager_thin_device_id(dm, lv, device_id)))
+		stack;

 	dev_manager_destroy(dm);

@@ -1315,22 +1339,28 @@ int lv_thin_device_id(const struct logical_volume *lv, uint32_t *device_id)
 int lv_vdo_pool_status(const struct logical_volume *lv, int flush,
 		       struct lv_status_vdo **vdo_status)
 {
+	int r = 0;
 	struct dev_manager *dm;
-	int exists;
+
+	if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
+		return 0;
+
+	log_debug_activation("Checking VDO pool status for LV %s.",
+			     display_lvname(lv));

 	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, flush, vdo_status, &exists)) {
-		dev_manager_destroy(dm);
-		if (exists)
-			stack;
-		return 0;
-	}
+	if (!dev_manager_vdo_pool_status(dm, lv, vdo_status, flush))
+		goto_out;

 	/* User has to call dm_pool_destroy(vdo_status->mem) */
+	r = 1;
+out:
+	if (!r)
+		dev_manager_destroy(dm);

-	return 1;
+	return r;
 }

 int lv_vdo_pool_percent(const struct logical_volume *lv, dm_percent_t *percent)
@@ -1562,8 +1592,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
@@ -2026,6 +2054,12 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
 	if (!activation())
 		return 1;

+	/* Ignore origin_only unless LV is origin in both old and new metadata */
+	/* or LV is thin or thin pool volume */
+	if (!lv_is_thin_volume(lv) && !lv_is_thin_pool(lv) &&
+	    !(lv_is_origin(lv) && lv_is_origin(lv_pre)))
+		laopts->origin_only = 0;
+
 	if (test_mode()) {
 		_skip("Suspending %s%s.", display_lvname(lv),
 		      laopts->origin_only ? " origin without snapshots" : "");
@@ -2047,12 +2081,6 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,

 	lv_calculate_readahead(lv, NULL);

-	/* Ignore origin_only unless LV is origin in both old and new metadata */
-	/* or LV is thin or thin pool volume */
-	if (!lv_is_thin_volume(lv) && !lv_is_thin_pool(lv) &&
-	    !(lv_is_origin(lv) && lv_is_origin(lv_pre)))
-		laopts->origin_only = 0;
-
 	/*
 	 * Preload devices for the LV.
 	 * If the PVMOVE LV is being removed, it's only present in the old
@@ -2144,6 +2172,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))) {
 		/*
@@ -2185,23 +2215,16 @@ 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:
@@ -2221,8 +2244,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);
@@ -2274,9 +2297,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;

@@ -2336,8 +2356,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
 	};

@@ -2386,47 +2406,33 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi

 	log_debug_activation("Deactivating %s.", display_lvname(lv));

+	if (!lv_info(cmd, lv, 0, &info, 0, 0))
+		goto_out;
+
+	if (!info.exists) {
+		r = 1;
+		/* Check attached snapshot segments are also inactive */
+		dm_list_iterate(snh, &lv->snapshot_segs) {
+			if (!lv_info(cmd, dm_list_struct_base(snh, struct lv_segment, origin_list)->cow,
+				     0, &info, 0, 0))
+				goto_out;
+			if (info.exists) {
+				r = 0; /* Snapshot left in table? */
+				break;
+			}
+		}
+
+		if (r)
+			goto out;
+	}
+
 	if (lv_is_visible(lv) || lv_is_virtual_origin(lv) ||
 	    lv_is_merging_thin_snapshot(lv)) {
-		switch (lv_check_not_in_use(lv, 1)) {
-		case 0: goto_out;
-		case 2: goto no_exists;
-		}
+		if (!lv_check_not_in_use(lv, 1))
+			goto_out;

 		if (lv_is_origin(lv) && _lv_has_open_snapshots(lv))
 			goto_out;
-	} else {
-		if (!lv_info(cmd, lv, 0, &info, 0, 0))
-			goto_out;
-
-		if (!info.exists) {
-	no_exists:
-			r = 1;
-			/* Check attached snapshot segments are also inactive */
-			dm_list_iterate(snh, &lv->snapshot_segs) {
-				if (!lv_info(cmd, dm_list_struct_base(snh, struct lv_segment, origin_list)->cow,
-					     0, &info, 0, 0))
-					goto_out;
-				if (info.exists) {
-					r = 0; /* Snapshot left in table? */
-					break;
-				}
-			}
-
-			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;
-		}
 	}

 	if (!monitor_dev_for_events(cmd, lv, &laopts, 0))
@@ -2493,13 +2499,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.  "
@@ -2516,14 +2515,6 @@ 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));
@@ -2556,7 +2547,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;

 	/*
@@ -2823,7 +2814,7 @@ static int _deactivate_sub_lv_cb(struct logical_volume *lv, void *data)
 */
 int deactivate_lv_with_sub_lv(const struct logical_volume *lv)
 {
-	struct logical_volume *flv = NULL;
+	struct logical_volume *flv;

 	if (!deactivate_lv(lv->vg->cmd, lv)) {
 		log_error("Cannot deactivate logical volume %s.",
@@ -2833,7 +2824,7 @@ int deactivate_lv_with_sub_lv(const struct logical_volume *lv)

 	if (!for_each_sub_lv((struct logical_volume *)lv, _deactivate_sub_lv_cb, &flv)) {
 		log_error("Cannot deactivate subvolume %s of logical volume %s.",
-			  (flv) ? display_lvname(flv) : "", display_lvname(lv));
+			  display_lvname(flv), display_lvname(lv));
 		return 0;
 	}

@@ -2928,7 +2919,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,
@@ -188,15 +186,16 @@ 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_raid_status(const struct logical_volume *lv, struct lv_status_raid **status);
 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);
@@ -209,8 +208,6 @@ int lvs_in_vg_opened(const struct volume_group *vg);

 int lv_is_active(const struct logical_volume *lv);

-int lv_passes_readonly_filter(const struct logical_volume *lv);
-
 /* Check is any component LV is active */
 const struct logical_volume *lv_component_is_active(const struct logical_volume *lv);
 const struct logical_volume *lv_holder_is_active(const struct logical_volume *lv);
@@ -254,7 +251,7 @@ struct dev_usable_check_params {
 * Returns 1 if mapped device is not suspended, blocked or
 * is using a reserved name.
 */
-int device_is_usable(struct device *dev, struct dev_usable_check_params check, int *is_lv);
+int device_is_usable(struct device *dev, struct dev_usable_check_params check);

 /*
 * Declaration moved here from fs.h to keep header fs.h hidden
@@ -263,7 +260,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"
@@ -281,7 +277,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);

@@ -59,7 +59,7 @@ int dev_manager_mirror_percent(struct dev_manager *dm,
 			       dm_percent_t *percent, uint32_t *event_nr);
 int dev_manager_raid_status(struct dev_manager *dm,
 			    const struct logical_volume *lv,
-			    struct lv_status_raid **status, int *exists);
+			    struct dm_status_raid **status);
 int dev_manager_raid_message(struct dev_manager *dm,
 			     const struct logical_volume *lv,
 			     const char *msg);
@@ -68,19 +68,24 @@ int dev_manager_writecache_message(struct dev_manager *dm,
                                   const char *msg);
 int dev_manager_cache_status(struct dev_manager *dm,
 			     const struct logical_volume *lv,
-			     struct lv_status_cache **status, int *exists);
-int dev_manager_thin_status(struct dev_manager *dm,
-			    const struct logical_volume *lv, int flush,
-			    struct lv_status_thin **status, int *exists);
+			     struct lv_status_cache **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 *exist);
-int dev_manager_thin_pool_status(struct dev_manager *dm,
-				 const struct logical_volume *lv, int flush,
-				 struct lv_status_thin_pool **status, int *exists);
+			       uint32_t *device_id);
 int dev_manager_vdo_pool_status(struct dev_manager *dm,
-				const struct logical_volume *lv, int flush,
-				struct lv_status_vdo **status, int *exists);
+				const struct logical_volume *lv,
+				struct lv_status_vdo **vdo_status,
+				int flush);
 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,
@@ -104,4 +109,12 @@ 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);

+int get_cache_vol_meta_data(struct cmd_context *cmd,
+                                    struct logical_volume *lv,
+                                    struct logical_volume *pool_lv,
+                                    struct dm_info *info_meta, struct dm_info *info_data);
+
+int remove_cache_vol_meta_data(struct cmd_context *cmd,
+                                       struct dm_info *info_meta, struct dm_info *info_data);
+
 #endif
--- a/lib/activate/fs.c
+++ b/lib/activate/fs.c
@@ -76,7 +76,7 @@ static int _rm_dir(const char *dev_dir, const char *vg_name)
 		return 0;
 	}

-	if (dir_exists(vg_path) && dm_is_empty_dir(vg_path)) {
+	if (dir_exists(vg_path) && is_empty_dir(vg_path)) {
 		log_very_verbose("Removing directory %s", vg_path);
 		rmdir(vg_path);
 	}
@@ -93,7 +93,7 @@ static void _rm_blks(const char *dir)
 	DIR *d;

 	if (!(d = opendir(dir))) {
-		log_sys_debug("opendir", dir);
+		log_sys_error("opendir", dir);
 		return;
 	}

@@ -104,7 +104,7 @@ static void _rm_blks(const char *dir)
 			continue;

 		if (dm_snprintf(path, sizeof(path), "%s/%s", dir, name) == -1) {
-			log_debug("Couldn't create path for %s.", name);
+			log_error("Couldn't create path for %s", name);
 			continue;
 		}

@@ -113,12 +113,12 @@ static void _rm_blks(const char *dir)
 				continue;
 			log_very_verbose("Removing %s", path);
 			if (unlink(path) < 0)
-				log_sys_debug("unlink", path);
+				log_sys_error("unlink", path);
 		}
 	}

 	if (closedir(d))
-		log_sys_debug("closedir", dir);
+		log_sys_error("closedir", dir);
 }

 static int _mk_link(const char *dev_dir, const char *vg_name,
@@ -169,7 +169,7 @@ static int _mk_link(const char *dev_dir, const char *vg_name,

 			log_very_verbose("Removing %s", lvm1_group_path);
 			if (unlink(lvm1_group_path) < 0)
-				log_sys_debug("unlink", lvm1_group_path);
+				log_sys_error("unlink", lvm1_group_path);
 		}
 	}

@@ -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)
--- 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;
@@ -58,8 +63,6 @@ struct lvmcache_vgsummary {
 	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 lvmcache_init(struct cmd_context *cmd);
@@ -68,20 +71,18 @@ 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 lvmcache_info *lvmcache_add(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);
+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);
@@ -90,8 +91,12 @@ 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 +106,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);
@@ -159,18 +167,19 @@ 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,19 +188,40 @@ 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_dev_is_unchosen_duplicate(struct device *dev);
+
+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);

 int lvmcache_vginfo_has_pvid(struct lvmcache_vginfo *vginfo, char *pvid);

-uint64_t lvmcache_max_metadata_size_bytes(void);
-void lvmcache_save_metadata_size_bytes(uint64_t val);
-void lvmcache_save_metadata_size_percent(uint64_t meta_size, uint64_t mdah_size);
+/*
+ * 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);
+
+uint64_t lvmcache_max_metadata_size(void);
+void lvmcache_save_metadata_size(uint64_t val);

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

-bool lvmcache_has_bad_metadata(struct device *dev);
+int 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);
+int 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,
@@ -201,9 +231,9 @@ void lvmcache_get_outdated_mdas(struct cmd_context *cmd,
                                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);
+int 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);
@@ -211,24 +241,14 @@ void lvmcache_del_outdated_devs(struct cmd_context *cmd,
 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);
+			   const char *vgname, const char *vgid,
+			   struct dm_list *bad_mdas);

-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);
-
-void lvmcache_extra_md_component_checks(struct cmd_context *cmd);
-
-unsigned int lvmcache_vg_info_count(void);
-
-void set_scan_lock_global(struct cmd_context *cmd);
-int do_scan_lock_global(struct cmd_context *cmd, int *gl_ex);
+struct device *lvmcache_get_dump_src_dev(struct cmd_context *cmd, const char *vgname);

+struct metadata_area *lvmcache_get_mda(struct cmd_context *cmd,
+                                       const char *vgname,
+                                       struct device *dev,
+                                       int use_mda_num);

 #endif
--- a/lib/cache_segtype/cache.c
+++ b/lib/cache_segtype/cache.c
@@ -504,6 +504,9 @@ static int _cache_text_import(struct lv_segment *seg,

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

+	if (!attach_pool_lv(seg, pool_lv, NULL, NULL, NULL))
+		return_0;
+
 	if (!_settings_text_import(seg, sn))
 		return_0;

@@ -525,26 +528,17 @@ static int _cache_text_import(struct lv_segment *seg,
 		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");
-		}
+		if (!dm_config_get_str(sn, "metadata_id", &uuid))
+			return SEG_LOG_ERROR("Couldn't read 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 */
+		if (!id_read_format(&seg->metadata_id, uuid))
+			return SEG_LOG_ERROR("Couldn't format metadata_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");
 	} 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 */
@@ -552,9 +546,6 @@ static int _cache_text_import(struct lv_segment *seg,
 			_fix_missing_defaults(first_seg(pool_lv));
 	}

-	if (!attach_pool_lv(seg, pool_lv, NULL, NULL, NULL))
-		return_0;
-
 	return 1;
 }

@@ -590,17 +581,13 @@ static int _cache_text_export(const struct lv_segment *seg, struct formatter *f)
 		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 (!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);
-		}
+		if (!id_write_format(&seg->data_id, buffer, sizeof(buffer)))
+			return_0;
+		outf(f, "data_id = \"%s\"", buffer);
 	}

 	return 1;
@@ -708,13 +695,13 @@ static int _cache_add_target_line(struct dev_manager *dm,
 		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(&metadata_lvid.id[1], &seg->metadata_id, 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));
+		memcpy(&data_lvid.id[1], &seg->data_id, sizeof(struct id));

-		if (!(metadata_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&metadata_lvid.s, "cmeta")))
+		if (!(metadata_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&metadata_lvid.s, NULL)))
 			return_0;
-		if (!(data_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&data_lvid.s, "cdata")))
+		if (!(data_uuid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&data_lvid.s, NULL)))
 			return_0;
 	}

--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -32,7 +32,6 @@
 #include "lib/cache/lvmcache.h"
 #include "lib/format_text/archiver.h"
 #include "lib/lvmpolld/lvmpolld-client.h"
-#include "lib/device/device_id.h"

 #include <locale.h>
 #include <sys/stat.h>
@@ -230,7 +229,7 @@ static void _get_sysfs_dir(struct cmd_context *cmd, char *buf, size_t buf_size)
 		return;
 	}

-	(void) dm_strncpy(buf, sys_mnt, buf_size);
+	strncpy(buf, sys_mnt, buf_size);
 }

 static uint32_t _parse_debug_fields(struct cmd_context *cmd, int cfg, const char *cfgname)
@@ -661,8 +660,6 @@ static int _process_config(struct cmd_context *cmd)
 	 */
 	cmd->default_settings.udev_fallback = udev_disabled ? 1 : -1;

-	cmd->default_settings.issue_discards = find_config_tree_bool(cmd, devices_issue_discards_CFG, NULL);
-
 	init_retry_deactivation(find_config_tree_bool(cmd, activation_retry_deactivation_CFG, NULL));

 	init_activation_checks(find_config_tree_bool(cmd, activation_checks_CFG, NULL));
@@ -966,8 +963,8 @@ static void _destroy_config(struct cmd_context *cmd)
 	/* CONFIG_FILE/CONFIG_MERGED_FILES */
 	if ((cft = remove_config_tree_by_source(cmd, CONFIG_MERGED_FILES)))
 		config_destroy(cft);
-	else if ((cft = remove_config_tree_by_source(cmd, CONFIG_FILE)))
-		config_destroy(cft);
+	else
+		remove_config_tree_by_source(cmd, CONFIG_FILE);

 	dm_list_iterate_items(cfl, &cmd->config_files)
 		config_destroy(cfl->cft);
@@ -1069,7 +1066,7 @@ static int _init_dev_cache(struct cmd_context *cmd)
 	return 1;
 }

-#define MAX_FILTERS 11
+#define MAX_FILTERS 10

 static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
 {
@@ -1088,9 +1085,6 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
 	 * sysfs filter. Only available on 2.6 kernels.  Non-critical.
 	 * Listed first because it's very efficient at eliminating
 	 * unavailable devices.
-	 *
-	 * TODO: I suspect that using the lvm_type and device_id
-	 * filters before this one may be more efficient.
 	 */
 	if (find_config_tree_bool(cmd, devices_sysfs_scan_CFG, NULL)) {
 		if ((filters[nr_filt] = sysfs_filter_create()))
@@ -1106,7 +1100,7 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)

 	/* global regex filter. Optional. */
 	if ((cn = find_config_tree_node(cmd, devices_global_filter_CFG, NULL))) {
-		if (!(filters[nr_filt] = regex_filter_create(cn->v, 0, 1))) {
+		if (!(filters[nr_filt] = regex_filter_create(cn->v))) {
 			log_error("Failed to create global regex device filter");
 			goto bad;
 		}
@@ -1115,7 +1109,7 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)

 	/* regex filter. Optional. */
 	if ((cn = find_config_tree_node(cmd, devices_filter_CFG, NULL))) {
-		if (!(filters[nr_filt] = regex_filter_create(cn->v, 1, 0))) {
+		if (!(filters[nr_filt] = regex_filter_create(cn->v))) {
 			log_error("Failed to create regex device filter");
 			goto bad;
 		}
@@ -1129,13 +1123,6 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
 	}
 	nr_filt++;

-	/* filter based on the device_ids saved in the devices file */
-	if (!(filters[nr_filt] = deviceid_filter_create(cmd))) {
-		log_error("Failed to create deviceid device filter");
-		goto bad;
-	}
-	nr_filt++;
-
 	/* usable device filter. Required. */
 	if (!(filters[nr_filt] = usable_filter_create(cmd, cmd->dev_types, FILTER_MODE_NO_LVMETAD))) {
 		log_error("Failed to create usabled device filter");
@@ -1289,7 +1276,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;
@@ -1375,11 +1362,6 @@ static int _init_segtypes(struct cmd_context *cmd)
 		return 0;
 #endif

-#ifdef INTEGRITY_INTERNAL
-	if (!init_integrity_segtypes(cmd, &seglib))
-		return 0;
-#endif
-
 	return 1;
 }

@@ -1498,7 +1480,6 @@ int init_run_by_dmeventd(struct cmd_context *cmd)
 	init_dmeventd_monitor(DMEVENTD_MONITOR_IGNORE);
 	init_ignore_suspended_devices(1);
 	init_disable_dmeventd_monitoring(1); /* Lock settings */
-	cmd->run_by_dmeventd = 1;

 	return 0;
 }
@@ -1511,8 +1492,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);
 }
@@ -1541,9 +1520,6 @@ 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);
@@ -1612,7 +1588,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();

@@ -1692,9 +1667,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;

@@ -1731,8 +1703,6 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
 	if (!_init_dev_cache(cmd))
 		goto_out;

-	devices_file_init(cmd);
-
 	memlock_init(cmd);

 	if (!_init_formats(cmd))
@@ -1745,6 +1715,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;

@@ -1764,8 +1736,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);
@@ -1851,14 +1821,13 @@ int refresh_toolcontext(struct cmd_context *cmd)
 	 */

 	activation_release();
-	hints_exit(cmd);
+	hints_exit();
 	lvmcache_destroy(cmd, 0, 0);
 	label_scan_destroy(cmd);
 	label_exit();
 	_destroy_segtypes(&cmd->segtypes);
 	_destroy_formats(cmd, &cmd->formats);

-	devices_file_exit(cmd);
 	if (!dev_cache_exit())
 		stack;
 	_destroy_dev_types(cmd);
@@ -1938,8 +1907,6 @@ int refresh_toolcontext(struct cmd_context *cmd)
 	if (!_init_dev_cache(cmd))
 		return_0;

-	devices_file_init(cmd);
-
 	if (!_init_formats(cmd))
 		return_0;

@@ -1957,12 +1924,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;

@@ -1980,7 +1941,7 @@ void destroy_toolcontext(struct cmd_context *cmd)

 	archive_exit(cmd);
 	backup_exit(cmd);
-	hints_exit(cmd);
+	hints_exit();
 	lvmcache_destroy(cmd, 0, 0);
 	label_scan_destroy(cmd);
 	label_exit();
@@ -1989,7 +1950,6 @@ void destroy_toolcontext(struct cmd_context *cmd)
 	_destroy_filters(cmd);
 	if (cmd->mem)
 		dm_pool_destroy(cmd->mem);
-	devices_file_exit(cmd);
 	dev_cache_exit();
 	_destroy_dev_types(cmd);
 	_destroy_tags(cmd);
@@ -2004,8 +1964,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 */
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -39,7 +39,7 @@ struct config_info {
 	int udev_rules;
 	int udev_sync;
 	int udev_fallback;
-	int issue_discards;
+	int cache_vgmetadata;
 	const char *msg_prefix;
 	const char *fmt_name;
 	const char *dmeventd_executable;
@@ -148,12 +148,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;
@@ -162,9 +160,6 @@ struct cmd_context {
 	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 vg_notify:1;
 	unsigned lv_notify:1;
 	unsigned pv_notify:1;
@@ -174,7 +169,6 @@ 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 */
@@ -182,27 +176,12 @@ struct cmd_context {
 	unsigned pvscan_recreate_hints:1;	/* enable special case hint handling for pvscan --cache */
 	unsigned scan_lvs:1;
 	unsigned wipe_outdated_pvs:1;
-	unsigned enable_devices_list:1;		/* command is using --devices option */
-	unsigned enable_devices_file:1;		/* command is using devices file */
-	unsigned pending_devices_file:1;	/* command may create and enable devices file */
-	unsigned create_edit_devices_file:1;	/* command expects to create and/or edit devices file */
-	unsigned edit_devices_file:1;		/* command expects to edit devices file */
-	unsigned filter_deviceid_skip:1;	/* don't use filter-deviceid */
-	unsigned filter_regex_with_devices_file:1; /* use filter-regex even when devices file is enabled */
-	unsigned filter_nodata_only:1;          /* only use filters that do not require data from the dev */
-	unsigned run_by_dmeventd:1;		/* command is being run by dmeventd */
-	unsigned sysinit:1;			/* --sysinit is used */

 	/*
 	 * Devices and filtering.
 	 */
 	struct dev_filter *filter;
 	struct dm_list hints;
-	struct dm_list use_devices;		/* struct dev_use for each entry in devices file */
-	const char *md_component_checks;
-	const char *search_for_devnames;	/* config file setting */
-	const char *devicesfile;                /* from --devicesfile option */
-	struct dm_list deviceslist;             /* from --devices option, struct dm_str_list */

 	/*
 	 * Configuration.
@@ -234,7 +213,6 @@ struct cmd_context {
 	char system_dir[PATH_MAX];
 	char dev_dir[PATH_MAX];
 	char proc_dir[PATH_MAX];
-	char devices_file_path[PATH_MAX];

 	/*
 	 * Reporting.
@@ -254,9 +232,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 */
-	int early_lock_vg_mode;
+	struct dm_list unused_duplicate_devs; /* save preferences between lvmcache instances */
 };

 /*
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -503,10 +503,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 +515,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 +542,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 +573,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;
 }
@@ -710,7 +716,7 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd,
 		return array;
 	}

-	if (!(token = enc_value = strdup(def_enc_value))) {
+	if (!(p = token = enc_value = strdup(def_enc_value))) {
 		log_error("_get_def_array_values: strdup failed");
 		return NULL;
 	}
@@ -1141,10 +1147,8 @@ int config_def_check(struct cft_check_handle *handle)
 	 * sections and settings with full path as a key.
 	 * If section name is variable, use '#' as a substitute.
 	 */
-	*vp = 0;
-	*rp = 0;
 	if (!handle->cmd->cft_def_hash) {
-		if (!(handle->cmd->cft_def_hash = dm_hash_create(60))) {
+		if (!(handle->cmd->cft_def_hash = dm_hash_create(64))) {
 			log_error("Failed to create configuration definition hash.");
 			r = 0; goto out;
 		}
@@ -1710,7 +1714,6 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
 	const char *node_type_name = cn->v ? "option" : "section";
 	char path[CFG_PATH_MAX_LEN];
 	char commentline[MAX_COMMENT_LINE+1];
-	int is_deprecated = 0;

 	if (cn->id <= 0)
 		return 1;
@@ -1724,14 +1727,13 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi

 	cfg_def = cfg_def_get_item_p(cn->id);

-	is_deprecated = _def_node_is_deprecated(cfg_def, out->tree_spec);
-
 	if (out->tree_spec->withsummary || out->tree_spec->withcomments) {
 		_cfg_def_make_path(path, sizeof(path), cfg_def->id, cfg_def, 1);
 		fprintf(out->fp, "\n");
 		fprintf(out->fp, "%s# Configuration %s %s.\n", line, node_type_name, path);

-		if (out->tree_spec->withcomments && is_deprecated && cfg_def->deprecation_comment)
+		if (out->tree_spec->withcomments &&
+		    _def_node_is_deprecated(cfg_def, out->tree_spec))
 			fprintf(out->fp, "%s# %s", line, cfg_def->deprecation_comment);

 		if (cfg_def->comment) {
@@ -1742,14 +1744,14 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
 						continue;
 					commentline[0] = '\0';
 				}
-				fprintf(out->fp, "%s#%s%s\n", line, commentline[0] ? " " : "", commentline);
+				fprintf(out->fp, "%s# %s\n", line, commentline);
 				/* withsummary prints only the first comment line. */
 				if (!out->tree_spec->withcomments)
 					break;
 			}
 		}

-		if (is_deprecated)
+		if (_def_node_is_deprecated(cfg_def, out->tree_spec))
 			fprintf(out->fp, "%s# This configuration %s is deprecated.\n", line, node_type_name);

 		if (cfg_def->flags & CFG_ADVANCED)
@@ -1777,7 +1779,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
 			return_0;
 		fprintf(out->fp, "%s# Available since version %s.\n", line, version);

-		if (is_deprecated) {
+		if (_def_node_is_deprecated(cfg_def, out->tree_spec)) {
 			if (!_get_config_node_version(cfg_def->deprecated_since_version, version))
 				return_0;
 			fprintf(out->fp, "%s# Deprecated since version %s.\n", line, version);
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -288,33 +288,7 @@ cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, C
 	"preferred_names = [ \"^/dev/mpath/\", \"^/dev/mapper/mpath\", \"^/dev/[hs]d\" ]\n"
 	"#\n")

-cfg(devices_use_devicesfile_CFG, "use_devicesfile", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_DEVICES_FILE, vsn(2, 3, 12), NULL, 0, NULL,
-	"Enable or disable the use of a devices file.\n"
-	"When enabled, lvm will only use devices that\n"
-	"are lised in the devices file. A devices file will\n"
-	"be used, regardless of this setting, when the --devicesfile\n"
-	"option is set to a specific file name.\n")
-
-cfg(devices_devicesfile_CFG, "devicesfile", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DEVICES_FILE, vsn(2, 3, 12), NULL, 0, NULL,
-	"The name of the system devices file, listing devices that LVM should use.\n"
-	"This should not be used to select a non-system devices file.\n"
-	"The --devicesfile option is intended for alternative devices files.\n")
-
-cfg(devices_search_for_devnames_CFG, "search_for_devnames", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_SEARCH_FOR_DEVNAMES, vsn(2, 3, 12), NULL, 0, NULL,
-	"Look outside of the devices file for missing devname entries.\n"
-	"A devname entry is used for a device that does not have a stable\n"
-	"device id, e.g. wwid, so the unstable device name is used as\n"
-	"the device id. After reboot, or if the device is reattached,\n"
-	"the device name may change, in which case lvm will not find\n"
-	"the expected PV on the device listed in the devices file.\n"
-	"This setting controls whether lvm will search other devices,\n"
-	"outside the devices file, to look for the missing PV on a\n"
-	"renamed device. If \"none\", lvm will not look at other devices,\n"
-	"and the PV may appear to be missing. If \"auto\", lvm will look\n"
-	"at other devices, but only those that are likely to have the PV.\n"
-	"If \"all\", lvm will look at all devices on the system.\n")
-
-cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*|", vsn(1, 0, 0), NULL, 0, NULL,
+cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*/|", vsn(1, 0, 0), NULL, 0, NULL,
 	"Limit the block devices that are used by LVM commands.\n"
 	"This is a list of regular expressions used to accept or reject block\n"
 	"device path names. Each regex is delimited by a vertical bar '|'\n"
@@ -332,7 +306,7 @@ cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENT
 	"#\n"
 	"Example\n"
 	"Accept every block device:\n"
-	"filter = [ \"a|.*|\" ]\n"
+	"filter = [ \"a|.*/|\" ]\n"
 	"Reject the cdrom drive:\n"
 	"filter = [ \"r|/dev/cdrom|\" ]\n"
 	"Work with just loopback devices, e.g. for testing:\n"
@@ -340,10 +314,10 @@ cfg_array(devices_filter_CFG, "filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENT
 	"Accept all loop devices and ide drives except hdc:\n"
 	"filter = [ \"a|loop|\", \"r|/dev/hdc|\", \"a|/dev/ide|\", \"r|.*|\" ]\n"
 	"Use anchors to be very specific:\n"
-	"filter = [ \"a|^/dev/hda8$|\", \"r|.*|\" ]\n"
+	"filter = [ \"a|^/dev/hda8$|\", \"r|.*/|\" ]\n"
 	"#\n")

-cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*|", vsn(2, 2, 98), NULL, 0, NULL,
+cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "#Sa|.*/|", vsn(2, 2, 98), NULL, 0, NULL,
 	"Limit the block devices that are used by LVM system components.\n"
 	"Because devices/filter may be overridden from the command line, it is\n"
 	"not suitable for system-wide device filtering, e.g. udev.\n"
@@ -352,16 +326,16 @@ cfg_array(devices_global_filter_CFG, "global_filter", devices_CFG_SECTION, CFG_D
 	"global_filter are not opened by LVM.\n")

 cfg_runtime(devices_cache_CFG, "cache", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 0, 0), vsn(1, 2, 19), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg_runtime(devices_cache_dir_CFG, "cache_dir", devices_CFG_SECTION, 0, CFG_TYPE_STRING, vsn(1, 2, 19), vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(devices_cache_file_prefix_CFG, "cache_file_prefix", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, DEFAULT_CACHE_FILE_PREFIX, vsn(1, 2, 19), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(devices_write_cache_state_CFG, "write_cache_state", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg_array(devices_types_CFG, "types", devices_CFG_SECTION, CFG_DEFAULT_UNDEFINED | CFG_ADVANCED, CFG_TYPE_INT | CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL,
 	"List of additional acceptable block device types.\n"
@@ -394,30 +368,7 @@ cfg(devices_multipath_component_detection_CFG, "multipath_component_detection",
 	"Ignore devices that are components of DM multipath devices.\n")

 cfg(devices_md_component_detection_CFG, "md_component_detection", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MD_COMPONENT_DETECTION, vsn(1, 0, 18), NULL, 0, NULL,
-	"Enable detection and exclusion of MD component devices.\n"
-	"An MD component device is a block device that MD uses as part\n"
-	"of a software RAID virtual device. When an LVM PV is created\n"
-	"on an MD device, LVM must only use the top level MD device as\n"
-	"the PV, and should ignore the underlying component devices.\n"
-	"In cases where the MD superblock is located at the end of the\n"
-	"component devices, it is more difficult for LVM to consistently\n"
-	"identify an MD component, see the md_component_checks setting.\n")
-
-cfg(devices_md_component_checks_CFG, "md_component_checks", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_MD_COMPONENT_CHECKS, vsn(2, 3, 2), NULL, 0, NULL,
-	"The checks LVM should use to detect MD component devices.\n"
-	"MD component devices are block devices used by MD software RAID.\n"
-	"#\n"
-	"Accepted values:\n"
-	"  auto\n"
-	"    LVM will skip scanning the end of devices when it has other\n"
-	"    indications that the device is not an MD component.\n"
-	"  start\n"
-	"    LVM will only scan the start of devices for MD superblocks.\n"
-	"    This does not incur extra I/O by LVM.\n"
-	"  full\n"
-	"    LVM will scan the start and end of devices for MD superblocks.\n"
-	"    This requires an extra read at the end of devices.\n"
-	"#\n")
+	"Ignore devices that are components of software RAID (md) devices.\n")

 cfg(devices_fw_raid_component_detection_CFG, "fw_raid_component_detection", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FW_RAID_COMPONENT_DETECTION, vsn(2, 2, 112), NULL, 0, NULL,
 	"Ignore devices that are components of firmware RAID devices.\n"
@@ -427,15 +378,15 @@ cfg(devices_fw_raid_component_detection_CFG, "fw_raid_component_detection", devi
 cfg(devices_md_chunk_alignment_CFG, "md_chunk_alignment", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MD_CHUNK_ALIGNMENT, vsn(2, 2, 48), NULL, 0, NULL,
 	"Align the start of a PV data area with md device's stripe-width.\n"
 	"This applies if a PV is placed directly on an md device.\n"
-	"default_data_alignment will be overridden if it is not aligned\n"
+	"default_data_alignment will be overriden if it is not aligned\n"
 	"with the value detected for this setting.\n"
-	"This setting is overridden by data_alignment_detection,\n"
+	"This setting is overriden by data_alignment_detection,\n"
 	"data_alignment, and the --dataalignment option.\n")

 cfg(devices_default_data_alignment_CFG, "default_data_alignment", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, FIRST_PE_AT_ONE_MB_IN_MB, vsn(2, 2, 75), NULL, 0, NULL,
 	"Align the start of a PV data area with this number of MiB.\n"
 	"Set to 1 for 1MiB, 2 for 2MiB, etc. Set to 0 to disable.\n"
-	"This setting is overridden by data_alignment and the --dataalignment\n"
+	"This setting is overriden by data_alignment and the --dataalignment\n"
 	"option.\n")

 cfg(devices_data_alignment_detection_CFG, "data_alignment_detection", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_DATA_ALIGNMENT_DETECTION, vsn(2, 2, 51), NULL, 0, NULL,
@@ -447,9 +398,9 @@ cfg(devices_data_alignment_detection_CFG, "data_alignment_detection", devices_CF
 	"preferred unit of receiving I/O, e.g. MD stripe width.\n"
 	"minimum_io_size is used if optimal_io_size is undefined (0).\n"
 	"If md_chunk_alignment is enabled, that detects the optimal_io_size.\n"
-	"default_data_alignment and md_chunk_alignment will be overridden\n"
+	"default_data_alignment and md_chunk_alignment will be overriden\n"
 	"if they are not aligned with the value detected for this setting.\n"
-	"This setting is overridden by data_alignment and the --dataalignment\n"
+	"This setting is overriden by data_alignment and the --dataalignment\n"
 	"option.\n")

 cfg(devices_data_alignment_CFG, "data_alignment", devices_CFG_SECTION, 0, CFG_TYPE_INT, 0, vsn(2, 2, 45), NULL, 0, NULL,
@@ -457,7 +408,7 @@ cfg(devices_data_alignment_CFG, "data_alignment", devices_CFG_SECTION, 0, CFG_TY
 	"When non-zero, this setting overrides default_data_alignment.\n"
 	"Set to 0 to disable, in which case default_data_alignment\n"
 	"is used to align the first PE in units of MiB.\n"
-	"This setting is overridden by the --dataalignment option.\n")
+	"This setting is overriden by the --dataalignment option.\n")

 cfg(devices_data_alignment_offset_detection_CFG, "data_alignment_offset_detection", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_DATA_ALIGNMENT_OFFSET_DETECTION, vsn(2, 2, 50), NULL, 0, NULL,
 	"Shift the start of an aligned PV data area based on sysfs information.\n"
@@ -467,7 +418,7 @@ cfg(devices_data_alignment_offset_detection_CFG, "data_alignment_offset_detectio
 	"partitioning will have an alignment_offset of 3584 bytes (sector 7\n"
 	"is the lowest aligned logical block, the 4KiB sectors start at\n"
 	"LBA -1, and consequently sector 63 is aligned on a 4KiB boundary).\n"
-	"This setting is overridden by the --dataalignmentoffset option.\n")
+	"This setting is overriden by the --dataalignmentoffset option.\n")

 cfg(devices_ignore_suspended_devices_CFG, "ignore_suspended_devices", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_IGNORE_SUSPENDED_DEVICES, vsn(1, 2, 19), NULL, 0, NULL,
 	"Ignore DM devices that have I/O suspended while scanning devices.\n"
@@ -493,7 +444,7 @@ cfg(devices_ignore_lvm_mirrors_CFG, "ignore_lvm_mirrors", devices_CFG_SECTION, 0
 	"different way, making them a better choice for VG stacking.\n")

 cfg(devices_disable_after_error_count_CFG, "disable_after_error_count", devices_CFG_SECTION, 0, CFG_TYPE_INT, 0, vsn(2, 2, 75), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(devices_require_restorefile_with_uuid_CFG, "require_restorefile_with_uuid", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID, vsn(2, 2, 73), NULL, 0, NULL,
 	"Allow use of pvcreate --uuid without requiring --restorefile.\n")
@@ -528,11 +479,6 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_
 	"Enabling this setting allows the VG to be used as usual even with\n"
 	"uncertain devices.\n")

-cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 6), NULL, 0, NULL,
-	"Allow PVs in the same VG with different logical block sizes.\n"
-	"When allowed, the user is responsible to ensure that an LV is\n"
-	"using PVs with matching block sizes when necessary.\n")
-
 cfg_array(allocation_cling_tag_list_CFG, "cling_tag_list", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 77), NULL, 0, NULL,
 	"Advise LVM which PVs to use when searching for new space.\n"
 	"When searching for free space to extend an LV, the 'cling' allocation\n"
@@ -594,7 +540,7 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio
 	"stripes to use.\n"
 	"This was the default behaviour until release 2.02.162.\n")

-cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL,
+cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL,
 	"Cache pool metadata and data will always use different PVs.\n")

 cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128),
@@ -651,13 +597,8 @@ cfg(allocation_cache_pool_max_chunks_CFG, "cache_pool_max_chunks", allocation_CF
 	"For cache target v1.9 the recommended maximumm is 1000000 chunks.\n"
 	"Using cache pool with more chunks may degrade cache performance.\n")

-cfg(allocation_thin_pool_metadata_require_separate_pvs_CFG, "thin_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 89), NULL, 0, NULL,
-	"Thin pool metadata and data will always use different PVs.\n")
-
-cfg(allocation_thin_pool_crop_metadata_CFG, "thin_pool_crop_metadata", allocation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_CROP_METADATA, vsn(2, 3, 12), NULL, 0, NULL,
-	"Older version of lvm2 cropped pool's metadata size to 15.81 GiB.\n"
-	"This is slightly less then the actual maximum 15.88 GiB.\n"
-	"For compatibility with older version and use of cropped size set to 1.\n")
+cfg(allocation_thin_pool_metadata_require_separate_pvs_CFG, "thin_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 89), NULL, 0, NULL,
+	"Thin pool metdata and data will always use different PVs.\n")

 cfg(allocation_thin_pool_zero_CFG, "thin_pool_zero", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_ZERO, vsn(2, 2, 99), NULL, 0, NULL,
 	"Thin pool data chunks are zeroed before they are first used.\n"
@@ -688,9 +629,6 @@ cfg(allocation_thin_pool_chunk_size_policy_CFG, "thin_pool_chunk_size_policy", a
 	"    512KiB.\n"
 	"#\n")

-cfg(allocation_zero_metadata_CFG, "zero_metadata", allocation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_ZERO_METADATA, vsn(2, 3, 10), NULL, 0, NULL,
-	"Zero whole metadata area before use with thin or cache pool.\n")
-
 cfg_runtime(allocation_thin_pool_chunk_size_CFG, "thin_pool_chunk_size", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 99), 0, NULL,
 	"The minimal chunk size in KiB for thin pool volumes.\n"
 	"Larger chunk sizes may improve performance for plain thin volumes,\n"
@@ -974,15 +912,15 @@ cfg(global_activation_CFG, "activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, D
 	"the error messages.\n")

 cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(1, 0, 18), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_format_CFG, "format", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_FORMAT, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg_array(global_format_libraries_CFG, "format_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-	  NULL)
+	"This setting is no longer used.")

-cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, vsn(2, 3, 3), NULL, NULL)
+cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, 0, NULL, NULL)

 cfg(global_proc_CFG, "proc", global_CFG_SECTION, CFG_ADVANCED, CFG_TYPE_STRING, DEFAULT_PROC_DIR, vsn(1, 0, 0), NULL, 0, NULL,
 	"Location of proc filesystem.\n")
@@ -991,16 +929,16 @@ cfg(global_etc_CFG, "etc", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_ETC_D
 	"Location of /etc system configuration directory.\n")

 cfg(global_locking_type_CFG, "locking_type", global_CFG_SECTION, 0, CFG_TYPE_INT, 1, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-    NULL)
+	"This setting is no longer used.")

 cfg(global_wait_for_locks_CFG, "wait_for_locks", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_WAIT_FOR_LOCKS, vsn(2, 2, 50), NULL, 0, NULL,
 	"When disabled, fail if a lock request would block.\n")

 cfg(global_fallback_to_clustered_locking_CFG, "fallback_to_clustered_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING, vsn(2, 2, 42), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_fallback_to_local_locking_CFG, "fallback_to_local_locking", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LOCAL_LOCKING, vsn(2, 2, 42), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_locking_dir_CFG, "locking_dir", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_LOCK_DIR, vsn(1, 0, 0), "@DEFAULT_LOCK_DIR@", 0, NULL,
 	"Directory to use for LVM command file locks.\n"
@@ -1013,13 +951,14 @@ cfg(global_prioritise_write_locks_CFG, "prioritise_write_locks", global_CFG_SECT
 	"a volume group's metadata, instead of always granting the read-only\n"
 	"requests immediately, delay them to allow the read-write requests to\n"
 	"be serviced. Without this setting, write access may be stalled by a\n"
-	"high volume of read-only requests. This option only affects file locks.\n")
+	"high volume of read-only requests. This option only affects\n"
+	"locking_type 1 viz. local file-based locking.\n")

 cfg(global_library_dir_CFG, "library_dir", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL,
 	"Search this directory first for shared libraries.\n")

 cfg(global_locking_library_CFG, "locking_library", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_LOCKING_LIB, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ABORT_ON_INTERNAL_ERRORS, vsn(2, 2, 57), NULL, 0, NULL,
 	"Abort a command that encounters an internal error.\n"
@@ -1027,7 +966,7 @@ cfg(global_abort_on_internal_errors_CFG, "abort_on_internal_errors", global_CFG_
 	"encountered the internal error. Please only enable for debugging.\n")

 cfg(global_detect_internal_vg_cache_corruption_CFG, "detect_internal_vg_cache_corruption", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 96), NULL, vsn(2, 2, 174), NULL,
-	NULL)
+	"No longer used.\n")

 cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_METADATA_READ_ONLY, vsn(2, 2, 75), NULL, 0, NULL,
 	"No operations that change on-disk metadata are permitted.\n"
@@ -1061,7 +1000,7 @@ cfg(global_mirror_segtype_default_CFG, "mirror_segtype_default", global_CFG_SECT
 	"    fashion in a cluster.\n"
 	"#\n")

-cfg(global_support_mirrored_mirror_log_CFG, "support_mirrored_mirror_log", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(2, 3, 2), NULL, 0, NULL,
+cfg(global_support_mirrored_mirror_log_CFG, "support_mirrored_mirror_log", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 2), NULL, 0, NULL,
 	"Enable mirrored 'mirror' log type for testing.\n"
 	"#\n"
 	"This type is deprecated to create or convert to but can\n"
@@ -1115,23 +1054,20 @@ cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_pa
 	"Previously this was always shown as /dev/vgname/lvname even when that\n"
 	"was never a valid path in the /dev filesystem.\n")

-cfg(global_event_activation_CFG, "event_activation", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 1, vsn(2, 3, 1), 0, 0, NULL,
+cfg(global_event_activation_CFG, "event_activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(2, 3, 1), 0, 0, NULL,
 	"Activate LVs based on system-generated device events.\n"
-	"When a PV appears on the system, a system-generated uevent triggers\n"
-	"the lvm2-pvscan service which runs the pvscan --cache -aay command.\n"
-	"If the new PV completes a VG, pvscan autoactivates LVs in the VG.\n"
-	"When event_activation is disabled, the lvm2-activation services are\n"
-	"generated and run at fixed points during system startup.  These\n"
-	"services run vgchange -aay to autoactivate LVs in VGs that happen\n"
-	"to be present at that point in time.\n"
-	"See the --setautoactivation option or the auto_activation_volume_list\n"
-	"setting to configure autoactivation for specific VGs or LVs.\n")
+	"When a device appears on the system, a system-generated event runs\n"
+	"the pvscan command to activate LVs if the new PV completes the VG.\n"
+	"Use auto_activation_volume_list to select which LVs should be\n"
+	"activated from these events (the default is all.)\n"
+	"When event_activation is disabled, the system will generally run\n"
+	"a direct activation command to activate LVs in complete VGs.\n")

 cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), 0, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_lvmetad_update_wait_time_CFG, "lvmetad_update_wait_time", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, 0, vsn(2, 2, 151), NULL, vsn(2, 3, 0), NULL,
-	NULL)
+	"This setting is no longer used.\n")

 cfg(global_use_aio_CFG, "use_aio", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_AIO, vsn(2, 2, 183), NULL, 0, NULL,
 	"Use async I/O when reading and writing devices.\n")
@@ -1155,15 +1091,6 @@ cfg(global_sanlock_lv_extend_CFG, "sanlock_lv_extend", global_CFG_SECTION, CFG_D
 	"and can cause lvcreate to fail. Applicable only if LVM is compiled\n"
 	"with lockd support\n")

-cfg(global_lvmlockctl_kill_command_CFG, "lvmlockctl_kill_command", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, "", vsn(2, 3, 12), NULL, 0, NULL,
-	"The command that lvmlockctl --kill should use to force LVs offline.\n"
-	"The lvmlockctl --kill command is run when a shared VG has lost\n"
-	"access to locks (e.g. when sanlock has lost access to storage.)\n"
-	"An empty string means that there will be no automatic attempt by\n"
-	"lvmlockctl --kill to forcibly shut down LVs in the VG, and the user\n"
-	"can manually intervene as described in lvmlockd(8).\n"
-	"The VG name will be appended to the command specified here.\n")
-
 cfg(global_thin_check_executable_CFG, "thin_check_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, THIN_CHECK_CMD, vsn(2, 2, 94), "@THIN_CHECK_CMD@", 0, NULL,
 	"The full path to the thin_check command.\n"
 	"LVM uses this command to check that a thin metadata device is in a\n"
@@ -1249,15 +1176,6 @@ cfg(global_vdo_format_executable_CFG, "vdo_format_executable", global_CFG_SECTIO
 cfg_array(global_vdo_format_options_CFG, "vdo_format_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_VDO_FORMAT_OPTIONS_CONFIG, VDO_1ST_VSN, NULL, 0, NULL,
 	"List of options passed added to standard vdoformat command.\n")

-cfg_array(global_vdo_disabled_features_CFG, "vdo_disabled_features", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 3, 11), NULL, 0, NULL,
-	"Features to not use in the vdo driver.\n"
-	"This can be helpful for testing, or to avoid using a feature that is\n"
-	"causing problems. Features include: online_rename\n"
-	"#\n"
-	"Example\n"
-	"vdo_disabled_features = [ \"online_rename\" ]\n"
-	"#\n")
-
 cfg(global_fsadm_executable_CFG, "fsadm_executable", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_FSADM_PATH, vsn(2, 2, 170), "@FSADM_PATH@", 0, NULL,
 	"The full path to the fsadm command.\n"
 	"LVM uses this command to help with lvresize -r operations.\n")
@@ -1326,7 +1244,7 @@ cfg(global_io_memory_size_CFG, "io_memory_size", global_CFG_SECTION, CFG_DEFAULT

 cfg(activation_udev_sync_CFG, "udev_sync", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_UDEV_SYNC, vsn(2, 2, 51), NULL, 0, NULL,
 	"Use udev notifications to synchronize udev and LVM.\n"
-	"The --noudevsync option overrides this setting.\n"
+	"The --nodevsync option overrides this setting.\n"
 	"When disabled, LVM commands will not wait for notifications from\n"
 	"udev, but continue irrespective of any possible udev processing in\n"
 	"the background. Only use this if udev is not running or has rules\n"
@@ -1340,7 +1258,7 @@ cfg(activation_udev_rules_CFG, "udev_rules", activation_CFG_SECTION, 0, CFG_TYPE
 	"active LVs itself. Manual intervention may be required if this\n"
 	"setting is changed while LVs are active.\n")

-cfg(activation_verify_udev_operations_CFG, "verify_udev_operations", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_VERIFY_UDEV_OPERATIONS, vsn(2, 2, 86), NULL, 0, NULL,
+cfg(activation_verify_udev_operations_CFG, "verify_udev_operations", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_VERIFY_UDEV_OPERATIONS, vsn(2, 2, 86), NULL, 0, NULL,
 	"Use extra checks in LVM to verify udev operations.\n"
 	"This enables additional checks (and if necessary, repairs) on entries\n"
 	"in the device directory after udev has completed processing its\n"
@@ -1361,21 +1279,21 @@ cfg(activation_missing_stripe_filler_CFG, "missing_stripe_filler", activation_CF
 	"other than 'error' with mirrored or snapshotted volumes is likely to\n"
 	"result in data corruption.\n")

-cfg(activation_use_linear_target_CFG, "use_linear_target", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_LINEAR_TARGET, vsn(2, 2, 89), NULL, 0, NULL,
+cfg(activation_use_linear_target_CFG, "use_linear_target", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_USE_LINEAR_TARGET, vsn(2, 2, 89), NULL, 0, NULL,
 	"Use the linear target to optimize single stripe LVs.\n"
 	"When disabled, the striped target is used. The linear target is an\n"
 	"optimised version of the striped target that only handles a single\n"
 	"stripe.\n")

-cfg(activation_reserved_stack_CFG, "reserved_stack", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_RESERVED_STACK, vsn(1, 0, 0), NULL, 0, NULL,
+cfg(activation_reserved_stack_CFG, "reserved_stack", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_RESERVED_STACK, vsn(1, 0, 0), NULL, 0, NULL,
 	"Stack size in KiB to reserve for use while devices are suspended.\n"
 	"Insufficent reserve risks I/O deadlock during device suspension.\n")

-cfg(activation_reserved_memory_CFG, "reserved_memory", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_RESERVED_MEMORY, vsn(1, 0, 0), NULL, 0, NULL,
+cfg(activation_reserved_memory_CFG, "reserved_memory", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_RESERVED_MEMORY, vsn(1, 0, 0), NULL, 0, NULL,
 	"Memory size in KiB to reserve for use while devices are suspended.\n"
 	"Insufficent reserve risks I/O deadlock during device suspension.\n")

-cfg(activation_process_priority_CFG, "process_priority", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_PROCESS_PRIORITY, vsn(1, 0, 0), NULL, 0, NULL,
+cfg(activation_process_priority_CFG, "process_priority", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_PROCESS_PRIORITY, vsn(1, 0, 0), NULL, 0, NULL,
 	"Nice value used while devices are suspended.\n"
 	"Use a high priority so that LVs are suspended\n"
 	"for the shortest possible time.\n")
@@ -1405,22 +1323,22 @@ cfg_array(activation_volume_list_CFG, "volume_list", activation_CFG_SECTION, CFG
 	"#\n")

 cfg_array(activation_auto_activation_volume_list_CFG, "auto_activation_volume_list", activation_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 97), NULL, 0, NULL,
-	"A list of VGs or LVs that should be autoactivated.\n"
-	"Autoactivation is an activation command run with -aay,\n"
-	"i.e. vgchange -aay, lvchange -aay, or pvscan --cache -aay.\n"
-	"When this list is defined, an autoactivation command will only\n"
-	"activate LVs included in the list. If this list is undefined,\n"
-	"it has no effect. If this list is defined but empty, then no\n"
-	"LVs will be autoactivated. LVs can be included in the list by\n"
-	"LV name, VG name (applies to all LVs in the VG), or tag name.\n"
-	"VGs and LVs can also have an autoactivation property set in\n"
-	"metadata, see --setautoactivation. LVs included in this list\n"
-	"will not be autoactivated if the VG or LV autoactivation\n"
-	"property is disabled (see vgs or lvs \"-o autoactivation\").\n"
-	"The volume_list setting and the \"activation skip\" property\n"
-	"also apply to autoactivation.\n"
-	"The -aay option is meant to be used by activation commands that\n"
-	"are run automatically by the system, e.g. from systemd services.\n"
+	"Only LVs selected by this list are auto-activated.\n"
+	"This list works like volume_list, but it is used only by\n"
+	"auto-activation commands. It does not apply to direct activation\n"
+	"commands. If this list is defined, an LV is only auto-activated\n"
+	"if it matches an entry in this list. If this list is undefined, it\n"
+	"imposes no limits on LV auto-activation (all are allowed.) If this\n"
+	"list is defined and empty, i.e. \"[]\", then no LVs are selected for\n"
+	"auto-activation. An LV that is selected by this list for\n"
+	"auto-activation, must also be selected by volume_list (if defined)\n"
+	"before it is activated. Auto-activation is an activation command that\n"
+	"includes the 'a' argument: --activate ay or -a ay. The 'a' (auto)\n"
+	"argument for auto-activation is meant to be used by activation\n"
+	"commands that are run automatically by the system, as opposed to LVM\n"
+	"commands run directly by a user. A user may also use the 'a' flag\n"
+	"directly to perform auto-activation. Also see pvscan(8) for more\n"
+	"information about auto-activation.\n"
 	"#\n"
 	"Accepted values:\n"
 	"  vgname\n"
@@ -1484,7 +1402,7 @@ cfg(activation_error_when_full_CFG, "error_when_full", activation_CFG_SECTION, C
 	"thin pool data space is extended. New thin pools are assigned the\n"
 	"behavior defined here.\n")

-cfg(activation_readahead_CFG, "readahead", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_READ_AHEAD, vsn(1, 0, 23), NULL, 0, NULL,
+cfg(activation_readahead_CFG, "readahead", activation_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_READ_AHEAD, vsn(1, 0, 23), NULL, 0, NULL,
 	"Setting to use when there is no readahead setting in metadata.\n"
 	"#\n"
 	"Accepted values:\n"
@@ -1612,7 +1530,7 @@ cfg(activation_thin_pool_autoextend_percent_CFG, "thin_pool_autoextend_percent",
 	"thin_pool_autoextend_percent = 20\n"
 	"#\n")

-cfg(activation_vdo_pool_autoextend_threshold_CFG, "vdo_pool_autoextend_threshold", activation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_VDO_POOL_AUTOEXTEND_THRESHOLD, VDO_1ST_VSN, NULL, 0, NULL,
+cfg(activation_vdo_pool_autoextend_threshold_CFG, "vdo_pool_autoextend_threshold", activation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA, CFG_TYPE_INT, DEFAULT_VDO_POOL_AUTOEXTEND_THRESHOLD, VDO_1ST_VSN, NULL, 0, NULL,
 	"Auto-extend a VDO pool when its usage exceeds this percent.\n"
 	"Setting this to 100 disables automatic extension.\n"
 	"The minimum value is 50 (a smaller value is treated as 50.)\n"
@@ -1652,7 +1570,7 @@ cfg_array(activation_mlock_filter_CFG, "mlock_filter", activation_CFG_SECTION, C
 	"mlock_filter = [ \"locale/locale-archive\", \"gconv/gconv-modules.cache\" ]\n"
 	"#\n")

-cfg(activation_use_mlockall_CFG, "use_mlockall", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_USE_MLOCKALL, vsn(2, 2, 62), NULL, 0, NULL,
+cfg(activation_use_mlockall_CFG, "use_mlockall", activation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_USE_MLOCKALL, vsn(2, 2, 62), NULL, 0, NULL,
 	"Use the old behavior of mlockall to pin all memory.\n"
 	"Prior to version 2.02.62, LVM used mlockall() to pin the whole\n"
 	"process's memory while activating devices.\n")
@@ -1662,7 +1580,7 @@ cfg(activation_monitoring_CFG, "monitoring", activation_CFG_SECTION, 0, CFG_TYPE
 	"The --ignoremonitoring option overrides this setting.\n"
 	"When enabled, LVM will ask dmeventd to monitor activated LVs.\n")

-cfg(activation_polling_interval_CFG, "polling_interval", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_INTERVAL, vsn(2, 2, 63), NULL, 0, NULL,
+cfg(activation_polling_interval_CFG, "polling_interval", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_INTERVAL, vsn(2, 2, 63), NULL, 0, NULL,
 	"Check pvmove or lvconvert progress at this interval (seconds).\n"
 	"When pvmove or lvconvert must wait for the kernel to finish\n"
 	"synchronising or merging data, they check and report progress at\n"
@@ -1753,7 +1671,7 @@ cfg(metadata_vgmetadatacopies_CFG, "vgmetadatacopies", metadata_CFG_SECTION, CFG
 	"and allows you to control which metadata areas are used at the\n"
 	"individual PV level using pvchange --metadataignore y|n.\n")

-cfg_runtime(metadata_pvmetadatasize_CFG, "pvmetadatasize", metadata_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(1, 0, 0), 0, NULL,
+cfg_runtime(metadata_pvmetadatasize_CFG, "pvmetadatasize", metadata_CFG_SECTION, CFG_DEFAULT_COMMENTED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(1, 0, 0), 0, NULL,
 	"The default size of the metadata area in units of 512 byte sectors.\n"
 	"The metadata area begins at an offset of the page size from the start\n"
 	"of the device. The first PE is by default at 1 MiB from the start of\n"
@@ -1776,7 +1694,7 @@ cfg(metadata_pvmetadataignore_CFG, "pvmetadataignore", metadata_CFG_SECTION, CFG
 cfg(metadata_stripesize_CFG, "stripesize", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_STRIPESIZE, vsn(1, 0, 0), NULL, 0, NULL, NULL)

 cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL,
-	  NULL)
+	  "This setting is no longer used.\n")

 cfg_section(metadata_disk_areas_CFG_SUBSECTION, "disk_areas", metadata_CFG_SECTION, CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(2, 3, 0), NULL, NULL)
 cfg_section(disk_area_CFG_SUBSECTION, "disk_area", metadata_disk_areas_CFG_SUBSECTION, CFG_NAME_VARIABLE | CFG_UNSUPPORTED | CFG_DEFAULT_COMMENTED, vsn(1, 0, 0), vsn(2, 3, 0), NULL, NULL)
@@ -2101,7 +2019,7 @@ cfg(report_two_word_unknown_device_CFG, "two_word_unknown_device", report_CFG_SE
 	"Use the two words 'unknown device' in place of '[unknown]'.\n"
 	"This is displayed when the device for a PV is not known.\n")

-cfg(dmeventd_mirror_library_CFG, "mirror_library", dmeventd_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DMEVENTD_MIRROR_LIB, vsn(1, 2, 3), NULL, 0, NULL,
+cfg(dmeventd_mirror_library_CFG, "mirror_library", dmeventd_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_DMEVENTD_MIRROR_LIB, vsn(1, 2, 3), NULL, 0, NULL,
 	"The library dmeventd uses when monitoring a mirror device.\n"
 	"libdevmapper-event-lvm2mirror.so attempts to recover from\n"
 	"failures. It removes failed devices from a volume group and\n"
@@ -2110,13 +2028,13 @@ cfg(dmeventd_mirror_library_CFG, "mirror_library", dmeventd_CFG_SECTION, CFG_DEF

 cfg(dmeventd_raid_library_CFG, "raid_library", dmeventd_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DMEVENTD_RAID_LIB, vsn(2, 2, 87), NULL, 0, NULL, NULL)

-cfg(dmeventd_snapshot_library_CFG, "snapshot_library", dmeventd_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DMEVENTD_SNAPSHOT_LIB, vsn(1, 2, 26), NULL, 0, NULL,
+cfg(dmeventd_snapshot_library_CFG, "snapshot_library", dmeventd_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_DMEVENTD_SNAPSHOT_LIB, vsn(1, 2, 26), NULL, 0, NULL,
 	"The library dmeventd uses when monitoring a snapshot device.\n"
 	"libdevmapper-event-lvm2snapshot.so monitors the filling of snapshots\n"
 	"and emits a warning through syslog when the usage exceeds 80%. The\n"
 	"warning is repeated when 85%, 90% and 95% of the snapshot is filled.\n")

-cfg(dmeventd_thin_library_CFG, "thin_library", dmeventd_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DMEVENTD_THIN_LIB, vsn(2, 2, 89), NULL, 0, NULL,
+cfg(dmeventd_thin_library_CFG, "thin_library", dmeventd_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_DMEVENTD_THIN_LIB, vsn(2, 2, 89), NULL, 0, NULL,
 	"The library dmeventd uses when monitoring a thin device.\n"
 	"libdevmapper-event-lvm2thin.so monitors the filling of a pool\n"
 	"and emits a warning through syslog when the usage exceeds 80%. The\n"
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -118,8 +118,6 @@
 #define DEFAULT_THIN_REPAIR_OPTION1 ""
 #define DEFAULT_THIN_REPAIR_OPTIONS_CONFIG "#S" DEFAULT_THIN_REPAIR_OPTION1
 #define DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS 0
-#define DEFAULT_THIN_POOL_CROP_METADATA 0
-#define DEFAULT_THIN_POOL_MAX_METADATA_SIZE_V1_KB (UINT64_C(255) * ((1 << 14) - 64) * 4)  /* KB */ /* 0x3f8040 blocks */
 #define DEFAULT_THIN_POOL_MAX_METADATA_SIZE (DM_THIN_MAX_METADATA_SIZE / 2)  /* KB */
 #define DEFAULT_THIN_POOL_MIN_METADATA_SIZE 2048  /* KB */
 #define DEFAULT_THIN_POOL_OPTIMAL_METADATA_SIZE (128 * 1024) /* KB */
@@ -131,7 +129,6 @@
 #define DEFAULT_THIN_POOL_DISCARDS "passdown"
 #define DEFAULT_THIN_POOL_ZERO 1
 #define DEFAULT_POOL_METADATA_SPARE 1 /* thin + cache */
-#define DEFAULT_ZERO_METADATA 1		/* thin + cache */

 #ifdef CACHE_CHECK_NEEDS_CHECK
 #  define DEFAULT_CACHE_CHECK_OPTION1 "-q"
@@ -167,7 +164,7 @@
 #define DEFAULT_VDO_INDEX_MEMORY_SIZE_MB	(DM_VDO_INDEX_MEMORY_SIZE_MINIMUM_MB)
 #define DEFAULT_VDO_SLAB_SIZE_MB	(2 * 1024)  // 2GiB ... 19 slabbits
 #define DEFAULT_VDO_ACK_THREADS		(1)
-#define DEFAULT_VDO_BIO_THREADS		(4)
+#define DEFAULT_VDO_BIO_THREADS		(1)
 #define DEFAULT_VDO_BIO_ROTATION	(64)
 #define DEFAULT_VDO_CPU_THREADS		(2)
 #define DEFAULT_VDO_HASH_ZONE_THREADS	(1)
@@ -321,11 +318,4 @@

 #define DEFAULT_IO_MEMORY_SIZE_KB 8192

-#define DEFAULT_MD_COMPONENT_CHECKS "auto"
-
-#define DEFAULT_USE_DEVICES_FILE 0
-#define DEFAULT_DEVICES_FILE "system.devices"
-
-#define DEFAULT_SEARCH_FOR_DEVNAMES "auto"
-
 #endif				/* _LVM_DEFAULTS_H */
--- a/lib/datastruct/str_list.c
+++ b/lib/datastruct/str_list.c
@@ -218,7 +218,7 @@ struct dm_list *str_to_str_list(struct dm_pool *mem, const char *str,
 		return NULL;
 	}

-	p1 = str;
+	p1 = p2 = str;
 	while (*p1) {
 		if (!(p2 = strstr(p1, delim)))
 			next = p2 = str + strlen(str);
--- a/lib/device/bcache-utils.c
+++ b/lib/device/bcache-utils.c
@@ -39,32 +39,32 @@ static uint64_t _min(uint64_t lhs, uint64_t rhs)

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

-void bcache_prefetch_bytes(struct bcache *cache, int di, uint64_t start, size_t len)
+void bcache_prefetch_bytes(struct bcache *cache, int fd, uint64_t start, size_t len)
 {
 	block_address bb, be;

 	byte_range_to_block_range(cache, start, len, &bb, &be);
 	while (bb < be) {
-		bcache_prefetch(cache, di, bb);
+		bcache_prefetch(cache, fd, bb);
 		bb++;
 	}
 }

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

-bool bcache_read_bytes(struct bcache *cache, int di, uint64_t start, size_t len, void *data)
+bool bcache_read_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, void *data)
 {
 	struct block *b;
 	block_address bb, be;
 	uint64_t block_size = bcache_block_sectors(cache) << SECTOR_SHIFT;
 	uint64_t block_offset = start % block_size;

-	bcache_prefetch_bytes(cache, di, start, len);
+	bcache_prefetch_bytes(cache, fd, start, len);

 	byte_range_to_block_range(cache, start, len, &bb, &be);

 	for (; bb != be; bb++) {
-        	if (!bcache_get(cache, di, bb, 0, &b))
+        	if (!bcache_get(cache, fd, bb, 0, &b))
 			return false;

 		size_t blen = _min(block_size - block_offset, len);
@@ -79,21 +79,6 @@ bool bcache_read_bytes(struct bcache *cache, int di, uint64_t start, size_t len,
 	return true;
 }

-bool bcache_invalidate_bytes(struct bcache *cache, int di, uint64_t start, size_t len)
-{
-	block_address bb, be;
-	bool result = true;
-
-	byte_range_to_block_range(cache, start, len, &bb, &be);
-
-	for (; bb != be; bb++) {
-		if (!bcache_invalidate(cache, di, bb))
-			result = false;
-	}
-
-	return result;
-}
-
 //----------------------------------------------------------------

 // Writing bytes and zeroing bytes are very similar, so we factor out
@@ -101,8 +86,8 @@ bool bcache_invalidate_bytes(struct bcache *cache, int di, uint64_t start, size_
 
 struct updater;

-typedef bool (*partial_update_fn)(struct updater *u, int di, block_address bb, uint64_t offset, size_t len);
-typedef bool (*whole_update_fn)(struct updater *u, int di, block_address bb, block_address be);
+typedef bool (*partial_update_fn)(struct updater *u, int fd, block_address bb, uint64_t offset, size_t len);
+typedef bool (*whole_update_fn)(struct updater *u, int fd, block_address bb, block_address be);

 struct updater {
 	struct bcache *cache;
@@ -111,7 +96,7 @@ struct updater {
 	void *data;
 };

-static bool _update_bytes(struct updater *u, int di, uint64_t start, size_t len)
+static bool _update_bytes(struct updater *u, int fd, uint64_t start, size_t len)
 {
        struct bcache *cache = u->cache;
 	block_address bb, be;
@@ -124,12 +109,12 @@ static bool _update_bytes(struct updater *u, int di, uint64_t start, size_t len)
 	// If the last block is partial, we will require a read, so let's 
 	// prefetch it.
 	if ((start + len) % block_size)
-        	bcache_prefetch(cache, di, (start + len) / block_size);
+        	bcache_prefetch(cache, fd, (start + len) / block_size);

 	// First block may be partial
 	if (block_offset) {
        	size_t blen = _min(block_size - block_offset, len);
-		if (!u->partial_fn(u, di, bb, block_offset, blen))
+		if (!u->partial_fn(u, fd, bb, block_offset, blen))
        		return false;

 		len -= blen;
@@ -141,7 +126,7 @@ static bool _update_bytes(struct updater *u, int di, uint64_t start, size_t len)

        // Now we write out a set of whole blocks
        nr_whole = len / block_size;
-        if (!u->whole_fn(u, di, bb, bb + nr_whole))
+        if (!u->whole_fn(u, fd, bb, bb + nr_whole))
                return false;

 	bb += nr_whole;
@@ -151,17 +136,17 @@ static bool _update_bytes(struct updater *u, int di, uint64_t start, size_t len)
        	return true;

        // Finally we write a partial end block
-        return u->partial_fn(u, di, bb, 0, len);
+        return u->partial_fn(u, fd, bb, 0, len);
 }

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

-static bool _write_partial(struct updater *u, int di, block_address bb,
+static bool _write_partial(struct updater *u, int fd, block_address bb,
                           uint64_t offset, size_t len)
 {
 	struct block *b;

-	if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b))
+	if (!bcache_get(u->cache, fd, bb, GF_DIRTY, &b))
 		return false;

 	memcpy(((unsigned char *) b->data) + offset, u->data, len);
@@ -171,7 +156,7 @@ static bool _write_partial(struct updater *u, int di, block_address bb,
 	return true;
 }

-static bool _write_whole(struct updater *u, int di, block_address bb, block_address be)
+static bool _write_whole(struct updater *u, int fd, block_address bb, block_address be)
 {
 	struct block *b;
 	uint64_t block_size = bcache_block_sectors(u->cache) << SECTOR_SHIFT;
@@ -179,7 +164,7 @@ static bool _write_whole(struct updater *u, int di, block_address bb, block_addr
 	for (; bb != be; bb++) {
        	// We don't need to read the block since we are overwriting
        	// it completely.
-		if (!bcache_get(u->cache, di, bb, GF_ZERO, &b))
+		if (!bcache_get(u->cache, fd, bb, GF_ZERO, &b))
        		return false;
 		memcpy(b->data, u->data, block_size);
 		u->data = ((unsigned char *) u->data) + block_size;
@@ -189,7 +174,7 @@ static bool _write_whole(struct updater *u, int di, block_address bb, block_addr
 	return true;
 }

-bool bcache_write_bytes(struct bcache *cache, int di, uint64_t start, size_t len, void *data)
+bool bcache_write_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, void *data)
 {
        struct updater u;

@@ -198,16 +183,16 @@ bool bcache_write_bytes(struct bcache *cache, int di, uint64_t start, size_t len
        u.whole_fn = _write_whole;
        u.data = data;

-	return _update_bytes(&u, di, start, len);
+	return _update_bytes(&u, fd, start, len);
 }

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

-static bool _zero_partial(struct updater *u, int di, block_address bb, uint64_t offset, size_t len)
+static bool _zero_partial(struct updater *u, int fd, block_address bb, uint64_t offset, size_t len)
 {
 	struct block *b;

-	if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b))
+	if (!bcache_get(u->cache, fd, bb, GF_DIRTY, &b))
 		return false;

 	memset(((unsigned char *) b->data) + offset, 0, len);
@@ -216,12 +201,12 @@ static bool _zero_partial(struct updater *u, int di, block_address bb, uint64_t
 	return true;
 }

-static bool _zero_whole(struct updater *u, int di, block_address bb, block_address be)
+static bool _zero_whole(struct updater *u, int fd, block_address bb, block_address be)
 {
 	struct block *b;

 	for (; bb != be; bb++) {
-		if (!bcache_get(u->cache, di, bb, GF_ZERO, &b))
+		if (!bcache_get(u->cache, fd, bb, GF_ZERO, &b))
        		return false;
        	bcache_put(b);
 	}
@@ -229,7 +214,7 @@ static bool _zero_whole(struct updater *u, int di, block_address bb, block_addre
 	return true;
 }

-bool bcache_zero_bytes(struct bcache *cache, int di, uint64_t start, size_t len)
+bool bcache_zero_bytes(struct bcache *cache, int fd, uint64_t start, size_t len)
 {
        struct updater u;

@@ -238,17 +223,17 @@ bool bcache_zero_bytes(struct bcache *cache, int di, uint64_t start, size_t len)
        u.whole_fn = _zero_whole;
        u.data = NULL;

-	return _update_bytes(&u, di, start, len);
+	return _update_bytes(&u, fd, start, len);
 }

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

-static bool _set_partial(struct updater *u, int di, block_address bb, uint64_t offset, size_t len)
+static bool _set_partial(struct updater *u, int fd, block_address bb, uint64_t offset, size_t len)
 {
 	struct block *b;
 	uint8_t val = *((uint8_t *) u->data);

-	if (!bcache_get(u->cache, di, bb, GF_DIRTY, &b))
+	if (!bcache_get(u->cache, fd, bb, GF_DIRTY, &b))
 		return false;

 	memset(((unsigned char *) b->data) + offset, val, len);
@@ -257,14 +242,14 @@ static bool _set_partial(struct updater *u, int di, block_address bb, uint64_t o
 	return true;
 }

-static bool _set_whole(struct updater *u, int di, block_address bb, block_address be)
+static bool _set_whole(struct updater *u, int fd, block_address bb, block_address be)
 {
 	struct block *b;
 	uint8_t val = *((uint8_t *) u->data);
        uint64_t len = bcache_block_sectors(u->cache) * 512;

 	for (; bb != be; bb++) {
-		if (!bcache_get(u->cache, di, bb, GF_ZERO, &b))
+		if (!bcache_get(u->cache, fd, bb, GF_ZERO, &b))
        		return false;
        	memset((unsigned char *) b->data, val, len);
        	bcache_put(b);
@@ -273,7 +258,7 @@ static bool _set_whole(struct updater *u, int di, block_address bb, block_addres
 	return true;
 }

-bool bcache_set_bytes(struct bcache *cache, int di, uint64_t start, size_t len, uint8_t val)
+bool bcache_set_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, uint8_t val)
 {
        struct updater u;

@@ -282,6 +267,6 @@ bool bcache_set_bytes(struct bcache *cache, int di, uint64_t start, size_t len,
        u.whole_fn = _set_whole;
        u.data = &val;

-	return _update_bytes(&u, di, start, len);
+	return _update_bytes(&u, fd, start, len);
 }

--- a/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@ -33,16 +33,11 @@

 #define SECTOR_SHIFT 9L

-#define FD_TABLE_INC 1024
-static int _fd_table_size;
-static int *_fd_table;
-
-
 //----------------------------------------------------------------

 static void log_sys_warn(const char *call)
 {
-	log_warn("WARNING: %s failed: %s.", call, strerror(errno));
+	log_warn("%s failed: %s", call, strerror(errno));
 }

 // Assumes the list is not empty.
@@ -66,17 +61,23 @@ struct control_block {
 struct cb_set {
 	struct dm_list free;
 	struct dm_list allocated;
-	struct control_block vec[];
+	struct control_block *vec;
 } control_block_set;

 static struct cb_set *_cb_set_create(unsigned nr)
 {
-	unsigned i;
-	struct cb_set *cbs = malloc(sizeof(*cbs) + nr * sizeof(*cbs->vec));
+	int i;
+	struct cb_set *cbs = malloc(sizeof(*cbs));

 	if (!cbs)
 		return NULL;

+	cbs->vec = malloc(nr * sizeof(*cbs->vec));
+	if (!cbs->vec) {
+		free(cbs);
+		return NULL;
+	}
+
 	dm_list_init(&cbs->free);
 	dm_list_init(&cbs->allocated);

@@ -92,10 +93,11 @@ static void _cb_set_destroy(struct cb_set *cbs)
 	// never be in flight IO.
 	if (!dm_list_empty(&cbs->allocated)) {
 		// bail out
-		log_warn("WARNING: async io still in flight.");
+		log_error("async io still in flight");
 		return;
 	}

+	free(cbs->vec);
 	free(cbs);
 }

@@ -153,11 +155,11 @@ static void _async_destroy(struct io_engine *ioe)
 	free(e);
 }

-static int _last_byte_di;
+static int _last_byte_fd;
 static uint64_t _last_byte_offset;
 static int _last_byte_sector_size;

-static bool _async_issue(struct io_engine *ioe, enum dir d, int di,
+static bool _async_issue(struct io_engine *ioe, enum dir d, int fd,
 			 sector_t sb, sector_t se, void *data, void *context)
 {
 	int r;
@@ -167,7 +169,6 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,
 	sector_t offset;
 	sector_t nbytes;
 	sector_t limit_nbytes;
-	sector_t orig_nbytes;
 	sector_t extra_nbytes = 0;

 	if (((uintptr_t) data) & e->page_mask) {
@@ -181,7 +182,7 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,
 	/*
 	 * If bcache block goes past where lvm wants to write, then clamp it.
 	 */
-	if ((d == DIR_WRITE) && _last_byte_offset && (di == _last_byte_di)) {
+	if ((d == DIR_WRITE) && _last_byte_offset && (fd == _last_byte_fd)) {
 		if (offset > _last_byte_offset) {
 			log_error("Limit write at %llu len %llu beyond last byte %llu",
 				  (unsigned long long)offset,
@@ -190,41 +191,11 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,
 			return false;
 		}

-		/*
-		 * If the bcache block offset+len goes beyond where lvm is
-		 * intending to write, then reduce the len being written
-		 * (which is the bcache block size) so we don't write past
-		 * the limit set by lvm.  If after applying the limit, the
-		 * resulting size is not a multiple of the sector size (512
-		 * or 4096) then extend the reduced size to be a multiple of
-		 * the sector size (we don't want to write partial sectors.)
-		 */
 		if (offset + nbytes > _last_byte_offset) {
 			limit_nbytes = _last_byte_offset - offset;
-
-			if (limit_nbytes % _last_byte_sector_size) {
+			if (limit_nbytes % _last_byte_sector_size)
 				extra_nbytes = _last_byte_sector_size - (limit_nbytes % _last_byte_sector_size);

-				/*
-				 * adding extra_nbytes to the reduced nbytes (limit_nbytes)
-				 * should make the final write size a multiple of the
-				 * sector size.  This should never result in a final size
-				 * larger than the bcache block size (as long as the bcache
-				 * block size is a multiple of the sector size).
-				 */
-				if (limit_nbytes + extra_nbytes > nbytes) {
-					log_warn("Skip extending write at %llu len %llu limit %llu extra %llu sector_size %llu",
-						 (unsigned long long)offset,
-						 (unsigned long long)nbytes,
-						 (unsigned long long)limit_nbytes,
-						 (unsigned long long)extra_nbytes,
-						 (unsigned long long)_last_byte_sector_size);
-					extra_nbytes = 0;
-				}
-			}
-
-			orig_nbytes = nbytes;
-
 			if (extra_nbytes) {
 				log_debug("Limit write at %llu len %llu to len %llu rounded to %llu",
 					  (unsigned long long)offset,
@@ -239,22 +210,6 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,
 					  (unsigned long long)limit_nbytes);
 				nbytes = limit_nbytes;
 			}
-
-			/*
-			 * This shouldn't happen, the reduced+extended
-			 * nbytes value should never be larger than the
-			 * bcache block size.
-			 */
-			if (nbytes > orig_nbytes) {
-				log_error("Invalid adjusted write at %llu len %llu adjusted %llu limit %llu extra %llu sector_size %llu",
-					  (unsigned long long)offset,
-					  (unsigned long long)orig_nbytes,
-					  (unsigned long long)nbytes,
-					  (unsigned long long)limit_nbytes,
-					  (unsigned long long)extra_nbytes,
-					  (unsigned long long)_last_byte_sector_size);
-				return false;
-			}
 		}
 	}

@@ -266,7 +221,7 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,

 	memset(&cb->cb, 0, sizeof(cb->cb));

-	cb->cb.aio_fildes = (int) _fd_table[di];
+	cb->cb.aio_fildes = (int) fd;
 	cb->cb.u.c.buf = data;
 	cb->cb.u.c.offset = offset;
 	cb->cb.u.c.nbytes = nbytes;
@@ -274,15 +229,13 @@ static bool _async_issue(struct io_engine *ioe, enum dir d, int di,

 #if 0
 	if (d == DIR_READ) {
-		log_debug("io R off %llu bytes %llu di %d fd %d",
+		log_debug("io R off %llu bytes %llu",
 			  (unsigned long long)cb->cb.u.c.offset,
-			  (unsigned long long)cb->cb.u.c.nbytes,
-			  di, _fd_table[di]);
+			  (unsigned long long)cb->cb.u.c.nbytes);
 	} else {
-		log_debug("io W off %llu bytes %llu di %d fd %d",
+		log_debug("io W off %llu bytes %llu",
 			  (unsigned long long)cb->cb.u.c.offset,
-			  (unsigned long long)cb->cb.u.c.nbytes,
-			  di, _fd_table[di]);
+			  (unsigned long long)cb->cb.u.c.nbytes);
 	}
 #endif

@@ -318,7 +271,9 @@ static bool _async_wait(struct io_engine *ioe, io_complete_fn fn)
 	struct async_engine *e = _to_async(ioe);

 	memset(&event, 0, sizeof(event));
-	r = io_getevents(e->aio_context, 1, MAX_EVENT, event, NULL);
+	do {
+		r = io_getevents(e->aio_context, 1, MAX_EVENT, event, NULL);
+	} while (r == -EINTR);

 	if (r < 0) {
 		log_sys_warn("io_getevents");
@@ -412,7 +367,7 @@ static void _sync_destroy(struct io_engine *ioe)
        free(e);
 }

-static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,
+static bool _sync_issue(struct io_engine *ioe, enum dir d, int fd,
                        sector_t sb, sector_t se, void *data, void *context)
 {
 	int rv;
@@ -428,7 +383,7 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,
 	}

 	where = sb * 512;
-	off = lseek(_fd_table[di], where, SEEK_SET);
+	off = lseek(fd, where, SEEK_SET);
 	if (off == (off_t) -1) {
 		log_warn("Device seek error %d for offset %llu", errno, (unsigned long long)where);
 		free(io);
@@ -443,12 +398,11 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,
 	/*
 	 * If bcache block goes past where lvm wants to write, then clamp it.
 	 */
-	if ((d == DIR_WRITE) && _last_byte_offset && (di == _last_byte_di)) {
+	if ((d == DIR_WRITE) && _last_byte_offset && (fd == _last_byte_fd)) {
 		uint64_t offset = where;
 		uint64_t nbytes = len;
 		sector_t limit_nbytes = 0;
 		sector_t extra_nbytes = 0;
-		sector_t orig_nbytes = 0;

 		if (offset > _last_byte_offset) {
 			log_error("Limit write at %llu len %llu beyond last byte %llu",
@@ -461,30 +415,9 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,

 		if (offset + nbytes > _last_byte_offset) {
 			limit_nbytes = _last_byte_offset - offset;
-
-			if (limit_nbytes % _last_byte_sector_size) {
+			if (limit_nbytes % _last_byte_sector_size)
 				extra_nbytes = _last_byte_sector_size - (limit_nbytes % _last_byte_sector_size);

-				/*
-				 * adding extra_nbytes to the reduced nbytes (limit_nbytes)
-				 * should make the final write size a multiple of the
-				 * sector size.  This should never result in a final size
-				 * larger than the bcache block size (as long as the bcache
-				 * block size is a multiple of the sector size).
-				 */
-				if (limit_nbytes + extra_nbytes > nbytes) {
-					log_warn("Skip extending write at %llu len %llu limit %llu extra %llu sector_size %llu",
-						 (unsigned long long)offset,
-						 (unsigned long long)nbytes,
-						 (unsigned long long)limit_nbytes,
-						 (unsigned long long)extra_nbytes,
-						 (unsigned long long)_last_byte_sector_size);
-					extra_nbytes = 0;
-				}
-			}
-
-			orig_nbytes = nbytes;
-
 			if (extra_nbytes) {
 				log_debug("Limit write at %llu len %llu to len %llu rounded to %llu",
 					  (unsigned long long)offset,
@@ -499,23 +432,6 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,
 					  (unsigned long long)limit_nbytes);
 				nbytes = limit_nbytes;
 			}
-
-			/*
-			 * This shouldn't happen, the reduced+extended
-			 * nbytes value should never be larger than the
-			 * bcache block size.
-			 */
-			if (nbytes > orig_nbytes) {
-				log_error("Invalid adjusted write at %llu len %llu adjusted %llu limit %llu extra %llu sector_size %llu",
-					  (unsigned long long)offset,
-					  (unsigned long long)orig_nbytes,
-					  (unsigned long long)nbytes,
-					  (unsigned long long)limit_nbytes,
-					  (unsigned long long)extra_nbytes,
-					  (unsigned long long)_last_byte_sector_size);
-				free(io);
-				return false;
-			}
 		}

 		where = offset;
@@ -524,9 +440,9 @@ static bool _sync_issue(struct io_engine *ioe, enum dir d, int di,

 	while (pos < len) {
 		if (d == DIR_READ)
-			rv = read(_fd_table[di], (char *)data + pos, len - pos);
+			rv = read(fd, (char *)data + pos, len - pos);
 		else
-			rv = write(_fd_table[di], (char *)data + pos, len - pos);
+			rv = write(fd, (char *)data + pos, len - pos);

 		if (rv == -1 && errno == EINTR)
 			continue;
@@ -686,7 +602,7 @@ struct bcache {
 //----------------------------------------------------------------

 struct key_parts {
-	uint32_t di;
+	uint32_t fd;
 	uint64_t b;
 } __attribute__ ((packed));

@@ -695,12 +611,12 @@ union key {
        uint8_t bytes[12];
 };

-static struct block *_block_lookup(struct bcache *cache, int di, uint64_t i)
+static struct block *_block_lookup(struct bcache *cache, int fd, uint64_t i)
 {
 	union key k;
 	union radix_value v;

-	k.parts.di = di;
+	k.parts.fd = fd;
 	k.parts.b = i;

 	if (radix_tree_lookup(cache->rtree, k.bytes, k.bytes + sizeof(k.bytes), &v))
@@ -714,7 +630,7 @@ static bool _block_insert(struct block *b)
        union key k;
        union radix_value v;

-        k.parts.di = b->di;
+        k.parts.fd = b->fd;
        k.parts.b = b->index;
        v.ptr = b;

@@ -725,7 +641,7 @@ static void _block_remove(struct block *b)
 {
        union key k;

-        k.parts.di = b->di;
+        k.parts.fd = b->fd;
        k.parts.b = b->index;

 	radix_tree_remove(b->cache->rtree, k.bytes, k.bytes + sizeof(k.bytes));
@@ -867,7 +783,7 @@ static void _issue_low_level(struct block *b, enum dir d)

 	dm_list_move(&cache->io_pending, &b->list);

-	if (!cache->engine->issue(cache->engine, d, b->di, sb, se, b->data, b)) {
+	if (!cache->engine->issue(cache->engine, d, b->fd, sb, se, b->data, b)) {
 		/* FIXME: if io_submit() set an errno, return that instead of EIO? */
 		_complete_io(b, -EIO);
 		return;
@@ -943,26 +859,21 @@ static struct block *_find_unused_clean_block(struct bcache *cache)
 	return NULL;
 }

-static struct block *_new_block(struct bcache *cache, int di, block_address i, bool can_wait)
+static struct block *_new_block(struct bcache *cache, int fd, block_address i, bool can_wait)
 {
 	struct block *b;

 	b = _alloc_block(cache);
-	while (!b) {
+	while (!b && !dm_list_empty(&cache->clean)) {
 		b = _find_unused_clean_block(cache);
 		if (!b) {
 			if (can_wait) {
 				if (dm_list_empty(&cache->io_pending))
 					_writeback(cache, 16);  // FIXME: magic number
-				_wait_all(cache);
-				if (dm_list_size(&cache->errored) >= cache->max_io) {
-					log_debug("bcache no new blocks for di %d index %u with >%d errors.",
-						  di, (uint32_t) i, cache->max_io);
-					return NULL;
-				}
+				_wait_io(cache);
 			} else {
-				log_debug("bcache no new blocks for di %d index %u",
-					  di, (uint32_t) i);
+				log_error("bcache no new blocks for fd %d index %u",
+					  fd, (uint32_t) i);
 				return NULL;
 			}
 		}
@@ -971,7 +882,7 @@ static struct block *_new_block(struct bcache *cache, int di, block_address i, b
 	if (b) {
 		dm_list_init(&b->list);
 		b->flags = 0;
-		b->di = di;
+		b->fd = fd;
 		b->index = i;
 		b->ref_count = 0;
 		b->error = 0;
@@ -1017,10 +928,10 @@ static void _miss(struct bcache *cache, unsigned flags)
 }

 static struct block *_lookup_or_read_block(struct bcache *cache,
-				  	   int di, block_address i,
+				  	   int fd, block_address i,
 					   unsigned flags)
 {
-	struct block *b = _block_lookup(cache, di, i);
+	struct block *b = _block_lookup(cache, fd, i);

 	if (b) {
 		// FIXME: this is insufficient.  We need to also catch a read
@@ -1045,7 +956,7 @@ static struct block *_lookup_or_read_block(struct bcache *cache,
 	} else {
 		_miss(cache, flags);

-		b = _new_block(cache, di, i, true);
+		b = _new_block(cache, fd, i, true);
 		if (b) {
 			if (flags & GF_ZERO)
 				_zero_block(b);
@@ -1090,7 +1001,6 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
 	struct bcache *cache;
 	unsigned max_io = engine->max_io(engine);
 	long pgsize = sysconf(_SC_PAGESIZE);
-	int i;

 	if (pgsize < 0) {
 		log_warn("WARNING: _SC_PAGESIZE returns negative value.");
@@ -1151,18 +1061,6 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
 		return NULL;
 	}

-	_fd_table_size = FD_TABLE_INC;
-
-	if (!(_fd_table = malloc(sizeof(int) * _fd_table_size))) {
-		cache->engine->destroy(cache->engine);
-		radix_tree_destroy(cache->rtree);
-		free(cache);
-		return NULL;
-	}
-
-	for (i = 0; i < _fd_table_size; i++)
-		_fd_table[i] = -1;
-
 	return cache;
 }

@@ -1178,9 +1076,6 @@ void bcache_destroy(struct bcache *cache)
 	radix_tree_destroy(cache->rtree);
 	cache->engine->destroy(cache->engine);
 	free(cache);
-	free(_fd_table);
-	_fd_table = NULL;
-	_fd_table_size = 0;
 }

 sector_t bcache_block_sectors(struct bcache *cache)
@@ -1198,13 +1093,13 @@ unsigned bcache_max_prefetches(struct bcache *cache)
 	return cache->max_io;
 }

-void bcache_prefetch(struct bcache *cache, int di, block_address i)
+void bcache_prefetch(struct bcache *cache, int fd, block_address i)
 {
-	struct block *b = _block_lookup(cache, di, i);
+	struct block *b = _block_lookup(cache, fd, i);

 	if (!b) {
 		if (cache->nr_io_pending < cache->max_io) {
-			b = _new_block(cache, di, i, false);
+			b = _new_block(cache, fd, i, false);
 			if (b) {
 				cache->prefetches++;
 				_issue_read(b);
@@ -1222,15 +1117,12 @@ static void _recycle_block(struct bcache *cache, struct block *b)
 	_free_block(b);
 }

-bool bcache_get(struct bcache *cache, int di, block_address i,
+bool bcache_get(struct bcache *cache, int fd, block_address i,
 	        unsigned flags, struct block **result)
 {
 	struct block *b;

-	if (di >= _fd_table_size)
-		goto bad;
-
-	b = _lookup_or_read_block(cache, di, i, flags);
+	b = _lookup_or_read_block(cache, fd, i, flags);
 	if (b) {
 		if (b->error) {
 			if (b->io_dir == DIR_READ) {
@@ -1249,10 +1141,10 @@ bool bcache_get(struct bcache *cache, int di, block_address i,
 		*result = b;
 		return true;
 	}
-bad:
+
 	*result = NULL;

-	log_error("bcache failed to get block %u di %d", (uint32_t) i, di);
+	log_error("bcache failed to get block %u fd %d", (uint32_t) i, fd);
 	return false;
 }

@@ -1316,7 +1208,7 @@ static bool _invalidate_block(struct bcache *cache, struct block *b)

 	if (b->ref_count) {
 		log_warn("bcache_invalidate: block (%d, %llu) still held",
-			 b->di, (unsigned long long) b->index);
+			 b->fd, (unsigned long long) b->index);
 		return false;
 	}

@@ -1333,9 +1225,9 @@ static bool _invalidate_block(struct bcache *cache, struct block *b)
 	return true;
 }

-bool bcache_invalidate(struct bcache *cache, int di, block_address i)
+bool bcache_invalidate(struct bcache *cache, int fd, block_address i)
 {
-	return _invalidate_block(cache, _block_lookup(cache, di, i));
+	return _invalidate_block(cache, _block_lookup(cache, fd, i));
 }

 //----------------------------------------------------------------
@@ -1351,27 +1243,27 @@ static bool _writeback_v(struct radix_tree_iterator *it,
 	struct block *b = v.ptr;

 	if (_test_flags(b, BF_DIRTY))
-		_issue_write(b);
+        	_issue_write(b);

-	return true;
+        return true;
 }

 static bool _invalidate_v(struct radix_tree_iterator *it,
                          uint8_t *kb, uint8_t *ke, union radix_value v)
 {
 	struct block *b = v.ptr;
-	struct invalidate_iterator *iit = container_of(it, struct invalidate_iterator, it);
+        struct invalidate_iterator *iit = container_of(it, struct invalidate_iterator, it);

 	if (b->error || _test_flags(b, BF_DIRTY)) {
-		log_warn("WARNING: bcache_invalidate: block (%d, %llu) still dirty.",
-			 b->di, (unsigned long long) b->index);
-		iit->success = false;
-		return true;
+        	log_warn("bcache_invalidate: block (%d, %llu) still dirty",
+                         b->fd, (unsigned long long) b->index);
+        	iit->success = false;
+        	return true;
 	}

 	if (b->ref_count) {
-		log_warn("WARNING: bcache_invalidate: block (%d, %llu) still held.",
-			 b->di, (unsigned long long) b->index);
+		log_warn("bcache_invalidate: block (%d, %llu) still held",
+			 b->fd, (unsigned long long) b->index);
 		iit->success = false;
 		return true;
 	}
@@ -1384,137 +1276,42 @@ static bool _invalidate_v(struct radix_tree_iterator *it,
 	return true;
 }

-bool bcache_invalidate_di(struct bcache *cache, int di)
+bool bcache_invalidate_fd(struct bcache *cache, int fd)
 {
-	union key k;
+        union key k;
 	struct invalidate_iterator it;

-	k.parts.di = di;
+	k.parts.fd = fd;

 	it.it.visit = _writeback_v;
-	radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.di), &it.it);
+	radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd), &it.it);

 	_wait_all(cache);

 	it.success = true;
 	it.it.visit = _invalidate_v;
-	radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.di), &it.it);
-
-	if (it.success)
-		(void) radix_tree_remove_prefix(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.di));
-
+	radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd), &it.it);
+	radix_tree_remove_prefix(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.fd));
 	return it.success;
 }

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

-static bool _abort_v(struct radix_tree_iterator *it,
-                     uint8_t *kb, uint8_t *ke, union radix_value v)
+void bcache_set_last_byte(struct bcache *cache, int fd, uint64_t offset, int sector_size)
 {
-	struct block *b = v.ptr;
-
-	if (b->ref_count) {
-		log_fatal("bcache_abort: block (%d, %llu) still held",
-			 b->di, (unsigned long long) b->index);
-		return true;
-	}
-
-	_unlink_block(b);
-	_free_block(b);
-
-	// We can't remove the block from the radix tree yet because
-	// we're in the middle of an iteration.
-	return true;
-}
-
-void bcache_abort_di(struct bcache *cache, int di)
-{
-	union key k;
-	struct radix_tree_iterator it;
-
-	k.parts.di = di;
-
-	it.visit = _abort_v;
-	radix_tree_iterate(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.di), &it);
-	(void) radix_tree_remove_prefix(cache->rtree, k.bytes, k.bytes + sizeof(k.parts.di));
-}
-
-//----------------------------------------------------------------
-
-void bcache_set_last_byte(struct bcache *cache, int di, uint64_t offset, int sector_size)
-{
-	_last_byte_di = di;
+	_last_byte_fd = fd;
 	_last_byte_offset = offset;
 	_last_byte_sector_size = sector_size;
 	if (!sector_size)
 		_last_byte_sector_size = 512;
 }

-void bcache_unset_last_byte(struct bcache *cache, int di)
+void bcache_unset_last_byte(struct bcache *cache, int fd)
 {
-	if (_last_byte_di == di) {
-		_last_byte_di = 0;
+	if (_last_byte_fd == fd) {
+		_last_byte_fd = 0;
 		_last_byte_offset = 0;
 		_last_byte_sector_size = 0;
 	}
 }

-int bcache_set_fd(int fd)
-{
-	int *new_table = NULL;
-	int new_size = 0;
-	int i;
-
- retry:
-	for (i = 0; i < _fd_table_size; i++) {
-		if (_fd_table[i] == -1) {
-			_fd_table[i] = fd;
-			return i;
-		}
-	}
-
-	/* already tried once, shouldn't happen */
-	if (new_size)
-		return -1;
-
-	new_size = _fd_table_size + FD_TABLE_INC;
-
-	new_table = realloc(_fd_table, sizeof(int) * new_size);
-	if (!new_table) {
-		log_error("Cannot extend bcache fd table");
-		return -1;
-	}
-
-	for (i = _fd_table_size; i < new_size; i++)
-		new_table[i] = -1;
-
-	_fd_table = new_table;
-	_fd_table_size = new_size;
-
-	goto retry;
-}
-
-/*
- * Should we check for unflushed or inprogress io on an fd
- * prior to doing clear_fd or change_fd?  (To catch mistakes;
- * the caller should be smart enough to not do that.)
- */
-
-void bcache_clear_fd(int di)
-{
-	if (di >= _fd_table_size)
-		return;
-	_fd_table[di] = -1;
-}
-
-int bcache_change_fd(int di, int fd)
-{
-	if (di >= _fd_table_size)
-		return 0;
-	if (di < 0) {
-		log_error(INTERNAL_ERROR "Cannot change not opened DI with FD:%d", fd);
-		return 0;
-	}
-	_fd_table[di] = fd;
-	return 1;
-}
--- a/lib/device/bcache.h
+++ b/lib/device/bcache.h
@@ -16,12 +16,19 @@
 #define BCACHE_H

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

 #include <linux/fs.h>
 #include <stdint.h>
 #include <stdbool.h>

+/*----------------------------------------------------------------*/
+
+// FIXME: move somewhere more sensible
+#define container_of(v, t, head) \
+    ((t *)((const char *)(v) - (const char *)&((t *) 0)->head))
+
+/*----------------------------------------------------------------*/
+
 enum dir {
 	DIR_READ,
 	DIR_WRITE
@@ -34,7 +41,7 @@ typedef void io_complete_fn(void *context, int io_error);

 struct io_engine {
 	void (*destroy)(struct io_engine *e);
-	bool (*issue)(struct io_engine *e, enum dir d, int di,
+	bool (*issue)(struct io_engine *e, enum dir d, int fd,
 		      sector_t sb, sector_t se, void *data, void *context);
 	bool (*wait)(struct io_engine *e, io_complete_fn fn);
 	unsigned (*max_io)(struct io_engine *e);
@@ -48,7 +55,7 @@ struct io_engine *create_sync_io_engine(void);
 struct bcache;
 struct block {
 	/* clients may only access these three fields */
-	int di;
+	int fd;
 	uint64_t index;
 	void *data;

@@ -106,12 +113,12 @@ unsigned bcache_max_prefetches(struct bcache *cache);
 * they complete.  But we're talking a very small difference, and it's worth it
 * to keep callbacks out of this interface.
 */
-void bcache_prefetch(struct bcache *cache, int di, block_address index);
+void bcache_prefetch(struct bcache *cache, int fd, block_address index);

 /*
 * Returns true on success.
 */
-bool bcache_get(struct bcache *cache, int di, block_address index,
+bool bcache_get(struct bcache *cache, int fd, block_address index,
 	        unsigned flags, struct block **result);
 void bcache_put(struct block *b);

@@ -129,42 +136,30 @@ bool bcache_flush(struct bcache *cache);
 * 
 * If the block is currently held false will be returned.
 */
-bool bcache_invalidate(struct bcache *cache, int di, block_address index);
+bool bcache_invalidate(struct bcache *cache, int fd, block_address index);

 /*
 * Invalidates all blocks on the given descriptor.  Call this before closing
 * the descriptor to make sure everything is written back.
 */
-bool bcache_invalidate_di(struct bcache *cache, int di);
+bool bcache_invalidate_fd(struct bcache *cache, int fd);

-/*
- * Call this function if flush, or invalidate fail and you do not
- * wish to retry the writes.  This will throw away any dirty data
- * not written.  If any blocks for di are held, then it will call
- * abort().
- */
-void bcache_abort_di(struct bcache *cache, int di);

 //----------------------------------------------------------------
 // The next four functions are utilities written in terms of the above api.
 
 // Prefetches the blocks neccessary to satisfy a byte range.
-void bcache_prefetch_bytes(struct bcache *cache, int di, uint64_t start, size_t len);
+void bcache_prefetch_bytes(struct bcache *cache, int fd, uint64_t start, size_t len);

 // Reads, writes and zeroes bytes.  Returns false if errors occur.
-bool bcache_read_bytes(struct bcache *cache, int di, uint64_t start, size_t len, void *data);
-bool bcache_write_bytes(struct bcache *cache, int di, uint64_t start, size_t len, void *data);
-bool bcache_zero_bytes(struct bcache *cache, int di, uint64_t start, size_t len);
-bool bcache_set_bytes(struct bcache *cache, int di, uint64_t start, size_t len, uint8_t val);
-bool bcache_invalidate_bytes(struct bcache *cache, int di, uint64_t start, size_t len);
+bool bcache_read_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, void *data);
+bool bcache_write_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, void *data);
+bool bcache_zero_bytes(struct bcache *cache, int fd, uint64_t start, size_t len);
+bool bcache_set_bytes(struct bcache *cache, int fd, uint64_t start, size_t len, uint8_t val);

-void bcache_set_last_byte(struct bcache *cache, int di, uint64_t offset, int sector_size);
-void bcache_unset_last_byte(struct bcache *cache, int di);
+void bcache_set_last_byte(struct bcache *cache, int fd, uint64_t offset, int sector_size);
+void bcache_unset_last_byte(struct bcache *cache, int fd);

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

-int bcache_set_fd(int fd); /* returns di */
-void bcache_clear_fd(int di);
-int bcache_change_fd(int di, int fd);
-
 #endif
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
--- a/lib/device/dev-cache.h
+++ b/lib/device/dev-cache.h
@@ -17,7 +17,6 @@
 #define _LVM_DEV_CACHE_H

 #include "lib/device/device.h"
-#include "lib/device/dev-type.h"
 #include "lib/misc/lvm-wrappers.h"

 struct cmd_context;
@@ -28,12 +27,13 @@ struct cmd_context;
 struct dev_filter {
 	int (*passes_filter) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name);
 	void (*destroy) (struct dev_filter *f);
-	void (*wipe) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name);
+	void (*wipe) (struct dev_filter *f);
 	void *private;
 	unsigned use_count;
 	const char *name;
 };

+int dev_cache_index_devs(void);
 struct dm_list *dev_cache_get_dev_list_for_vgid(const char *vgid);
 struct dm_list *dev_cache_get_dev_list_for_lvid(const char *lvid);

@@ -53,11 +53,10 @@ int dev_cache_has_scanned(void);

 int dev_cache_add_dir(const char *path);
 struct device *dev_cache_get(struct cmd_context *cmd, const char *name, struct dev_filter *f);
+const char *dev_cache_filtered_reason(const char *name);

 struct device *dev_cache_get_by_devt(struct cmd_context *cmd, dev_t device, struct dev_filter *f, int *filtered);

-struct device *dev_hash_get(const char *name);
-
 void dev_set_preferred_name(struct dm_str_list *sl, struct device *dev);

 /*
@@ -72,12 +71,4 @@ void dev_reset_error_count(struct cmd_context *cmd);

 void dev_cache_failed_path(struct device *dev, const char *path);

-bool dev_cache_has_md_with_end_superblock(struct dev_types *dt);
-
-int get_sysfs_value(const char *path, char *buf, size_t buf_size, int error_if_no_value);
-
-int setup_devices_file(struct cmd_context *cmd);
-int setup_devices(struct cmd_context *cmd);
-int setup_device(struct cmd_context *cmd, const char *devname);
-
 #endif
--- a/lib/device/dev-dasd.c
+++ b/lib/device/dev-dasd.c
@@ -81,7 +81,7 @@ typedef struct dasd_information2_t {
 int dasd_is_cdl_formatted(struct device *dev)
 {
 	int ret = 0;
-	dasd_information2_t dasd_info2 = { 0 };
+	dasd_information2_t dasd_info2;

 	if (!dev_open_readonly(dev))
 		return_0;
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -53,6 +53,77 @@

 static unsigned _dev_size_seqno = 1;

+/*
+ * Get the physical and logical block size for a device.
+ */
+int dev_get_block_size(struct device *dev, unsigned int *physical_block_size, unsigned int *block_size)
+{
+	const char *name = dev_name(dev);
+	int fd = dev->bcache_fd;
+	int do_close = 0;
+	int r = 1;
+
+	if ((dev->phys_block_size > 0) && (dev->block_size > 0)) {
+		*physical_block_size = (unsigned int)dev->phys_block_size;
+		*block_size = (unsigned int)dev->block_size;
+		return 1;
+	}
+
+	if (fd <= 0) {
+		if (!dev->open_count) {
+			if (!dev_open_readonly(dev))
+				return_0;
+			do_close = 1;
+		}
+		fd = dev_fd(dev);
+	}
+
+	if (dev->block_size == -1) {
+		if (ioctl(fd, BLKBSZGET, &dev->block_size) < 0) {
+			log_sys_error("ioctl BLKBSZGET", name);
+			r = 0;
+			goto out;
+		}
+		log_debug_devs("%s: Block size is %u bytes", name, dev->block_size);
+	}
+
+#ifdef BLKPBSZGET
+	/* BLKPBSZGET is available in kernel >= 2.6.32 only */
+	if (dev->phys_block_size == -1) {
+		if (ioctl(fd, BLKPBSZGET, &dev->phys_block_size) < 0) {
+			log_sys_error("ioctl BLKPBSZGET", name);
+			r = 0;
+			goto out;
+		}
+		log_debug_devs("%s: Physical block size is %u bytes", name, dev->phys_block_size);
+	}
+#elif defined (BLKSSZGET)
+	/* if we can't get physical block size, just use logical block size instead */
+	if (dev->phys_block_size == -1) {
+		if (ioctl(fd, BLKSSZGET, &dev->phys_block_size) < 0) {
+			log_sys_error("ioctl BLKSSZGET", name);
+			r = 0;
+			goto out;
+		}
+		log_debug_devs("%s: Physical block size can't be determined: Using logical block size of %u bytes", name, dev->phys_block_size);
+	}
+#else
+	/* if even BLKSSZGET is not available, use default 512b */
+	if (dev->phys_block_size == -1) {
+		dev->phys_block_size = 512;
+		log_debug_devs("%s: Physical block size can't be determined: Using block size of %u bytes instead", name, dev->phys_block_size);
+	}
+#endif
+
+	*physical_block_size = (unsigned int) dev->phys_block_size;
+	*block_size = (unsigned int) dev->block_size;
+out:
+	if (do_close && !dev_close_immediate(dev))
+		stack;
+
+	return r;
+}
+
 static int _dev_get_size_file(struct device *dev, uint64_t *size)
 {
 	const char *name = dev_name(dev);
@@ -86,9 +157,6 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size)
 	int fd = dev->bcache_fd;
 	int do_close = 0;

-	if (dm_list_empty(&dev->aliases))
-		return 0;
-
 	if (dev->size_seqno == _dev_size_seqno) {
 		log_very_verbose("%s: using cached size %" PRIu64 " sectors",
 				 name, dev->size);
@@ -97,16 +165,16 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size)
 	}

 	if (fd <= 0) {
-		if (!dev_open_readonly_quiet(dev))
+		if (!dev_open_readonly(dev))
 			return_0;
 		fd = dev_fd(dev);
 		do_close = 1;
 	}

 	if (ioctl(fd, BLKGETSIZE64, size) < 0) {
-		log_warn("WARNING: %s: ioctl BLKGETSIZE64 %s", name, strerror(errno));
+		log_sys_error("ioctl BLKGETSIZE64", name);
 		if (do_close && !dev_close_immediate(dev))
-			stack;
+			log_sys_error("close", name);
 		return 0;
 	}

@@ -117,28 +185,25 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size)
 	log_very_verbose("%s: size is %" PRIu64 " sectors", name, *size);

 	if (do_close && !dev_close_immediate(dev))
-		stack;
+		log_sys_error("close", name);

 	return 1;
 }

 static int _dev_read_ahead_dev(struct device *dev, uint32_t *read_ahead)
 {
-	long read_ahead_long = 0;
+	long read_ahead_long;

 	if (dev->read_ahead != -1) {
 		*read_ahead = (uint32_t) dev->read_ahead;
 		return 1;
 	}

-	if (!dev_open_readonly_quiet(dev)) {
-		log_warn("WARNING: Failed to open %s to get readahead %s.",
-			 dev_name(dev), strerror(errno));
-		return 0;
-	}
+	if (!dev_open_readonly(dev))
+		return_0;

 	if (ioctl(dev->fd, BLKRAGET, &read_ahead_long) < 0) {
-		log_warn("WARNING: %s: ioctl BLKRAGET %s.", dev_name(dev), strerror(errno));
+		log_sys_error("ioctl BLKRAGET", dev_name(dev));
 		if (!dev_close_immediate(dev))
 			stack;
 		return 0;
@@ -171,7 +236,7 @@ static int _dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64
 		       test_mode() ? " (test mode - suppressed)" : "");

 	if (!test_mode() && ioctl(dev->fd, BLKDISCARD, &discard_range) < 0) {
-		log_warn("WARNING: %s: ioctl BLKDISCARD at offset %" PRIu64 " size %" PRIu64 " failed: %s.",
+		log_error("%s: BLKDISCARD ioctl at offset %" PRIu64 " size %" PRIu64 " failed: %s.",
 			  dev_name(dev), offset_bytes, size_bytes, strerror(errno));
 		if (!dev_close_immediate(dev))
 			stack;
@@ -185,60 +250,6 @@ static int _dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64
 	return 1;
 }

-int dev_get_direct_block_sizes(struct device *dev, unsigned int *physical_block_size,
-				unsigned int *logical_block_size)
-{
-	int fd = dev->bcache_fd;
-	int do_close = 0;
-	unsigned int pbs = 0;
-	unsigned int lbs = 0;
-
-	if (dev->physical_block_size || dev->logical_block_size) {
-		*physical_block_size = dev->physical_block_size;
-		*logical_block_size = dev->logical_block_size;
-		return 1;
-	}
-
-	if (fd <= 0) {
-		if (!dev_open_readonly_quiet(dev))
-			return 0;
-		fd = dev_fd(dev);
-		do_close = 1;
-	}
-
-#ifdef BLKPBSZGET /* not defined before kernel version 2.6.32 (e.g. rhel5) */
-	/*
-	 * BLKPBSZGET from kernel comment for blk_queue_physical_block_size:
-	 * "the lowest possible sector size that the hardware can operate on
-	 * without reverting to read-modify-write operations"
-	 */
-	if (ioctl(fd, BLKPBSZGET, &pbs)) {
-		stack;
-		pbs = 0;
-	}
-#endif
-
-	/*
-	 * BLKSSZGET from kernel comment for blk_queue_logical_block_size:
-	 * "the lowest possible block size that the storage device can address."
-	 */
-	if (ioctl(fd, BLKSSZGET, &lbs)) {
-		stack;
-		lbs = 0;
-	}
-
-	dev->physical_block_size = pbs;
-	dev->logical_block_size = lbs;
-
-	*physical_block_size = pbs;
-	*logical_block_size = lbs;
-
-	if (do_close && !dev_close_immediate(dev))
-		stack;
-
-	return 1;
-}
-
 /*-----------------------------------------------------------------
 * Public functions
 *---------------------------------------------------------------*/
@@ -450,8 +461,10 @@ int dev_open_readonly_quiet(struct device *dev)
 static void _close(struct device *dev)
 {
 	if (close(dev->fd))
-		log_sys_debug("close", dev_name(dev));
+		log_sys_error("close", dev_name(dev));
 	dev->fd = -1;
+	dev->phys_block_size = -1;
+	dev->block_size = -1;

 	log_debug_devs("Closed %s", dev_name(dev));

--- a/lib/device/dev-md.c
+++ b/lib/device/dev-md.c
@@ -16,7 +16,6 @@
 #include "lib/misc/lib.h"
 #include "lib/device/dev-type.h"
 #include "lib/mm/xlate.h"
-#include "lib/misc/crc.h"
 #ifdef UDEV_SYNC_SUPPORT
 #include <libudev.h> /* for MD detection using udev db records */
 #include "lib/device/dev-ext-udev-constants.h"
@@ -49,116 +48,48 @@ static int _dev_has_md_magic(struct device *dev, uint64_t sb_offset)
 	return 0;
 }

-#define IMSM_SIGNATURE "Intel Raid ISM Cfg Sig. "
-#define IMSM_SIG_LEN (sizeof(IMSM_SIGNATURE) - 1)
-
-static int _dev_has_imsm_magic(struct device *dev, uint64_t devsize_sectors)
-{
-	char imsm_signature[IMSM_SIG_LEN];
-	uint64_t off;
-	unsigned int physical_block_size = 0;
-	unsigned int logical_block_size = 0;
-
-	if (!dev_get_direct_block_sizes(dev, &physical_block_size, &logical_block_size))
-		return_0;
-
-	if (logical_block_size == 4096)
-		off = (devsize_sectors * 512) - 8192;
-	else
-		off = (devsize_sectors * 512) - 1024;
-
-	if (!dev_read_bytes(dev, off, IMSM_SIG_LEN, imsm_signature))
-		return_0;
-
-	if (!memcmp(imsm_signature, IMSM_SIGNATURE, IMSM_SIG_LEN))
-		return 1;
-
-	return 0;
-}
-
-#define DDF_MAGIC 0xDE11DE11
-struct ddf_header {
-	uint32_t magic;
-	uint32_t crc;
-	char guid[24];
-	char revision[8];
-	char padding[472];
-};
-
-static int _dev_has_ddf_magic(struct device *dev, uint64_t devsize_sectors, uint64_t *sb_offset)
-{
-	struct ddf_header hdr;
-	uint32_t crc, our_crc;
-	uint64_t off;
-	uint64_t devsize_bytes = devsize_sectors * 512;
-
-	if (devsize_bytes < 0x30000)
-		return 0;
-
-	/* 512 bytes before the end of device (from libblkid) */
-	off = ((devsize_bytes / 0x200) - 1) * 0x200;
-
-	if (!dev_read_bytes(dev, off, 512, &hdr))
-		return_0;
-
-	if ((hdr.magic == cpu_to_be32(DDF_MAGIC)) ||
-	    (hdr.magic == cpu_to_le32(DDF_MAGIC))) {
-		crc = hdr.crc;
-		hdr.crc = 0xffffffff;
-		our_crc = calc_crc(0, (const uint8_t *)&hdr, 512);
-
-		if ((cpu_to_be32(our_crc) == crc) ||
-		    (cpu_to_le32(our_crc) == crc)) {
-			*sb_offset = off;
-			return 1;
-		} else {
-			log_debug_devs("Found md ddf magic at %llu wrong crc %x disk %x %s",
-				       (unsigned long long)off, our_crc, crc, dev_name(dev));
-			return 0;
-		}
-	}
-
-	/* 128KB before the end of device (from libblkid) */
-	off = ((devsize_bytes / 0x200) - 257) * 0x200;
-
-	if (!dev_read_bytes(dev, off, 512, &hdr))
-		return_0;
-
-	if ((hdr.magic == cpu_to_be32(DDF_MAGIC)) ||
-	    (hdr.magic == cpu_to_le32(DDF_MAGIC))) {
-		crc = hdr.crc;
-		hdr.crc = 0xffffffff;
-		our_crc = calc_crc(0, (const uint8_t *)&hdr, 512);
-
-		if ((cpu_to_be32(our_crc) == crc) ||
-		    (cpu_to_le32(our_crc) == crc)) {
-			*sb_offset = off;
-			return 1;
-		} else {
-			log_debug_devs("Found md ddf magic at %llu wrong crc %x disk %x %s",
-				       (unsigned long long)off, our_crc, crc, dev_name(dev));
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
 /*
- * _udev_dev_is_md_component() only works if
- *   external_device_info_source="udev"
- *
- * but
- *
- * udev_dev_is_md_component() in dev-type.c only works if
- *   obtain_device_list_from_udev=1
- *
- * and neither of those config setting matches very well
- * with what we're doing here.
+ * Calculate the position of the superblock.
+ * It is always aligned to a 4K boundary and
+ * depending on minor_version, it can be:
+ * 0: At least 8K, but less than 12K, from end of device
+ * 1: At start of device
+ * 2: 4K from start of device.
 */
+typedef enum {
+	MD_MINOR_VERSION_MIN,
+	MD_MINOR_V0 = MD_MINOR_VERSION_MIN,
+	MD_MINOR_V1,
+	MD_MINOR_V2,
+	MD_MINOR_VERSION_MAX = MD_MINOR_V2
+} md_minor_version_t;
+
+static uint64_t _v1_sb_offset(uint64_t size, md_minor_version_t minor_version)
+{
+	uint64_t sb_offset;
+
+	switch(minor_version) {
+	case MD_MINOR_V0:
+		sb_offset = (size - 8 * 2) & ~(4 * 2 - 1ULL);
+		break;
+	case MD_MINOR_V1:
+		sb_offset = 0;
+		break;
+	case MD_MINOR_V2:
+		sb_offset = 4 * 2;
+		break;
+	default:
+		log_warn(INTERNAL_ERROR "WARNING: Unknown minor version %d.",
+			 minor_version);
+		return 0;
+	}
+	sb_offset <<= SECTOR_SHIFT;
+
+	return sb_offset;
+}

 #ifdef UDEV_SYNC_SUPPORT
-static int _udev_dev_is_md_component(struct device *dev)
+static int _udev_dev_is_md(struct device *dev)
 {
 	const char *value;
 	struct dev_ext *ext;
@@ -172,7 +103,7 @@ static int _udev_dev_is_md_component(struct device *dev)
 	return !strcmp(value, DEV_EXT_UDEV_BLKID_TYPE_SW_RAID);
 }
 #else
-static int _udev_dev_is_md_component(struct device *dev)
+static int _udev_dev_is_md(struct device *dev)
 {
 	return 0;
 }
@@ -181,9 +112,10 @@ static int _udev_dev_is_md_component(struct device *dev)
 /*
 * Returns -1 on error
 */
-static int _native_dev_is_md_component(struct device *dev, uint64_t *offset_found, int full)
+static int _native_dev_is_md(struct device *dev, uint64_t *offset_found, int full)
 {
-	uint64_t size, sb_offset = 0;
+	md_minor_version_t minor;
+	uint64_t size, sb_offset;
 	int ret;

 	if (!scan_bcache)
@@ -198,9 +130,9 @@ static int _native_dev_is_md_component(struct device *dev, uint64_t *offset_foun
 		return 0;

 	/*
-	 * Some md versions locate the magic number at the end of the device.
-	 * Those checks can't be satisfied with the initial scan data, and
-	 * require an extra read i/o at the end of every device.  Issuing
+	 * Old md versions locate the magic number at the end of the device.
+	 * Those checks can't be satisfied with the initial bcache data, and
+	 * would require an extra read i/o at the end of every device.  Issuing
 	 * an extra read to every device in every command, just to check for
 	 * the old md format is a bad tradeoff.
 	 *
@@ -211,81 +143,42 @@ static int _native_dev_is_md_component(struct device *dev, uint64_t *offset_foun
 	 * and set it for commands that could possibly write to an md dev
 	 * (pvcreate/vgcreate/vgextend).
 	 */
-
-	/*
-	 * md superblock version 1.1 at offset 0 from start
-	 */
-
-	if (_dev_has_md_magic(dev, 0)) {
-		log_debug_devs("Found md magic number at offset 0 of %s.", dev_name(dev));
-		ret = 1;
-		goto out;
-	}
-
-	/*
-	 * md superblock version 1.2 at offset 4KB from start
-	 */
-
-	if (_dev_has_md_magic(dev, 4096)) {
-		log_debug_devs("Found md magic number at offset 4096 of %s.", dev_name(dev));
-		ret = 1;
-		goto out;
-	}
-
 	if (!full) {
+		sb_offset = 0;
+		if (_dev_has_md_magic(dev, sb_offset)) {
+			log_debug_devs("Found md magic number at offset 0 of %s.", dev_name(dev));
+			ret = 1;
+			goto out;
+		}
+
+		sb_offset = 8 << SECTOR_SHIFT;
+		if (_dev_has_md_magic(dev, sb_offset)) {
+			log_debug_devs("Found md magic number at offset %d of %s.", (int)sb_offset, dev_name(dev));
+			ret = 1;
+			goto out;
+		}
+
 		ret = 0;
 		goto out;
 	}

-	/*
-	 * Handle superblocks at the end of the device.
-	 */
-
-	/*
-	 * md superblock version 0 at 64KB from end of device
-	 * (after end is aligned to 64KB)
-	 */
-
+	/* Check if it is an md component device. */
+	/* Version 0.90.0 */
 	sb_offset = MD_NEW_SIZE_SECTORS(size) << SECTOR_SHIFT;
-
 	if (_dev_has_md_magic(dev, sb_offset)) {
-		log_debug_devs("Found md magic number at offset %llu of %s.", (unsigned long long)sb_offset, dev_name(dev));
 		ret = 1;
 		goto out;
 	}

-	/*
-	 * md superblock version 1.0 at 8KB from end of device
-	 */
-
-	sb_offset = ((size - 8 * 2) & ~(4 * 2 - 1ULL)) << SECTOR_SHIFT;
-
-	if (_dev_has_md_magic(dev, sb_offset)) {
-		log_debug_devs("Found md magic number at offset %llu of %s.", (unsigned long long)sb_offset, dev_name(dev));
-		ret = 1;
-		goto out;
-	}
-
-	/*
-	 * md imsm superblock 1K from end of device
-	 */
-
-	if (_dev_has_imsm_magic(dev, size)) {
-		log_debug_devs("Found md imsm magic number at offset %llu of %s.", (unsigned long long)sb_offset, dev_name(dev));
-		sb_offset = 1024;
-		ret = 1;
-		goto out;
-	}
-
-	/*
-	 * md ddf superblock 512 bytes from end, or 128KB from end
-	 */
-
-	if (_dev_has_ddf_magic(dev, size, &sb_offset)) {
-		log_debug_devs("Found md ddf magic number at offset %llu of %s.", (unsigned long long)sb_offset, dev_name(dev));
-		ret = 1;
-		goto out;
-	}
+	minor = MD_MINOR_VERSION_MIN;
+	/* Version 1, try v1.0 -> v1.2 */
+	do {
+		sb_offset = _v1_sb_offset(size, minor);
+		if (_dev_has_md_magic(dev, sb_offset)) {
+			ret = 1;
+			goto out;
+		}
+	} while (++minor <= MD_MINOR_VERSION_MAX);

 	ret = 0;
 out:
@@ -295,7 +188,7 @@ out:
 	return ret;
 }

-int dev_is_md_component(struct device *dev, uint64_t *offset_found, int full)
+int dev_is_md(struct device *dev, uint64_t *offset_found, int full)
 {
 	int ret;

@@ -305,25 +198,19 @@ int dev_is_md_component(struct device *dev, uint64_t *offset_found, int full)
 	 * information is not in udev db.
 	 */
 	if ((dev->ext.src == DEV_EXT_NONE) || offset_found) {
-		ret = _native_dev_is_md_component(dev, offset_found, full);
+		ret = _native_dev_is_md(dev, offset_found, full);

 		if (!full) {
 			if (!ret || (ret == -EAGAIN)) {
 				if (udev_dev_is_md_component(dev))
-					ret = 1;
+					return 1;
 			}
 		}
-		if (ret && (ret != -EAGAIN))
-			dev->flags |= DEV_IS_MD_COMPONENT;
 		return ret;
 	}

-	if (dev->ext.src == DEV_EXT_UDEV) {
-		ret = _udev_dev_is_md_component(dev);
-		if (ret && (ret != -EAGAIN))
-			dev->flags |= DEV_IS_MD_COMPONENT;
-		return ret;
-	}
+	if (dev->ext.src == DEV_EXT_UDEV)
+		return _udev_dev_is_md(dev);

 	log_error(INTERNAL_ERROR "Missing hook for MD device recognition "
 		  "using external device info source %s", dev_ext_name(dev));
@@ -393,12 +280,12 @@ static int _md_sysfs_attribute_scanf(struct dev_types *dt,
 		return ret;

 	if (!(fp = fopen(path, "r"))) {
-		log_debug("_md_sysfs_attribute_scanf fopen failed %s", path);
+		log_sys_error("fopen", path);
 		return ret;
 	}

 	if (!fgets(buffer, sizeof(buffer), fp)) {
-		log_debug("_md_sysfs_attribute_scanf fgets failed %s", path);
+		log_sys_error("fgets", path);
 		goto out;
 	}

@@ -540,7 +427,7 @@ int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev)

 	if (_md_sysfs_attribute_scanf(dt, dev, attribute,
 				      "%s", &version_string) != 1)
-		return 0;
+		return -1;

 	log_very_verbose("Device %s %s is %s.",
 			 dev_name(dev), attribute, version_string);
@@ -552,7 +439,7 @@ int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev)

 #else

-int dev_is_md_component(struct device *dev __attribute__((unused)),
+int dev_is_md(struct device *dev __attribute__((unused)),
 	      uint64_t *sb __attribute__((unused)))
 {
 	return 0;
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -21,7 +21,6 @@
 #include "lib/metadata/metadata.h"
 #include "lib/device/bcache.h"
 #include "lib/label/label.h"
-#include "lib/commands/toolcontext.h"

 #ifdef BLKID_WIPING_SUPPORT
 #include <blkid.h>
@@ -36,16 +35,48 @@
 #include <ctype.h>

 /*
- * An nvme device has major number 259 (BLKEXT), minor number <minor>,
- * and reading /sys/dev/block/259:<minor>/device/dev shows a character
- * device cmajor:cminor where cmajor matches the major number of the
- * nvme character device entry in /proc/devices.  Checking all of that
- * is excessive and unnecessary compared to just comparing /dev/name*.
+ * dev is pmem if /sys/dev/block/<major>:<minor>/queue/dax is 1
 */

-int dev_is_nvme(struct dev_types *dt, struct device *dev)
+int dev_is_pmem(struct device *dev)
 {
-	return (dev->flags & DEV_IS_NVME) ? 1 : 0;
+	FILE *fp;
+	char path[PATH_MAX];
+	char buffer[64];
+	int is_pmem = 0;
+
+	if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d/queue/dax",
+			dm_sysfs_dir(),
+			(int) MAJOR(dev->dev),
+			(int) MINOR(dev->dev)) < 0) {
+		log_warn("Sysfs path for %s dax is too long.", dev_name(dev));
+		return 0;
+	}
+
+	if (!(fp = fopen(path, "r")))
+		return 0;
+
+	if (!fgets(buffer, sizeof(buffer), fp)) {
+		log_warn("Failed to read %s.", path);
+		if (fclose(fp))
+			log_sys_debug("fclose", path);
+		return 0;
+	} else if (sscanf(buffer, "%d", &is_pmem) != 1) {
+		log_warn("Failed to parse %s '%s'.", path, buffer);
+		if (fclose(fp))
+			log_sys_debug("fclose", path);
+		return 0;
+	}
+
+	if (fclose(fp))
+		log_sys_debug("fclose", path);
+
+	if (is_pmem) {
+		log_debug("%s is pmem", dev_name(dev));
+		return 1;
+	}
+
+	return 0;
 }

 int dev_is_lv(struct device *dev)
@@ -53,7 +84,6 @@ int dev_is_lv(struct device *dev)
 	FILE *fp;
 	char path[PATH_MAX];
 	char buffer[64];
-	int ret = 0;

 	if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d/dm/uuid",
 			dm_sysfs_dir(),
@@ -66,15 +96,17 @@ int dev_is_lv(struct device *dev)
 	if (!(fp = fopen(path, "r")))
 		return 0;

-	if (!fgets(buffer, sizeof(buffer), fp))
-		log_debug("Failed to read %s.", path);
-	else if (!strncmp(buffer, "LVM-", 4))
-		ret = 1;
+	if (!fgets(buffer, sizeof(buffer), fp)) {
+		log_warn("Failed to read %s.", path);
+		fclose(fp);
+		return 0;
+	}

-	if (fclose(fp))
-		log_sys_debug("fclose", path);
+	fclose(fp);

-	return ret;
+	if (!strncmp(buffer, "LVM-", 4))
+		return 1;
+	return 0;
 }

 struct dev_types *create_dev_types(const char *proc_dir,
@@ -211,7 +243,7 @@ struct dev_types *create_dev_types(const char *proc_dir,
 				log_error("Expecting string in devices/types "
 					  "in config file");
 				if (fclose(pd))
-					log_sys_debug("fclose", proc_devices);
+					log_sys_error("fclose", proc_devices);
 				goto bad;
 			}
 			dev_len = strlen(cv->v.str);
@@ -222,7 +254,7 @@ struct dev_types *create_dev_types(const char *proc_dir,
 					  "in devices/types in config file",
 					  name);
 				if (fclose(pd))
-					log_sys_debug("fclose", proc_devices);
+					log_sys_error("fclose", proc_devices);
 				goto bad;
 			}
 			if (!cv->v.i) {
@@ -230,7 +262,7 @@ struct dev_types *create_dev_types(const char *proc_dir,
 					  "%s in devices/types in config file",
 					  name);
 				if (fclose(pd))
-					log_sys_debug("fclose", proc_devices);
+					log_sys_error("fclose", proc_devices);
 				goto bad;
 			}
 			if (dev_len <= strlen(line + i) &&
@@ -283,9 +315,6 @@ int dev_subsystem_part_major(struct dev_types *dt, struct device *dev)

 const char *dev_subsystem_name(struct dev_types *dt, struct device *dev)
 {
-	if (dev->flags & DEV_IS_NVME)
-		return "NVME";
-
 	if (MAJOR(dev->dev) == dt->device_mapper_major)
 		return "DM";

@@ -332,6 +361,7 @@ int major_is_scsi_device(struct dev_types *dt, int major)
 	return (dt->dev_type_array[major].flags & PARTITION_SCSI_DEVICE) ? 1 : 0;
 }

+
 static int _loop_is_with_partscan(struct device *dev)
 {
 	FILE *fp;
@@ -363,45 +393,6 @@ static int _loop_is_with_partscan(struct device *dev)
 	return partscan;
 }

-int dev_get_partition_number(struct device *dev, int *num)
-{
-	char path[PATH_MAX];
-	char buf[8] = { 0 };
-	dev_t devt = dev->dev;
-	struct stat sb;
-
-	if (dev->part != -1) {
-		*num = dev->part;
-		return 1;
-	}
-
-	if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d/partition",
-			dm_sysfs_dir(), (int)MAJOR(devt), (int)MINOR(devt)) < 0) {
-		log_error("Failed to create sysfs path for %s", dev_name(dev));
-		return 0;
-	}
-
-	if (stat(path, &sb)) {
-		dev->part = 0;
-		*num = 0;
-		return 1;
-	}
-
-	if (!get_sysfs_value(path, buf, sizeof(buf), 0)) {
-		log_error("Failed to read sysfs path for %s", dev_name(dev));
-		return 0;
-	}
-
-	if (!buf[0]) {
-		log_error("Failed to read sysfs partition value for %s", dev_name(dev));
-		return 0;
-	}
-
-	dev->part = atoi(buf);
-	*num = dev->part;
-	return 1;
-}
-
 /* See linux/genhd.h and fs/partitions/msdos */
 #define PART_MAGIC 0xAA55
 #define PART_MAGIC_OFFSET UINT64_C(0x1FE)
@@ -420,28 +411,6 @@ struct partition {
 	uint32_t nr_sects;
 } __attribute__((packed));

-static int _has_sys_partition(struct device *dev)
-{
-	char path[PATH_MAX];
-	struct stat info;
-	int major = (int) MAJOR(dev->dev);
-	int minor = (int) MINOR(dev->dev);
-
-	/* check if dev is a partition */
-	if (dm_snprintf(path, sizeof(path), "%s/dev/block/%d:%d/partition",
-			dm_sysfs_dir(), major, minor) < 0) {
-		log_warn("WARNING: %s: partition path is too long.", dev_name(dev));
-		return 0;
-	}
-
-	if (stat(path, &info) == -1) {
-		if (errno != ENOENT)
-			log_sys_debug("stat", path);
-		return 0;
-	}
-	return 1;
-}
-
 static int _is_partitionable(struct dev_types *dt, struct device *dev)
 {
 	int parts = major_max_partitions(dt, MAJOR(dev->dev));
@@ -458,13 +427,6 @@ static int _is_partitionable(struct dev_types *dt, struct device *dev)
 	    _loop_is_with_partscan(dev))
 		return 1;

-	if (dev_is_nvme(dt, dev)) {
-		/* If this dev is already a partition then it's not partitionable. */
-		if (_has_sys_partition(dev))
-			return 0;
-		return 1;
-	}
-
 	if ((parts <= 1) || (MINOR(dev->dev) % parts))
 		return 0;

@@ -602,22 +564,16 @@ int dev_is_partitioned(struct dev_types *dt, struct device *dev)
 */
 int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
 {
+	const char *sysfs_dir = dm_sysfs_dir();
 	int major = (int) MAJOR(dev->dev);
 	int minor = (int) MINOR(dev->dev);
 	char path[PATH_MAX];
 	char temp_path[PATH_MAX];
 	char buffer[64];
+	struct stat info;
 	FILE *fp = NULL;
 	int parts, residue, size, ret = 0;

-	/*
-	 * /dev/nvme devs don't use the major:minor numbering like
-	 * block dev types that have their own major number, so
-	 * the calculation based on minor number doesn't work.
-	 */
-	if (dev_is_nvme(dt, dev))
-		goto sys_partition;
-
 	/*
 	 * Try to get the primary dev out of the
 	 * list of known device types first.
@@ -633,14 +589,23 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
 		goto out;
 	}

- sys_partition:
 	/*
 	 * If we can't get the primary dev out of the list of known device
 	 * types, try to look at sysfs directly then. This is more complex
 	 * way and it also requires certain sysfs layout to be present
 	 * which might not be there in old kernels!
 	 */
-	if (!_has_sys_partition(dev)) {
+
+	/* check if dev is a partition */
+	if (dm_snprintf(path, sizeof(path), "%s/dev/block/%d:%d/partition",
+			sysfs_dir, major, minor) < 0) {
+		log_error("dm_snprintf partition failed");
+		goto out;
+	}
+
+	if (stat(path, &info) == -1) {
+		if (errno != ENOENT)
+			log_sys_error("stat", path);
 		*result = dev->dev;
 		ret = 1;
 		goto out; /* dev is not a partition! */
@@ -653,31 +618,25 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
 	 * - basename ../../block/md0/md0  = md0
 	 * Parent's 'dev' sysfs attribute  = /sys/block/md0/dev
 	 */
-	if (dm_snprintf(path, sizeof(path), "%s/dev/block/%d:%d",
-			dm_sysfs_dir(), major, minor) < 0) {
-		log_warn("WARNING: %s: major:minor sysfs path is too long.", dev_name(dev));
-		return 0;
-	}
-	if ((size = readlink(path, temp_path, sizeof(temp_path) - 1)) < 0) {
-		log_warn("WARNING: Readlink of %s failed.", path);
+	if ((size = readlink(dirname(path), temp_path, sizeof(temp_path) - 1)) < 0) {
+		log_sys_error("readlink", path);
 		goto out;
 	}

 	temp_path[size] = '\0';

 	if (dm_snprintf(path, sizeof(path), "%s/block/%s/dev",
-			dm_sysfs_dir(), basename(dirname(temp_path))) < 0) {
-		log_warn("WARNING: sysfs path for %s is too long.",
-			 basename(dirname(temp_path)));
+			sysfs_dir, basename(dirname(temp_path))) < 0) {
+		log_error("dm_snprintf dev failed");
 		goto out;
 	}

 	/* finally, parse 'dev' attribute and create corresponding dev_t */
 	if (!(fp = fopen(path, "r"))) {
 		if (errno == ENOENT)
-			log_debug("sysfs file %s does not exist.", path);
+			log_error("sysfs file %s does not exist.", path);
 		else
-			log_sys_debug("fopen", path);
+			log_sys_error("fopen", path);
 		goto out;
 	}

@@ -687,7 +646,7 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
 	}

 	if (sscanf(buffer, "%d:%d", &major, &minor) != 2) {
-		log_warn("WARNING: sysfs file %s not in expected MAJ:MIN format: %s",
+		log_error("sysfs file %s not in expected MAJ:MIN format: %s",
 			  path, buffer);
 		goto out;
 	}
@@ -695,36 +654,11 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
 	ret = 2;
 out:
 	if (fp && fclose(fp))
-		log_sys_debug("fclose", path);
+		log_sys_error("fclose", path);

 	return ret;
 }

-#ifdef BLKID_WIPING_SUPPORT
-int get_fs_block_size(const char *pathname, uint32_t *fs_block_size)
-{
-	char *block_size_str = NULL;
-
-	if ((block_size_str = blkid_get_tag_value(NULL, "BLOCK_SIZE", pathname))) {
-		*fs_block_size = (uint32_t)atoi(block_size_str);
-		free(block_size_str);
-		log_debug("Found blkid BLOCK_SIZE %u for fs on %s", *fs_block_size, pathname);
-		return 1;
-	} else {
-		log_debug("No blkid BLOCK_SIZE for fs on %s", pathname);
-		*fs_block_size = 0;
-		return 0;
-	}
-}
-#else
-int get_fs_block_size(const char *pathname, uint32_t *fs_block_size)
-{
-	log_debug("Disabled blkid BLOCK_SIZE for fs.");
-	*fs_block_size = 0;
-	return 0;
-}
-#endif
-
 #ifdef BLKID_WIPING_SUPPORT

 static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
@@ -757,7 +691,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
 				return 0;
 			}

-			log_warn("WARNING: " MSG_FAILED_SIG_OFFSET MSG_WIPING_SKIPPED, type, name);
+			log_error("WARNING: " MSG_FAILED_SIG_OFFSET MSG_WIPING_SKIPPED, type, name);
 			return 2;
 		}
 		if (blkid_probe_lookup_value(probe, "SBMAGIC", &magic, &len)) {
@@ -891,7 +825,7 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam
 			   int (*signature_detection_fn)(struct device *dev, uint64_t *offset_found, int full))
 {
 	int wipe;
-	uint64_t offset_found = 0;
+	uint64_t offset_found;

 	wipe = signature_detection_fn(dev, &offset_found, 1);
 	if (wipe == -1) {
@@ -932,7 +866,7 @@ static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name,
 		wiped = &wiped_tmp;
 	*wiped = 0;

-	if (!_wipe_signature(dev, "software RAID md superblock", name, 4, yes, force, wiped, dev_is_md_component) ||
+	if (!_wipe_signature(dev, "software RAID md superblock", name, 4, yes, force, wiped, dev_is_md) ||
 	    !_wipe_signature(dev, "swap signature", name, 10, yes, force, wiped, dev_is_swap) ||
 	    !_wipe_signature(dev, "LUKS signature", name, 8, yes, force, wiped, dev_is_luks))
 		return 0;
@@ -955,9 +889,9 @@ int wipe_known_signatures(struct cmd_context *cmd, struct device *dev,
 							 yes, force, wiped);
 #endif
 	if (blkid_wiping_enabled) {
-		log_warn("WARNING: allocation/use_blkid_wiping=1 configuration setting is set "
+		log_warn("allocation/use_blkid_wiping=1 configuration setting is set "
 			 "while LVM is not compiled with blkid wiping support.");
-		log_warn("WARNING: Falling back to native LVM signature detection.");
+		log_warn("Falling back to native LVM signature detection.");
 	}
 	return _wipe_known_signatures_with_lvm(dev, name,
 					       types_to_exclude,
@@ -973,23 +907,25 @@ static int _snprintf_attr(char *buf, size_t buf_size, const char *sysfs_dir,
 	if (dm_snprintf(buf, buf_size, "%s/dev/block/%d:%d/%s", sysfs_dir,
 			(int)MAJOR(dev), (int)MINOR(dev),
 			attribute) < 0) {
-		log_warn("WARNING: sysfs path for %s attribute is too long.", attribute);
+		log_warn("dm_snprintf %s failed.", attribute);
 		return 0;
 	}

 	return 1;
 }

-static int _dev_sysfs_block_attribute(struct dev_types *dt,
-				      const char *attribute,
-				      struct device *dev,
-				      unsigned long *value)
+static unsigned long _dev_topology_attribute(struct dev_types *dt,
+					     const char *attribute,
+					     struct device *dev,
+					     unsigned long default_value)
 {
 	const char *sysfs_dir = dm_sysfs_dir();
 	char path[PATH_MAX], buffer[64];
 	FILE *fp;
-	dev_t primary = 0;
-	int ret = 0;
+	struct stat info;
+	dev_t uninitialized_var(primary);
+	unsigned long result = default_value;
+	unsigned long value = 0UL;

 	if (!attribute || !*attribute)
 		goto_out;
@@ -998,16 +934,16 @@ static int _dev_sysfs_block_attribute(struct dev_types *dt,
 		goto_out;

 	if (!_snprintf_attr(path, sizeof(path), sysfs_dir, attribute, dev->dev))
-		goto_out;
+                goto_out;

 	/*
 	 * check if the desired sysfs attribute exists
 	 * - if not: either the kernel doesn't have topology support
 	 *   or the device could be a partition
 	 */
-	if (!(fp = fopen(path, "r"))) {
+	if (stat(path, &info) == -1) {
 		if (errno != ENOENT) {
-			log_sys_debug("fopen", path);
+			log_sys_debug("stat", path);
 			goto out;
 		}
 		if (!dev_get_primary_dev(dt, dev, &primary))
@@ -1017,54 +953,44 @@ static int _dev_sysfs_block_attribute(struct dev_types *dt,
 		if (!_snprintf_attr(path, sizeof(path), sysfs_dir, attribute, primary))
 			goto_out;

-		if (!(fp = fopen(path, "r"))) {
+		if (stat(path, &info) == -1) {
 			if (errno != ENOENT)
-				log_sys_debug("fopen", path);
+				log_sys_debug("stat", path);
 			goto out;
 		}
 	}

+	if (!(fp = fopen(path, "r"))) {
+		log_sys_debug("fopen", path);
+		goto out;
+	}
+
 	if (!fgets(buffer, sizeof(buffer), fp)) {
 		log_sys_debug("fgets", path);
 		goto out_close;
 	}

-	if (sscanf(buffer, "%lu", value) != 1) {
-		log_warn("WARNING: sysfs file %s not in expected format: %s", path, buffer);
+	if (sscanf(buffer, "%lu", &value) != 1) {
+		log_warn("sysfs file %s not in expected format: %s", path, buffer);
 		goto out_close;
 	}

-	ret = 1;
+	log_very_verbose("Device %s: %s is %lu%s.",
+			 dev_name(dev), attribute, value, default_value ? "" : " bytes");
+
+	result = value >> SECTOR_SHIFT;
+
+	if (!result && value) {
+		log_warn("WARNING: Device %s: %s is %lu and is unexpectedly less than sector.",
+			 dev_name(dev), attribute, value);
+		result = 1;
+	}

 out_close:
 	if (fclose(fp))
 		log_sys_debug("fclose", path);

 out:
-	return ret;
-}
-
-static unsigned long _dev_topology_attribute(struct dev_types *dt,
-					     const char *attribute,
-					     struct device *dev,
-					     unsigned long default_value)
-{
-	unsigned long result = default_value;
-	unsigned long value = 0UL;
-
-	if (_dev_sysfs_block_attribute(dt, attribute, dev, &value)) {
-		log_very_verbose("Device %s: %s is %lu%s.",
-				 dev_name(dev), attribute, value, default_value ? "" : " bytes");
-
-		result = value >> SECTOR_SHIFT;
-
-		if (!result && value) {
-			log_warn("WARNING: Device %s: %s is %lu and is unexpectedly less than sector.",
-				 dev_name(dev), attribute, value);
-			result = 1;
-		}
-	}
-
 	return result;
 }

@@ -1095,17 +1021,8 @@ unsigned long dev_discard_granularity(struct dev_types *dt, struct device *dev)

 int dev_is_rotational(struct dev_types *dt, struct device *dev)
 {
-	unsigned long value;
-	return _dev_sysfs_block_attribute(dt, "queue/rotational", dev, &value) ? (int) value : 1;
+	return (int) _dev_topology_attribute(dt, "queue/rotational", dev, 1UL);
 }
-
-/* dev is pmem if /sys/dev/block/<major>:<minor>/queue/dax is 1 */
-int dev_is_pmem(struct dev_types *dt, struct device *dev)
-{
-	unsigned long value;
-	return _dev_sysfs_block_attribute(dt, "queue/dax", dev, &value) ? (int) value : 0;
-}
-
 #else

 int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
@@ -1142,11 +1059,6 @@ int dev_is_rotational(struct dev_types *dt, struct device *dev)
 {
 	return 1;
 }
-
-int dev_is_pmem(struct dev_types *dt, struct device *dev)
-{
-	return 0;
-}
 #endif

 #ifdef UDEV_SYNC_SUPPORT
@@ -1206,9 +1118,6 @@ static struct udev_device *_udev_get_dev(struct device *dev)
 			   i + 1, UDEV_DEV_IS_COMPONENT_ITERATION_COUNT,
 			   i * UDEV_DEV_IS_COMPONENT_USLEEP);

-		if (!udev_sleeping())
-			break;
-
 		usleep(UDEV_DEV_IS_COMPONENT_USLEEP);
 		i++;
 	}
@@ -1271,7 +1180,6 @@ int udev_dev_is_md_component(struct device *dev)
 	if (value && !strcmp(value, DEV_EXT_UDEV_BLKID_TYPE_SW_RAID)) {
 		log_debug("Device %s is md raid component based on blkid variable in udev db (%s=\"%s\").",
 			   dev_name(dev), DEV_EXT_UDEV_BLKID_TYPE, value);
-		dev->flags |= DEV_IS_MD_COMPONENT;
 		ret = 1;
 		goto out;
 	}
--- a/lib/device/dev-type.h
+++ b/lib/device/dev-type.h
@@ -57,7 +57,7 @@ const char *dev_subsystem_name(struct dev_types *dt, struct device *dev);
 int major_is_scsi_device(struct dev_types *dt, int major);

 /* Signature/superblock recognition with position returned where found. */
-int dev_is_md_component(struct device *dev, uint64_t *sb, int full);
+int dev_is_md(struct device *dev, uint64_t *sb, int full);
 int dev_is_swap(struct device *dev, uint64_t *signature, int full);
 int dev_is_luks(struct device *dev, uint64_t *signature, int full);
 int dasd_is_cdl_formatted(struct device *dev);
@@ -83,7 +83,6 @@ int dev_is_md_with_end_superblock(struct dev_types *dt, struct device *dev);
 int major_max_partitions(struct dev_types *dt, int major);
 int dev_is_partitioned(struct dev_types *dt, struct device *dev);
 int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result);
-int dev_get_partition_number(struct device *dev, int *num);

 /* Various device properties */
 unsigned long dev_alignment_offset(struct dev_types *dt, struct device *dev);
@@ -94,12 +93,8 @@ unsigned long dev_discard_granularity(struct dev_types *dt, struct device *dev);

 int dev_is_rotational(struct dev_types *dt, struct device *dev);

-int dev_is_pmem(struct dev_types *dt, struct device *dev);
-
-int dev_is_nvme(struct dev_types *dt, struct device *dev);
+int dev_is_pmem(struct device *dev);

 int dev_is_lv(struct device *dev);

-int get_fs_block_size(const char *pathname, uint32_t *fs_block_size);
-
 #endif
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -36,9 +36,6 @@
 #define DEV_FILTER_OUT_SCAN	0x00004000	/* filtered out during label scan */
 #define DEV_BCACHE_WRITE	0x00008000      /* bcache_fd is open with RDWR */
 #define DEV_SCAN_FOUND_LABEL	0x00010000      /* label scan read dev and found label */
-#define DEV_IS_MD_COMPONENT	0x00020000	/* device is an md component */
-#define DEV_IS_NVME		0x00040000	/* set if dev is nvme */
-#define DEV_MATCHED_USE_ID	0x00080000	/* matched an entry from cmd->use_devices */

 /*
 * Support for external device info.
@@ -57,67 +54,22 @@ struct dev_ext {
 	void *handle;
 };

-#define DEV_ID_TYPE_SYS_WWID   0x0001
-#define DEV_ID_TYPE_SYS_SERIAL 0x0002
-#define DEV_ID_TYPE_MPATH_UUID 0x0003
-#define DEV_ID_TYPE_MD_UUID    0x0004
-#define DEV_ID_TYPE_LOOP_FILE  0x0005
-#define DEV_ID_TYPE_CRYPT_UUID 0x0006
-#define DEV_ID_TYPE_LVMLV_UUID 0x0007
-#define DEV_ID_TYPE_DEVNAME    0x0008
-
-/*
- * A device ID of a certain type for a device.
- * A struct device may have multiple dev_id structs on dev->ids.
- * One of them will be the one that's used, pointed to by dev->id.
- */
-
-struct dev_id {
-	struct dm_list list;
-	struct device *dev;
-	uint16_t idtype;	/* DEV_ID_TYPE_ */
-	char *idname;		/* id string determined by idtype */
-};
-
-/*
- * A device listed in devices file that lvm should use.
- * Each entry in the devices file is represented by a struct dev_use.
- * The structs are kept on cmd->use_devices.
- * idtype/idname/pvid/part are set when reading the devices file.
- * du->dev is set when a struct dev_use is matched to a struct device.
- */
-
-struct dev_use {
-	struct dm_list list;
-	struct device *dev;
-	int part;
-	uint16_t idtype;
-	char *idname;
-	char *devname;
-	char *pvid;
-};
-
 /*
 * All devices in LVM will be represented by one of these.
 * pointer comparisons are valid.
 */
 struct device {
 	struct dm_list aliases;	/* struct dm_str_list */
-	struct dm_list ids; /* struct dev_id, different entries for different idtypes */
-	struct dev_id *id; /* points to the the ids entry being used for this dev */
 	dev_t dev;

 	/* private */
 	int fd;
 	int open_count;
-	int physical_block_size; /* From BLKPBSZGET: lowest possible sector size that the hardware can operate on without reverting to read-modify-write operations */
-	int logical_block_size;  /* From BLKSSZGET: lowest possible block size that the storage device can address */
+	int phys_block_size;
+	int block_size;
 	int read_ahead;
 	int bcache_fd;
-	int bcache_di;
-	int part;		/* partition number */
 	uint32_t flags;
-	uint32_t filtered_flags;
 	unsigned size_seqno;
 	uint64_t size;
 	uint64_t end;
@@ -177,8 +129,7 @@ void dev_size_seqno_inc(void);
 /*
 * All io should use these routines.
 */
-int dev_get_direct_block_sizes(struct device *dev, unsigned int *physical_block_size,
-                               unsigned int *logical_block_size);
+int dev_get_block_size(struct device *dev, unsigned int *phys_block_size, unsigned int *block_size);
 int dev_get_size(struct device *dev, uint64_t *size);
 int dev_get_read_ahead(struct device *dev, uint32_t *read_ahead);
 int dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_bytes);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Teigland	76df65d520	tests: add missing-pv missing-pv-unused	2019-04-12 13:56:31 -05:00
David Teigland	395849f6ca	vgck: dumpmetadata to dump metadata from disk vgck --dumpmetadata dumps the exact metadata text from the mda to stdout or file. Specific PVs can be selected. This is useful for debugging, testing, and recovery.	2019-04-12 13:56:31 -05:00
David Teigland	5b15c84d3e	improve some warning messages	2019-04-12 11:08:23 -05:00
David Teigland	d4099fdcb0	remove unused or moved code this would have been done as part of the prior commit, but 'diff' was becoming confused and made as mess.	2019-04-12 11:08:23 -05:00
David Teigland	7521b7deaa	improve reading and repairing vg metadata The fact that vg repair is implemented as a part of vg read has led to a messy and complicated implementation of vg_read, and limited and uncontrolled repair capability. This splits read and repair apart. Summary ------- - take all kinds of various repairs out of vg_read - vg_read no longer writes anything - vg_read now simply reads and returns vg metadata - vg_read ignores bad or old copies of metadata - vg_read proceeds with a single good copy of metadata - improve error checks and handling when reading - keep track of bad (corrupt) copies of metadata in lvmcache - keep track of old (seqno) copies of metadata in lvmcache - keep track of outdated PVs in lvmcache - vg_write will do basic repairs - new command vgck --updatemetdata will do all repairs Details ------- - In scan, do not delete dev from lvmcache if reading/processing fails; the dev is still present, and removing it makes it look like the dev is not there. Records are now kept about the problems with each PV so they be fixed/repaired in the appropriate places. - In scan, record a bad mda on failure, and delete the mda from mda in use list so it will not be used by vg_read or vg_write, only by repair. - In scan, succeed if any good mda on a device is found, instead of failing if any is bad. The bad/old copies of metadata should not interfere with normal usage while good copies can be used. - In scan, add a record of old mdas in lvmcache for later, do not repair them while reading, and do not let them prevent us from finding and using a good copy of metadata from elsewhere. One result is that "inconsistent metadata" is no longer a read error, but instead a record in lvmcache that can be addressed separate from the read. - Treat a dev with no good mdas like a dev with no mdas, which is an existing case we already handle. - Don't use a fake vg "handle" for returning an error from vg_read, or the vg_read_error function for getting that error number; just return null if the vg cannot be read or used, and an error_flags arg with flags set for the specific kind of error (which can be used later for determining the kind of repair.) - Saving an original copy of the vg metadata, for purposes of reverting a write, is now done explicitly in vg_read instead of being hidden in the vg_make_handle function. - When a vg is not accessible due to "access restrictions" but is otherwise fine, return the vg through the new error_vg arg so that process_each_pv can skip the PVs in the VG while processing. (This is a temporary accomodation for the way process_each_pv tracks which devs have been looked at, and can be dropped later when process_each_pv implementation dev tracking is changed.) - vg_read does not try to fix or recover a vg, but now just reads the metadata, checks access restrictions and returns it. (Checking access restrictions might be better done outside of vg_read, but this is a later improvement.) - Move vg_read/_vg_read and its helper functions to read.c (mainly so that the diff is cleaner and more readable.) - helper functions moved to read.c remain largley unchanged: _is_foreign_vg _check_pv_ext _check_devs_used_correspond_with_lv _check_devs_used_correspond_with_vg _destroy_fid _access_vg_clustered _allow_extra_system_id _access_vg_lock_type is_system_id_allowed _access_vg_systemid - _vg_read now simply makes one attempt to read metadata from each mda, and uses the most recent copy to return to the caller in the form of a 'vg' struct. (bad mdas were excluded during the scan and are not retried) (old mdas were not excluded during scan and are retried here) - vg_read uses _vg_read to get the latest copy of metadata from mdas, and then makes various checks against it to produce warnings, and to check if VG access is allowed (access restrictions include: writable, foreign, shared, clustered, missing pvs). - Things that were previously silently/automatically written by vg_read that are now done by vg_write, based on the records made in lvmcache during the scan and read: . clearing the missing flag . updating old copies of metadata . clearing outdated pvs . updating pv header flags - Bad/corrupt metadata are now repaired; they were not before. Test changes ------------ - A read command no longer writes the VG to repair it, so add a write command to do a repair. (inconsistent-metadata, unlost-pv) - When a missing PV is removed from a VG, and then the device is enabled again, vgck --updatemetadata is needed to clear the outdated PV before it can be used again, where it wasn't before. (lvconvert-repair-policy, lvconvert-repair-raid, lvconvert-repair, mirror-vgreduce-removemissing, pv-ext-flags, unlost-pv) Reading bad/old metadata ------------------------ - "bad metadata": the mda_header or metadata text has invalid fields or can't be parsed by lvm. This is a form of corruption that would not be caused by known failure scenarios. A checksum error is typically included among the errors reported. - "old metadata": a valid copy of the metadata that has a smaller seqno than other copies of the metadata. This can happen if the device failed, or io failed, or lvm failed while commiting new metadata to all the metadata areas. Old metadata on a PV that has been removed from the VG is the "outdated" case below. When a VG has some PVs with bad/old metadata, lvm can simply ignore the bad/old copies, and use a good copy. This is why there are multiple copies of the metadata -- so it's available even when some of the copies cannot be used. The bad/old copies do not have to be repaired before the VG can be used (the repair can happen later.) A PV with no good copies of the metadata simply falls back to being treated like a PV with no mdas; a common and harmless configuration. When bad/old metadata exists, lvm warns the user about it, and suggests repairing it using a new metadata repair command. Bad metadata in particular is something that users will want to investigate and repair themselves, since it should not happen and may indicate some other problem that needs to be fixed. PVs with bad/old metadata are not the same as missing devices. Missing devices will block various kinds of VG modification or activation, but bad/old metadata will not. Previously, lvm would attempt to repair bad/old metadata whenever it was read. This was unnecessary since lvm does not require every copy of the metadata to be used. It would also hide potential problems that should be investigated by the user. It was also dangerous in cases where the VG was on shared storage. The user is now allowed to investigate potential problems and decide how and when to repair them. Repairing bad/old metadata -------------------------- When label scan sees bad metadata in an mda, that mda is removed from the lvmcache info->mdas list. This means that vg_read will skip it, and not attempt to read/process it again. If it was the only in-use mda on a PV, that PV is treated like a PV with no mdas. It also means that vg_write will also skip the bad mda, and not attempt to write new metadata to it. The only way to repair bad metadata is with the metadata repair command. When label scan sees old metadata in an mda, that mda is kept in the lvmcache info->mdas list. This means that vg_read will read/process it again, and likely see the same mismatch with the other copies of the metadata. Like the label_scan, the vg_read will simply ignore the old copy of the metadata and use the latest copy. If the command is modifying the vg (e.g. lvcreate), then vg_write, which writes new metadata to every mda on info->mdas, will write the new metadata to the mda that had the old version. If successful, this will resolve the old metadata problem (without needing to run a metadata repair command.) Outdated PVs ------------ An outdated PV is a PV that has an old copy of VG metadata that shows it is a member of the VG, but the latest copy of the VG metadata does not include this PV. This happens if the PV is disconnected, vgreduce --removemissing is run to remove the PV from the VG, then the PV is reconnected. In this case, the outdated PV needs have its outdated metadata removed and the PV used flag needs to be cleared. This repair will be done by the subsequent repair command. It is also done if vgremove is run on the VG. MISSING PVs ----------- When a device is missing, most commands will refuse to modify the VG. This is the simple case. More complicated is when a command is allowed to modify the VG while it is missing a device. When a VG is written while a device is missing for one of it's PVs, the VG metadata is written to disk with the MISSING flag on the PV with the missing device. When the VG is next used, it is treated as if the PV with the MISSING flag still has a missing device, even if that device has reappeared. If all LVs that were using a PV with the MISSING flag are removed or repaired so that the MISSING PV is no longer used, then the next time the VG metadata is written, the MISSING flag will be dropped. Alternative methods of clearing the MISSING flag are: vgreduce --removemissing will remove PVs with missing devices, or PVs with the MISSING flag where the device has reappeared. vgextend --restoremissing will clear the MISSING flag on PVs where the device has reappeared, allowing the VG to be used normally. This must be done with caution since the reappeared device may have old data that is inconsistent with data on other PVs. Bad mda repair -------------- The new command: vgck --updatemetadata VG first uses vg_write to repair old metadata, and other basic issues mentioned above (old metadata, outdated PVs, pv_header flags, MISSING_PV flags). It will also go further and repair bad metadata: . text metadata that has a bad checksum . text metadata that is not parsable . corrupt mda_header checksum and version fields	2019-04-12 10:58:14 -05:00
David Teigland	a02cda4e70	add a warning message when updating old metadata in an mda that had previously not been updated	2019-04-11 12:03:04 -05:00
David Teigland	c36d9a73ac	vgcfgbackup add error messages	2019-04-11 12:03:04 -05:00
David Teigland	77c8e031af	vgck --updatemetadata is a new command uses vg_write to correct more common or less severe issues, and also adds the ability to repair some metadata corruption that couldn't be handled previously.	2019-04-11 12:03:04 -05:00
David Teigland	92534a31eb	move pv header repairs to vg_write Correct PV header in-use or version fields from vg_write instead of vg_read.	2019-04-11 12:03:04 -05:00
David Teigland	b1ceee55a6	process_each_pv handle outdated pvs process_each_pv should account for outdated pvs in the list of all devices it is processing.	2019-04-11 12:03:04 -05:00
David Teigland	4de9e82b75	move wipe_outdated_pvs to vg_write and implement it based on a device, not based on a pv struct (which is not available when the device is not a part of the vg.) currently only the vgremove command wipes outdated pvs until more advanced recovery is added in a subsequent commit	2019-04-11 12:03:04 -05:00
David Teigland	a3601b4004	create separate lvmcache update functions for read and write The vg read and vg write cases need to update lvmcache differently, so create separate functions for them. The read case now handles checking for outdated mdas and moves them aside into a new list to be repaired in a subsequent commit.	2019-04-11 12:03:04 -05:00
David Teigland	21f7dfe510	fix vg_commit return value The existing comment was desribing the correct behavior, but the code didn't match. The commit is successful if one mda was committed. Making it depend on the result of the internal lvmcache update was wrong.	2019-04-11 12:03:04 -05:00
David Teigland	da39cf4a9e	change args for text label read function Have the caller pass the label_sector to the read function so the read function can set the sector field in the label struct, instead of having the read function return a pointer to the label for the caller to set the sector field. Also have the read function return a flag indicating to the caller that the scanned device was identified as a duplicate pv.	2019-04-11 12:03:04 -05:00
David Teigland	b536ae04d5	add mda arg to add_mda Allow the caller of lvmcache_add_mda() to have the new mda returned.	2019-04-11 12:03:04 -05:00
David Teigland	ce8d1ed130	keep track of which mdas have old metadata in lvmcache This will be used for more advanced repair in a subsequent commit.	2019-04-11 12:03:04 -05:00
David Teigland	a812f98c42	ability to keep track of outdated pvs in lvmcache Outdated PVs hold metadata for VG from which they have been removed. Add the ability to keep track of these in lvmcache. This will be used for more advanced repair in a subsequent commit.	2019-04-11 12:03:04 -05:00
David Teigland	838ba5930c	ability to keep track of bad mdas in lvmcache mda's that cannot be processed by lvm because of some corruption can be kept on a separate list. These will be used for more advanced repair in a subsequent commit.	2019-04-11 12:03:04 -05:00
David Teigland	990c824c21	add flags to keep track of bad metadata When reading metadata headers and text, use a new set of flags to identify specific errors that are seen. These will be used for more advanced repair in a subsequent commit.	2019-04-11 12:03:04 -05:00
David Teigland	4eff1da46f	separate code for setting devices from metadata parsing Pull the code that sets devs for PVs out of the metadata parsing code and call it separately.	2019-04-11 12:03:04 -05:00