report: Demo mount/fs fields a bit like df.

./lvm pvs -a -opv_name,fs_size,fs_used,fs_free,mount_all -S 'fs_size>0' --units k

./lvm pvs -a -opv_name,fs_size,fs_used,fs_free,fs_avail,mount_all -S
'fs_size>0' --units b --reportformat json --nosuffix

Makefile.in

@@ -100,7 +100,7 @@ CLEAN_DIRS += autom4te.cache
 check check_system check_cluster check_local check_lvmetad check_lvmpolld check_lvmlockd_test check_lvmlockd_dlm check_lvmlockd_sanlock unit: all
 	$(MAKE) -C test $(@)
 
-conf.generate man.generate: tools
+conf.generate: tools
 
 # how to use parenthesis in makefiles
 leftparen:=(
@@ -130,9 +130,8 @@ rpm: dist
 	    $(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
 	rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
 
-generate: conf.generate man.generate
+generate: conf.generate
 	$(MAKE) -C conf generate
-	$(MAKE) -C man generate
 
 all_man:
 	$(MAKE) -C man all_man

WHATS_NEW

@@ -1,15 +1,5 @@
 Version 2.02.169 - 
 =====================================
-  Remove obsolete lvmchange binary - convert to built-in command.
-  Lvdisplay [-m] shows more informations for cached volumes.
-  Add option for lvcreate/lvconvert --cachemetadataformat auto|1|2.
-  Support cache segment with configurable metadata format.
-  Add allocation/cache_metadata_format profilable setttings.
-  Use function cache_set_params() for both lvcreate and lvconvert.
-  Skip rounding on cache chunk size boudary when create cache LV.
-  Improve cache_set_params support for chunk_size selection.
-  Fix metadata profile allocation/cache_[mode|policy] setting.
-  Fix missing support for using allocation/cache_pool_chunk_size setting.
   Upstream git moved to https://sourceware.org/git/?p=lvm2
   Support conversion of raid type, stripesize and number of disks
   Reject writemostly/writebehind in lvchange during resynchronization.

WHATS_NEW_DM

@@ -1,9 +1,5 @@
 Version 1.02.138 - 
 =====================================
-  Provide dm_tree_node_add_cache_target@base compatible symbol.
-  Support DM_CACHE_FEATURE_METADATA2, new cache metadata format 2.
-  Improve code to handle mode mask for cache nodes.
-  Cache status check for passthrough also require trailing space.
   Add extra memory page when limiting pthread stack size in dmeventd.
   Avoids immediate resume when preloaded device is smaller.
   Do not suppress kernel key description in dmsetup table output.

conf/cache-smq.profile

@@ -9,6 +9,6 @@ allocation {
 	cache_mode = "writethrough"
 	cache_policy = "smq"
 	cache_settings {
-	        # currently no settings for "smq" policy
+	        # currently no settins for "smq" policy
 	}
 }

conf/example.conf.in

@@ -403,20 +403,9 @@ allocation {
 	# This configuration option has an automatic default value.
 	# cache_mode = "writethrough"
 
-	# 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_policy.
 	# The default cache policy used for new cache volume.
-	# Since kernel 4.2 the default policy is smq (Stochastic multiqueue),
+	# Since kernel 4.2 the default policy is smq (Stochastic multique),
 	# otherwise the older mq (Multiqueue) policy is selected.
 	# This configuration option does not have a default value defined.
 
@@ -1024,7 +1013,7 @@ global {
 	# 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.
+	# causing problems. Features include: policy_mq, policy_smq.
 	# 
 	# Example
 	# cache_disabled_features = [ "policy_smq" ]
@@ -1288,9 +1277,8 @@ activation {
 
 	# Configuration option activation/raid_region_size.
 	# Size in KiB of each raid or mirror synchronization region.
-	# The clean/dirty state of data is tracked for each region.
-	# The value is rounded down to a power of two if necessary, and
-	# is ignored if it is not a multiple of the machine memory page size.
+	# For raid or mirror segment types, this is the amount of data that is
+	# copied at once when initializing, or moved at once by pvmove.
 	raid_region_size = 512
 
 	# Configuration option activation/error_when_full.

configure

@@ -702,7 +702,6 @@ BLKDEACTIVATE
 FSADM
 ELDFLAGS
 DM_LIB_PATCHLEVEL
-DMFILEMAPD
 DMEVENTD_PATH
 DMEVENTD
 DL_LIBS
@@ -738,7 +737,6 @@ CLDNOWHOLEARCHIVE
 CLDFLAGS
 CACHE
 BUILD_NOTIFYDBUS
-BUILD_DMFILEMAPD
 BUILD_LOCKDDLM
 BUILD_LOCKDSANLOCK
 BUILD_LVMLOCKD
@@ -962,7 +960,6 @@ enable_use_lvmetad
 with_lvmetad_pidfile
 enable_use_lvmpolld
 with_lvmpolld_pidfile
-enable_dmfilemapd
 enable_notify_dbus
 enable_blkid_wiping
 enable_udev_systemd_background_jobs
@@ -1697,7 +1694,6 @@ Optional Features:
   --disable-use-lvmlockd  disable usage of LVM lock daemon
   --disable-use-lvmetad   disable usage of LVM Metadata Daemon
   --disable-use-lvmpolld  disable usage of LVM Poll Daemon
-  --enable-dmfilemapd     enable the dmstats filemap daemon
   --enable-notify-dbus    enable LVM notification using dbus
   --disable-blkid_wiping  disable libblkid detection of signatures when wiping
                           and use native code instead
@@ -12078,32 +12074,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build dmfilemapd" >&5
-$as_echo_n "checking whether to build dmfilemapd... " >&6; }
-# Check whether --enable-dmfilemapd was given.
-if test "${enable_dmfilemapd+set}" = set; then :
-  enableval=$enable_dmfilemapd; DMFILEMAPD=$enableval
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMFILEMAPD" >&5
-$as_echo "$DMFILEMAPD" >&6; }
-BUILD_DMFILEMAPD=$DMFILEMAPD
-
-$as_echo "#define DMFILEMAPD 1" >>confdefs.h
-
-
-if test "$DMFILEMAPD" = yes; then
-   ac_fn_c_check_header_mongrel "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_fiemap_h" = xyes; then :
-
-else
-  as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
-fi
-
-
-fi
-
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build notifydbus" >&5
 $as_echo_n "checking whether to build notifydbus... " >&6; }
@@ -15153,23 +15123,6 @@ done
 
 fi
 
-if test "$DMFILEMAPD" = yes; then
-	for ac_header in sys/inotify.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_INOTIFY_H 1
-_ACEOF
-
-else
-  hard_bailout
-fi
-
-done
-
-fi
-
 ################################################################################
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}modprobe", so it can be a program name with args.
@@ -15629,13 +15582,11 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
 
 
 
-
-
 
 
 
 ################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16343,7 +16294,6 @@ do
     "daemons/dmeventd/plugins/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/mirror/Makefile" ;;
     "daemons/dmeventd/plugins/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/snapshot/Makefile" ;;
     "daemons/dmeventd/plugins/thin/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/thin/Makefile" ;;
-    "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;;
     "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;;
     "daemons/lvmdbusd/path.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/path.py" ;;
     "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;;

configure.in

@@ -1271,21 +1271,6 @@ fi
 AC_DEFINE_UNQUOTED(DEFAULT_USE_LVMPOLLD, [$DEFAULT_USE_LVMPOLLD],
 		   [Use lvmpolld by default.])
 
-################################################################################
-dnl -- Check dmfilemapd
-AC_MSG_CHECKING(whether to build dmfilemapd)
-AC_ARG_ENABLE(dmfilemapd, AC_HELP_STRING([--enable-dmfilemapd],
-					 [enable the dmstats filemap daemon]),
-	      DMFILEMAPD=$enableval)
-AC_MSG_RESULT($DMFILEMAPD)
-BUILD_DMFILEMAPD=$DMFILEMAPD
-AC_DEFINE([DMFILEMAPD], 1, [Define to 1 to enable the device-mapper filemap daemon.])
-
-dnl -- dmfilemapd requires FIEMAP
-if test "$DMFILEMAPD" = yes; then
-   AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
-fi
-
 ################################################################################
 dnl -- Build notifydbus
 AC_MSG_CHECKING(whether to build notifydbus)
@@ -1870,10 +1855,6 @@ if test "$UDEV_SYNC" = yes; then
 	AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,hard_bailout)
 fi
 
-if test "$DMFILEMAPD" = yes; then
-	AC_CHECK_HEADERS([sys/inotify.h],,hard_bailout)
-fi
-
 ################################################################################
 AC_PATH_TOOL(MODPROBE_CMD, modprobe)
 
@@ -2013,7 +1994,6 @@ AC_SUBST(BUILD_LVMPOLLD)
 AC_SUBST(BUILD_LVMLOCKD)
 AC_SUBST(BUILD_LOCKDSANLOCK)
 AC_SUBST(BUILD_LOCKDDLM)
-AC_SUBST(BUILD_DMFILEMAPD)
 AC_SUBST(BUILD_NOTIFYDBUS)
 AC_SUBST(CACHE)
 AC_SUBST(CFLAGS)
@@ -2063,7 +2043,6 @@ AC_SUBST(DLM_LIBS)
 AC_SUBST(DL_LIBS)
 AC_SUBST(DMEVENTD)
 AC_SUBST(DMEVENTD_PATH)
-AC_SUBST(DMFILEMAPD)
 AC_SUBST(DM_LIB_PATCHLEVEL)
 AC_SUBST(ELDFLAGS)
 AC_SUBST(FSADM)
@@ -2179,7 +2158,6 @@ daemons/dmeventd/plugins/raid/Makefile
 daemons/dmeventd/plugins/mirror/Makefile
 daemons/dmeventd/plugins/snapshot/Makefile
 daemons/dmeventd/plugins/thin/Makefile
-daemons/dmfilemapd/Makefile
 daemons/lvmdbusd/Makefile
 daemons/lvmdbusd/path.py
 daemons/lvmetad/Makefile

coverity/coverity_model.c

@@ -71,17 +71,6 @@ void model_FD_ZERO(void *fdset)
 		((long*)fdset)[i] = 0;
 }
 
-
-/* Resent Coverity reports quite weird errors... */
-int *__errno_location(void)
-{
-}
-const unsigned short **__ctype_b_loc (void)
-{
-}
-
-
-
 /*
  * Added extra pointer check to not need these models,
  * for now just keep then in file

daemons/Makefile.in

@@ -48,12 +48,8 @@ ifeq ("@BUILD_LVMDBUSD@", "yes")
   SUBDIRS += lvmdbusd
 endif
 
-ifeq ("@BUILD_DMFILEMAPD@", "yes")
-  SUBDIRS += dmfilemapd
-endif
-
 ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS = clvmd cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd dmfilemapd
+  SUBDIRS = clvmd cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd
 endif
 
 include $(top_builddir)/make.tmpl

daemons/dmeventd/plugins/mirror/dmeventd_mirror.c

@@ -111,9 +111,6 @@ static int _remove_failed_devices(const char *cmd_lvscan, const char *cmd_lvconv
 		return 0;
 	}
 
-	if (!dmeventd_lvm2_run_with_lock(cmd_lvscan))
-		log_warn("WARNING: Re-scan of mirrored device %s failed.", device);
-
 	log_info("Repair of mirrored device %s finished successfully.", device);
 
 	return 1;
@@ -186,7 +183,10 @@ int register_device(const char *device,
 	if (!dmeventd_lvm2_init_with_pool("mirror_state", state))
 		goto_bad;
 
-        /* CANNOT use --config as this disables cached content */
+	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvscan, sizeof(state->cmd_lvscan),
+				   "lvscan --cache", device))
+		goto_bad;
+
 	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
 				   "lvconvert --repair --use-policies", device))
 		goto_bad;

daemons/dmfilemapd/.gitignore

@@ -1 +0,0 @@
-dmfilemapd

daemons/dmfilemapd/Makefile.in

@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2016 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the device-mapper userspace tools.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU Lesser General Public License v.2.1.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-
-SOURCES = dmfilemapd.c
-
-TARGETS = dmfilemapd
-
-.PHONY: install_dmfilemapd install_dmfilemapd_static
-
-INSTALL_DMFILEMAPD_TARGETS = install_dmfilemapd_dynamic
-
-CLEAN_TARGETS = dmfilemapd.static
-
-CFLOW_LIST = $(SOURCES)
-CFLOW_LIST_TARGET = $(LIB_NAME).cflow
-CFLOW_TARGET = dmfilemapd
-
-include $(top_builddir)/make.tmpl
-
-all: device-mapper
-device-mapper: $(TARGETS)
-
-LIBS += -ldevmapper
-
-CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS)
-
-dmfilemapd: $(LIB_SHARED) dmfilemapd.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -L. -o $@ dmfilemapd.o \
-	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
-
-dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o $(interfacebuilddir)/libdevmapper.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-	dmfilemapd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
-
-ifneq ("$(CFLOW_CMD)", "")
-CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
--include $(top_builddir)/libdm/libdevmapper.cflow
--include $(top_builddir)/lib/liblvm-internal.cflow
--include $(top_builddir)/lib/liblvm2cmd.cflow
--include $(top_builddir)/daemons/dmfilemapd/$(LIB_NAME).cflow
-endif
-
-install_dmfilemapd_dynamic: dmfilemapd
-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
-
-install_dmfilemapd_static: dmfilemapd.static
-	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
-
-install_dmfilemapd: $(INSTALL_DMEVENTD_TARGETS)
-
-install: install_dmfilemapd
-
-install_device-mapper: install_dmfilemapd
-

daemons/dmfilemapd/dmfilemapd.c

@@ -1,802 +0,0 @@
-/*
- * Copyright (C) 2016 Red Hat, Inc. All rights reserved.
- *
- * This file is part of the device-mapper userspace tools.
- *
- * It includes tree drawing code based on pstree: http://psmisc.sourceforge.net/
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "tool.h"
-
-#include "dm-logging.h"
-
-#include "defaults.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/inotify.h>
-#include <dirent.h>
-#include <ctype.h>
-
-#ifdef __linux__
-#  include "kdev_t.h"
-#else
-#  define MAJOR(x) major((x))
-#  define MINOR(x) minor((x))
-#  define MKDEV(x,y) makedev((x),(y))
-#endif
-
-/* limit to two updates/sec */
-#define FILEMAPD_WAIT_USECS 500000
-
-/* how long to wait for unlinked files */
-#define FILEMAPD_NOFILE_WAIT_USECS 100000
-#define FILEMAPD_NOFILE_WAIT_TRIES 10
-
-struct filemap_monitor {
-	dm_filemapd_mode_t mode;
-	const char *program_id;
-	uint64_t group_id;
-	char *path;
-	int fd;
-
-	int inotify_fd;
-	int inotify_watch_fd;
-
-	/* monitoring heuristics */
-	int64_t blocks; /* allocated blocks, from stat.st_blocks */
-	int64_t nr_regions;
-	int deleted;
-};
-
-static int _foreground;
-static int _verbose;
-
-const char *const _usage = "dmfilemapd <fd> <group_id> <abs_path> <mode> "
-			   "[<foreground>[<log_level>]]";
-
-/*
- * Daemon logging. By default, all messages are thrown away: messages
- * are only written to the terminal if the daemon is run in the foreground.
- */
-__attribute__((format(printf, 5, 0)))
-static void _dmfilemapd_log_line(int level,
-				 const char *file __attribute__((unused)),
-				 int line __attribute__((unused)),
-				 int dm_errno_or_class,
-				 const char *f, va_list ap)
-{
-	static int _abort_on_internal_errors = -1;
-	FILE *out = log_stderr(level) ? stderr : stdout;
-
-	level = log_level(level);
-
-	if (level <= _LOG_WARN || _verbose) {
-		if (level < _LOG_WARN)
-			out = stderr;
-		vfprintf(out, f, ap);
-		fputc('\n', out);
-	}
-
-	if (_abort_on_internal_errors < 0)
-		/* Set when env DM_ABORT_ON_INTERNAL_ERRORS is not "0" */
-		_abort_on_internal_errors =
-			strcmp(getenv("DM_ABORT_ON_INTERNAL_ERRORS") ? : "0", "0");
-
-	if (_abort_on_internal_errors &&
-	    !strncmp(f, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1))
-		abort();
-}
-
-__attribute__((format(printf, 5, 6)))
-static void _dmfilemapd_log_with_errno(int level,
-				       const char *file, int line,
-				       int dm_errno_or_class,
-				       const char *f, ...)
-{
-	va_list ap;
-
-	va_start(ap, f);
-	_dmfilemapd_log_line(level, file, line, dm_errno_or_class, f, ap);
-	va_end(ap);
-}
-
-/*
- * Only used for reporting errors before daemonise().
- */
-__attribute__((format(printf, 1, 2)))
-static void _early_log(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	fputc('\n', stderr);
-	va_end(ap);
-}
-
-static void _setup_logging(void)
-{
-	dm_log_init_verbose(_verbose - 1);
-	dm_log_with_errno_init(_dmfilemapd_log_with_errno);
-}
-
-#define PROC_FD_DELETED_STR "(deleted)"
-/*
- * Scan the /proc/<pid>/fd directory for pid and check for an fd
- * symlink whose contents match path.
- */
-static int _is_open_in_pid(pid_t pid, const char *path)
-{
-	char deleted_path[PATH_MAX + sizeof(PROC_FD_DELETED_STR)];
-	struct dirent *pid_dp = NULL;
-	char path_buf[PATH_MAX];
-	char link_buf[PATH_MAX];
-	DIR *pid_d = NULL;
-	ssize_t len;
-
-	if (pid == getpid())
-		return 0;
-
-	if (dm_snprintf(path_buf, sizeof(path_buf),
-			DEFAULT_PROC_DIR "%d/fd", pid) < 0) {
-		log_error("Could not format pid path.");
-		goto bad;
-	}
-
-	/*
-	 * Test for the kernel 'file (deleted)' form when scanning.
-	 */
-	if (dm_snprintf(deleted_path, sizeof(deleted_path), "%s %s",
-			path, PROC_FD_DELETED_STR) < 0) {
-		log_error("Could not format check path.");
-	}
-
-	pid_d = opendir(path_buf);
-	if (!pid_d) {
-		log_error("Could not open proc path: %s.", path_buf);
-		goto bad;
-	}
-
-	while ((pid_dp = readdir(pid_d)) != NULL) {
-		if (pid_dp->d_name[0] == '.')
-			continue;
-		if ((len = readlinkat(dirfd(pid_d), pid_dp->d_name, link_buf,
-				      sizeof(link_buf))) < 0) {
-			log_error("readlink failed for " DEFAULT_PROC_DIR
-				  "/%d/fd/.", pid);
-			goto bad;
-		}
-		link_buf[len] = '\0';
-		if (!strcmp(deleted_path, link_buf)) {
-			closedir(pid_d);
-			return 1;
-		}
-	}
-
-bad:
-	closedir(pid_d);
-	return 0;
-}
-
-/*
- * Attempt to determine whether a file is open by any process by
- * scanning symbolic links in /proc/<pid>/fd.
- *
- * This is a heuristic since it cannot guarantee to detect brief
- * access in all cases: a process that opens and then closes the
- * file rapidly may never be seen by the scan.
- *
- * The method will also give false-positives if a process exists
- * that has a deleted file open that had the same path, but a
- * different inode number, to the file being monitored.
- *
- * For this reason the daemon only uses _is_open() for unlinked
- * files when the mode is DM_FILEMAPD_FOLLOW_INODE, since these
- * files can no longer be newly opened by processes.
- *
- * In this situation !is_open(path) provides an indication that
- * the daemon should shut down: the file has been unlinked from
- * the file system and we appear to hold the final reference.
- */
-static int _is_open(const char *path)
-{
-	struct dirent *proc_dp = NULL;
-	DIR *proc_d = NULL;
-	pid_t pid;
-
-	proc_d = opendir(DEFAULT_PROC_DIR);
-	if (!proc_d)
-		return 0;
-	while ((proc_dp = readdir(proc_d)) != NULL) {
-		if (!isdigit(proc_dp->d_name[0]))
-			continue;
-		pid = strtol(proc_dp->d_name, NULL, 10);
-		if (!pid)
-			continue;
-		if (_is_open_in_pid(pid, path)) {
-			closedir(proc_d);
-			return 1;
-		}
-	}
-	closedir(proc_d);
-	return 0;
-}
-
-static void _filemap_monitor_wait(uint64_t usecs)
-{
-	if (_verbose) {
-		if (usecs == FILEMAPD_WAIT_USECS)
-			log_very_verbose("Waiting for check interval");
-		if (usecs == FILEMAPD_NOFILE_WAIT_USECS)
-			log_very_verbose("Waiting for unlinked path");
-	}
-	usleep((useconds_t) usecs);
-}
-
-static int _parse_args(int argc, char **argv, struct filemap_monitor *fm)
-{
-	char *endptr;
-
-	/* we don't care what is in argv[0]. */
-	argc--;
-	argv++;
-
-	if (argc < 5) {
-		_early_log("Wrong number of arguments.");
-		_early_log("usage: %s", _usage);
-		return 0;
-	}
-
-	memset(fm, 0, sizeof(*fm));
-
-	/*
-	 * We don't know the true nr_regions at daemon start time,
-	 * and it is not worth a dm_stats_list()/group walk to count:
-	 * we can assume that there is at least one region or the
-	 * daemon would not have been started.
-	 *
-	 * A correct value will be obtained following the first update
-	 * of the group's regions.
-	 */
-	fm->nr_regions = 1;
-
-	/* parse <fd> */
-	fm->fd = strtol(argv[0], &endptr, 10);
-	if (*endptr) {
-		_early_log("Could not parse file descriptor: %s", argv[0]);
-		return 0;
-	}
-
-	argc--;
-	argv++;
-
-	/* parse <group_id> */
-	fm->group_id = strtoull(argv[0], &endptr, 10);
-	if (*endptr) {
-		_early_log("Could not parse group identifier: %s", argv[0]);
-		return 0;
-	}
-
-	argc--;
-	argv++;
-
-	/* parse <path> */
-	if (!argv[0] || !strlen(argv[0])) {
-		_early_log("Path argument is required.");
-		return 0;
-	}
-
-	if (argv[0] != '/') {
-		_early_log("Path argument must specify an absolute path.");
-		return 0;
-	}
-
-	fm->path = dm_strdup(argv[0]);
-	if (!fm->path) {
-		_early_log("Could not allocate memory for path argument.");
-		return 0;
-	}
-
-	argc--;
-	argv++;
-
-	/* parse <mode> */
-	if (!argv[0] || !strlen(argv[0])) {
-		_early_log("Mode argument is required.");
-		return 0;
-	}
-
-	fm->mode = dm_filemapd_mode_from_string(argv[0]);
-	if (fm->mode == DM_FILEMAPD_FOLLOW_NONE)
-		return 0;
-
-	argc--;
-	argv++;
-
-	/* parse [<foreground>[<verbose>]] */
-	if (argc) {
-		_foreground = strtol(argv[0], &endptr, 10);
-		if (*endptr) {
-			_early_log("Could not parse debug argument: %s.",
-				   argv[0]);
-			return 0;
-		}
-		argc--;
-		argv++;
-		if (argc) {
-			_verbose = strtol(argv[0], &endptr, 10);
-			if (*endptr) {
-				_early_log("Could not parse verbose "
-					   "argument: %s", argv[0]);
-				return 0;
-			}
-			if (_verbose < 0 || _verbose > 3) {
-				_early_log("Verbose argument out of range: %d.",
-					   _verbose);
-				return 0;
-			}
-		}
-	}
-	return 1;
-}
-
-static int _filemap_fd_check_changed(struct filemap_monitor *fm)
-{
-	int64_t blocks, old_blocks;
-	struct stat buf;
-
-	if (fm->fd < 0) {
-		log_error("Filemap fd is not open.");
-		return -1;
-	}
-
-	if (fstat(fm->fd, &buf)) {
-		log_error("Failed to fstat filemap file descriptor.");
-		return -1;
-	}
-
-	blocks = buf.st_blocks;
-
-	/* first check? */
-	if (fm->blocks < 0)
-		old_blocks = buf.st_blocks;
-	else
-		old_blocks = fm->blocks;
-
-	fm->blocks = blocks;
-
-	return (fm->blocks != old_blocks);
-}
-
-static void _filemap_monitor_close_fd(struct filemap_monitor *fm)
-{
-	if (close(fm->fd))
-		log_error("Error closing file descriptor.");
-	fm->fd = -1;
-}
-
-static void _filemap_monitor_end_notify(struct filemap_monitor *fm)
-{
-	inotify_rm_watch(fm->inotify_fd, fm->inotify_watch_fd);
-}
-
-static int _filemap_monitor_set_notify(struct filemap_monitor *fm)
-{
-	int inotify_fd, watch_fd;
-
-	/*
-	 * Set IN_NONBLOCK since we do not want to block in event read()
-	 * calls. Do not set IN_CLOEXEC as dmfilemapd is single-threaded
-	 * and does not fork or exec.
-	 */
-	if ((inotify_fd = inotify_init1(IN_NONBLOCK)) < 0) {
-		_early_log("Failed to initialise inotify.");
-		return 0;
-	}
-
-	if ((watch_fd = inotify_add_watch(inotify_fd, fm->path,
-					  IN_MODIFY | IN_DELETE_SELF)) < 0) {
-		_early_log("Failed to add inotify watch.");
-		return 0;
-	}
-	fm->inotify_fd = inotify_fd;
-	fm->inotify_watch_fd = watch_fd;
-	return 1;
-}
-
-static int _filemap_monitor_reopen_fd(struct filemap_monitor *fm)
-{
-	int tries = FILEMAPD_NOFILE_WAIT_TRIES;
-
-	/*
-	 * In DM_FILEMAPD_FOLLOW_PATH mode, inotify watches must be
-	 * re-established whenever the file at the watched path is
-	 * changed.
-	 *
-	 * FIXME: stat file and skip if inode is unchanged.
-	 */
-	if (fm->fd > 0)
-		log_error("Filemap file descriptor already open.");
-
-	while ((fm->fd < 0) && --tries)
-		if (((fm->fd = open(fm->path, O_RDONLY)) < 0) && tries)
-			_filemap_monitor_wait(FILEMAPD_NOFILE_WAIT_USECS);
-
-	if (!tries && (fm->fd < 0)) {
-		log_error("Could not re-open file descriptor.");
-		return 0;
-	}
-
-	return _filemap_monitor_set_notify(fm);
-}
-
-static int _filemap_monitor_get_events(struct filemap_monitor *fm)
-{
-	/* alignment as per man(7) inotify */
-	char buf[sizeof(struct inotify_event) + NAME_MAX + 1]
-		__attribute__ ((aligned(__alignof__(struct inotify_event))));
-
-	struct inotify_event *event;
-	int check = 0;
-	ssize_t len;
-	char *ptr;
-
-	/*
-	 * Close the file descriptor for the file being monitored here
-	 * when mode=path: this will allow the inode to be de-allocated,
-	 * and an IN_DELETE_SELF event generated in the case that the
-	 * daemon is holding the last open reference to the file.
-	 */
-	if (fm->mode == DM_FILEMAPD_FOLLOW_PATH) {
-		_filemap_monitor_end_notify(fm);
-		_filemap_monitor_close_fd(fm);
-	}
-
-	len = read(fm->inotify_fd, (void *) &buf, sizeof(buf));
-
-	/* no events to read? */
-	if (len < 0 && (errno == EAGAIN))
-		goto out;
-
-	/* interrupted by signal? */
-	if (len < 0 && (errno == EINTR))
-		goto out;
-
-	if (len < 0)
-		return -1;
-
-	if (!len)
-		goto out;
-
-	for (ptr = buf; ptr < buf + len; ptr += sizeof(*event) + event->len) {
-		event = (struct inotify_event *) ptr;
-		if (event->mask & IN_DELETE_SELF)
-			fm->deleted = 1;
-		if (event->mask & IN_MODIFY)
-			check = 1;
-		/*
-		 * Event IN_IGNORED is generated when a file has been deleted
-		 * and IN_DELETE_SELF generated, and indicates that the file
-		 * watch has been automatically removed.
-		 *
-		 * This can only happen for the DM_FILEMAPD_FOLLOW_PATH mode,
-		 * since inotify IN_DELETE events are generated at the time
-		 * the inode is destroyed: DM_FILEMAPD_FOLLOW_INODE will hold
-		 * the file descriptor open, meaning that the event will not
-		 * be generated until after the daemon closes the file.
-		 *
-		 * The event is ignored here since inotify monitoring will
-		 * be reestablished (or the daemon will terminate) following
-		 * deletion of a DM_FILEMAPD_FOLLOW_PATH monitored file.
-		 */
-		if (event->mask & IN_IGNORED)
-			log_very_verbose("Inotify watch removed: IN_IGNORED "
-					 "in event->mask");
-	}
-
-out:
-	/*
-	 * Re-open file descriptor if required and log disposition.
-	 */
-	if (fm->mode == DM_FILEMAPD_FOLLOW_PATH)
-		if (!_filemap_monitor_reopen_fd(fm))
-			return -1;
-
-	log_very_verbose("exiting _filemap_monitor_get_events() with "
-			 "deleted=%d, check=%d", fm->deleted, check);
-	return check;
-}
-
-static void _filemap_monitor_destroy(struct filemap_monitor *fm)
-{
-	if (fm->fd > 0) {
-		_filemap_monitor_end_notify(fm);
-		_filemap_monitor_close_fd(fm);
-	}
-	dm_free((void *) fm->program_id);
-}
-
-static int _filemap_monitor_check_same_file(int fd1, int fd2)
-{
-	struct stat buf1, buf2;
-
-	if ((fd1 < 0) || (fd2 < 0))
-		return 0;
-
-	if (fstat(fd1, &buf1)) {
-		log_error("Failed to fstat file descriptor %d", fd1);
-		return -1;
-	}
-
-	if (fstat(fd2, &buf2)) {
-		log_error("Failed to fstat file descriptor %d", fd2);
-		return -1;
-	}
-
-	return ((buf1.st_dev == buf2.st_dev) && (buf1.st_ino == buf2.st_ino));
-}
-
-static int _filemap_monitor_check_file_unlinked(struct filemap_monitor *fm)
-{
-	char path_buf[PATH_MAX];
-	char link_buf[PATH_MAX];
-	int same, fd, len;
-
-	fm->deleted = 0;
-
-	if ((fd = open(fm->path, O_RDONLY)) < 0)
-		goto check_unlinked;
-
-	if ((same = _filemap_monitor_check_same_file(fm->fd, fd)) < 0)
-		return 0;
-
-	if (close(fd))
-		log_error("Error closing fd %d", fd);
-
-	if (same)
-		return 1;
-
-check_unlinked:
-	/*
-	 * The file has been unlinked from its original location: test
-	 * whether it is still reachable in the filesystem, or if it is
-	 * unlinked and anonymous.
-	 */
-	if (dm_snprintf(path_buf, sizeof(path_buf), DEFAULT_PROC_DIR
-			"/%d/fd/%d", getpid(), fm->fd) < 0) {
-		log_error("Could not format pid path.");
-		return 0;
-	}
-	if ((len = readlink(path_buf, link_buf, sizeof(link_buf))) < 0) {
-		log_error("readlink failed for " DEFAULT_PROC_DIR "/%d/fd/%d.",
-			  getpid(), fm->fd);
-		return 0;
-	}
-
-	/*
-	 * Try to re-open the file, from the path now reported in /proc/pid/fd.
-	 */
-	if ((fd = open(link_buf, O_RDONLY)) < 0)
-		fm->deleted = 1;
-
-	if ((same = _filemap_monitor_check_same_file(fm->fd, fd)) < 0)
-		return 0;
-
-	if ((fd > 0) && close(fd))
-		log_error("Error closing fd %d", fd);
-
-	/* Should not happen with normal /proc. */
-	if ((fd > 0) && !same) {
-		log_error("File descriptor mismatch: %d and %s (read from %s) "
-			  "are not the same file!", fm->fd, link_buf, path_buf);
-		return 0;
-	}
-	return 1;
-}
-
-static int _daemonise(struct filemap_monitor *fm)
-{
-	pid_t pid = 0, sid;
-	int fd;
-
-	if (!(sid = setsid())) {
-		_early_log("setsid failed.");
-		return 0;
-	}
-
-	if ((pid = fork()) < 0) {
-		_early_log("Failed to fork daemon process.");
-		return 0;
-	}
-
-	if (pid > 0) {
-		if (_verbose)
-			_early_log("Started dmfilemapd with pid=%d", pid);
-		exit(0);
-	}
-
-	if (chdir("/")) {
-		_early_log("Failed to change directory.");
-		return 0;
-	}
-
-	if (!_verbose) {
-		if (close(STDIN_FILENO))
-			_early_log("Error closing stdin");
-		if (close(STDOUT_FILENO))
-			_early_log("Error closing stdout");
-		if (close(STDERR_FILENO))
-			_early_log("Error closing stderr");
-		if ((open("/dev/null", O_RDONLY) < 0) ||
-	            (open("/dev/null", O_WRONLY) < 0) ||
-		    (open("/dev/null", O_WRONLY) < 0)) {
-			_early_log("Error opening stdio streams.");
-			return 0;
-		}
-	}
-
-	for (fd = sysconf(_SC_OPEN_MAX) - 1; fd > STDERR_FILENO; fd--) {
-		if (fd == fm->fd)
-			continue;
-		close(fd);
-	}
-
-	return 1;
-}
-
-static int _update_regions(struct dm_stats *dms, struct filemap_monitor *fm)
-{
-	uint64_t *regions = NULL, *region, nr_regions = 0;
-
-	regions = dm_stats_update_regions_from_fd(dms, fm->fd, fm->group_id);
-	if (!regions) {
-		log_error("Failed to update filemap regions for group_id="
-			  FMTu64 ".", fm->group_id);
-		return 0;
-	}
-
-	for (region = regions; *region != DM_STATS_REGIONS_ALL; region++)
-		nr_regions++;
-
-	if (regions[0] != fm->group_id) {
-		log_warn("group_id changed from " FMTu64 " to " FMTu64,
-			 fm->group_id, regions[0]);
-		fm->group_id = regions[0];
-	}
-
-	fm->nr_regions = nr_regions;
-	return 1;
-}
-
-static int _dmfilemapd(struct filemap_monitor *fm)
-{
-	int running = 1, check = 0, open = 0;
-	const char *program_id;
-	struct dm_stats *dms;
-
-	/*
-	 * The correct program_id is retrieved from the group leader
-	 * following the call to dm_stats_list().
-	 */
-	dms = dm_stats_create(NULL);
-
-	if (!dm_stats_bind_from_fd(dms, fm->fd)) {
-		log_error("Could not bind dm_stats handle to file descriptor "
-			  "%d", fm->fd);
-		goto bad;
-	}
-
-	if (!_filemap_monitor_set_notify(fm))
-		goto bad;
-
-	if (!dm_stats_list(dms, DM_STATS_ALL_PROGRAMS)) {
-		log_error("Failed to list stats handle.");
-		goto bad;
-	}
-
-	/*
-	 * Take the program_id for new regions (created by calls to
-	 * dm_stats_update_regions_from_fd()) from the value used by
-	 * the group leader.
-	 */
-	program_id = dm_stats_get_region_program_id(dms, fm->group_id);
-	if (program_id)
-		fm->program_id = dm_strdup(program_id);
-	else
-		fm->program_id = NULL;
-	dm_stats_set_program_id(dms, 1, program_id);
-
-	do {
-		if (!dm_stats_group_present(dms, fm->group_id)) {
-			log_info("Filemap group removed: exiting.");
-			running = 0;
-			continue;
-		}
-
-		if ((check = _filemap_monitor_get_events(fm)) < 0)
-			goto bad;
-
-		if (!check)
-			goto wait;
-
-		if ((check = _filemap_fd_check_changed(fm)) < 0)
-			goto bad;
-
-		if (!check)
-			goto wait;
-
-		if (!_update_regions(dms, fm))
-			goto bad;
-
-wait:
-		_filemap_monitor_wait(FILEMAPD_WAIT_USECS);
-
-		running = !!fm->nr_regions;
-
-		/* mode=inode termination condions */
-		if (fm->mode == DM_FILEMAPD_FOLLOW_INODE) {
-			if (!_filemap_monitor_check_file_unlinked(fm))
-				goto bad;
-			if (fm->deleted && !(open = _is_open(fm->path))) {
-				log_info("File unlinked and closed: exiting.");
-				running = 0;
-			} else if (fm->deleted && open)
-				log_verbose("File unlinked and open: "
-					     "continuing.");
-		}
-
-		if (!dm_stats_list(dms, NULL)) {
-			log_error("Failed to list stats handle.");
-			goto bad;
-		}
-
-	} while (running);
-
-	_filemap_monitor_destroy(fm);
-	dm_stats_destroy(dms);
-	return 0;
-
-bad:
-	_filemap_monitor_destroy(fm);
-	dm_stats_destroy(dms);
-	log_error("Exiting");
-	return 1;
-}
-
-static const char * _mode_names[] = {
-	"inode",
-	"path"
-};
-
-/*
- * dmfilemapd <fd> <group_id> <path> <mode> [<foreground>[<log_level>]]
- */
-int main(int argc, char **argv)
-{
-	struct filemap_monitor fm;
-
-	if (!_parse_args(argc, argv, &fm))
-		return 1;
-
-	_setup_logging();
-
-	log_info("Starting dmfilemapd with fd=%d, group_id=" FMTu64 " "
-		 "mode=%s, path=%s", fm.fd, fm.group_id,
-		 _mode_names[fm.mode], fm.path);
-
-	if (!_foreground && !_daemonise(&fm))
-		return 1;
-
-	return _dmfilemapd(&fm);
-}

daemons/lvmdbusd/automatedproperties.py

@@ -38,7 +38,7 @@ class AutomatedProperties(dbus.service.Object):
 		props = {}
 
 		for i in self.interface():
-			props[i] = AutomatedProperties._get_all_prop(self, i)
+			props[i] = self.GetAll(i)
 
 		return self._ap_o_path, props
 
@@ -65,53 +65,32 @@ class AutomatedProperties(dbus.service.Object):
 
 		return self._ap_interface
 
-	@staticmethod
-	def _get_prop(obj, interface_name, property_name):
-		value = getattr(obj, property_name)
+	# Properties
+	# noinspection PyUnusedLocal
+	@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
+							in_signature='ss', out_signature='v')
+	def Get(self, interface_name, property_name):
+		value = getattr(self, property_name)
 		# Note: If we get an exception in this handler we won't know about it,
 		# only the side effect of no returned value!
 		log_debug('Get (%s), type (%s), value(%s)' %
 					(property_name, str(type(value)), str(value)))
 		return value
 
-	# Properties
-	# noinspection PyUnusedLocal
 	@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
-							in_signature='ss', out_signature='v',
-							async_callbacks=('cb', 'cbe'))
-	def Get(self, interface_name, property_name, cb, cbe):
-		# Note: If we get an exception in this handler we won't know about it,
-		# only the side effect of no returned value!
-		r = cfg.create_request_entry(
-			-1, AutomatedProperties._get_prop,
-			(self, interface_name, property_name),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-
-
-	@staticmethod
-	def _get_all_prop(obj, interface_name):
-		if interface_name in obj.interface(True):
+							in_signature='s', out_signature='a{sv}')
+	def GetAll(self, interface_name):
+		if interface_name in self.interface(True):
 			# Using introspection, lets build this dynamically
-			properties = get_properties(obj)
+			properties = get_properties(self)
 			if interface_name in properties:
 				return properties[interface_name][1]
 			return {}
 		raise dbus.exceptions.DBusException(
-			obj._ap_interface,
+			self._ap_interface,
 			'The object %s does not implement the %s interface'
 			% (self.__class__, interface_name))
 
-	@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
-							in_signature='s', out_signature='a{sv}',
-							async_callbacks=('cb', 'cbe'))
-	def GetAll(self, interface_name, cb, cbe):
-		r = cfg.create_request_entry(
-			-1, AutomatedProperties._get_all_prop,
-			(self, interface_name),
-			cb, cbe, False)
-		cfg.worker_q.put(r)
-
 	@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
 							in_signature='ssv')
 	def Set(self, interface_name, property_name, new_value):

daemons/lvmdbusd/cfg.py

@@ -84,6 +84,3 @@ db = None
 
 # lvm flight recorder
 blackbox = None
-
-# RequestEntry ctor
-create_request_entry = None

daemons/lvmdbusd/cmdhandler.py

@@ -16,7 +16,7 @@ import traceback
 import os
 
 from lvmdbusd import cfg
-from lvmdbusd.utils import pv_dest_ranges, log_debug, log_error, add_no_notify
+from lvmdbusd.utils import pv_dest_ranges, log_debug, log_error
 from lvmdbusd.lvm_shell_proxy import LVMShellProxy
 
 try:
@@ -93,7 +93,6 @@ def call_lvm(command, debug=False):
 	# Prepend the full lvm executable so that we can run different versions
 	# in different locations on the same box
 	command.insert(0, cfg.LVM_CMD)
-	command = add_no_notify(command)
 
 	process = Popen(command, stdout=PIPE, stderr=PIPE, close_fds=True,
 					env=os.environ)

daemons/lvmdbusd/lvm_shell_proxy.py

@@ -29,7 +29,7 @@ except ImportError:
 
 
 from lvmdbusd.cfg import LVM_CMD
-from lvmdbusd.utils import log_debug, log_error, add_no_notify
+from lvmdbusd.utils import log_debug, log_error
 
 SHELL_PROMPT = "lvm> "
 
@@ -206,8 +206,6 @@ class LVMShellProxy(object):
 				self.lvm_shell.returncode,
 				"Underlying lvm shell process is not present!")
 
-		argv = add_no_notify(argv)
-
 		# create the command string
 		cmd = " ".join(_quote_arg(arg) for arg in argv)
 		cmd += "\n"

daemons/lvmdbusd/main.py

@@ -30,7 +30,6 @@ import argparse
 import os
 import sys
 from .cmdhandler import LvmFlightRecorder
-from .request import RequestEntry
 
 
 class Lvm(objectmanager.ObjectManager):
@@ -98,7 +97,6 @@ def main():
 	os.environ["LC_ALL"] = "C"
 
 	cfg.args = parser.parse_args()
-	cfg.create_request_entry = RequestEntry
 
 	# We create a flight recorder in cmdhandler too, but we replace it here
 	# as the user may be specifying a different size.  The default one in
@@ -146,6 +144,7 @@ def main():
 	thread_list.append(updater.thread)
 
 	cfg.load = updater.load
+	cfg.event = updater.event
 
 	cfg.loop = GLib.MainLoop()
 

daemons/lvmdbusd/manager.py

@@ -6,7 +6,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
-from utils import log_debug
+
 from .automatedproperties import AutomatedProperties
 
 from . import utils
@@ -132,28 +132,11 @@ class Manager(AutomatedProperties):
 		r = RequestEntry(-1, Manager._refresh, (), cb, cbe, False)
 		cfg.worker_q.put(r)
 
-	@dbus.service.method(
-		dbus_interface=MANAGER_INTERFACE)
-	def FlightRecorderDump(self):
-		"""
-		Dump the flight recorder to syslog
-		"""
-		cfg.blackbox.dump()
-
-	@staticmethod
-	def _lookup_by_lvm_id(key):
-		p = cfg.om.get_object_path_by_uuid_lvm_id(key, key)
-		if not p:
-			p = '/'
-		log_debug('LookUpByLvmId: key = %s, result = %s' % (key, p))
-		return p
-
 	@dbus.service.method(
 		dbus_interface=MANAGER_INTERFACE,
 		in_signature='s',
-		out_signature='o',
-		async_callbacks=('cb', 'cbe'))
-	def LookUpByLvmId(self, key, cb, cbe):
+		out_signature='o')
+	def LookUpByLvmId(self, key):
 		"""
 		Given a lvm id in one of the forms:
 
@@ -167,8 +150,10 @@ class Manager(AutomatedProperties):
 		:param key: The lookup value
 		:return: Return the object path.  If object not found you will get '/'
 		"""
-		r = RequestEntry(-1, Manager._lookup_by_lvm_id, (key,), cb, cbe, False)
-		cfg.worker_q.put(r)
+		p = cfg.om.get_object_path_by_uuid_lvm_id(key, key)
+		if p:
+			return p
+		return '/'
 
 	@staticmethod
 	def _use_lvm_shell(yes_no):
@@ -184,22 +169,16 @@ class Manager(AutomatedProperties):
 		:param yes_no:
 		:param cb:	dbus python call back parameter, not client visible
 		:param cbe:	dbus python error call back parameter, not client visible
-		:return: Boolean
+		:return: Nothing
 		"""
 		r = RequestEntry(-1, Manager._use_lvm_shell, (yes_no,), cb, cbe, False)
 		cfg.worker_q.put(r)
 
-	@staticmethod
-	def _external_event(command):
-		utils.log_debug("Processing _external_event= %s" % command,
-							'bg_black', 'fg_orange')
-		cfg.load()
-
 	@dbus.service.method(
 		dbus_interface=MANAGER_INTERFACE,
 		in_signature='s', out_signature='i')
 	def ExternalEvent(self, command):
-		utils.log_debug("ExternalEvent %s" % command)
+
 		# If a user didn't explicitly specify udev, we will turn it off now.
 		if not cfg.args.use_udev:
 			if udevwatch.remove():
@@ -207,10 +186,8 @@ class Manager(AutomatedProperties):
 								"udev monitoring")
 				# We are dependent on external events now to stay current!
 				cfg.ee = True
-
-		r = RequestEntry(
-			-1, Manager._external_event, (command,), None, None, False)
-		cfg.worker_q.put(r)
+		utils.log_debug("ExternalEvent %s" % command)
+		cfg.event()
 		return dbus.Int32(0)
 
 	@staticmethod

daemons/lvmdbusd/objectmanager.py

@@ -32,12 +32,14 @@ class ObjectManager(AutomatedProperties):
 		self._id_to_object_path = {}
 		self.rlock = threading.RLock()
 
-	@staticmethod
-	def _get_managed_objects(obj):
-		with obj.rlock:
+	@dbus.service.method(
+		dbus_interface="org.freedesktop.DBus.ObjectManager",
+		out_signature='a{oa{sa{sv}}}')
+	def GetManagedObjects(self):
+		with self.rlock:
 			rc = {}
 			try:
-				for k, v in list(obj._objects.items()):
+				for k, v in list(self._objects.items()):
 					path, props = v[0].emit_data()
 					rc[path] = props
 			except Exception:
@@ -45,14 +47,6 @@ class ObjectManager(AutomatedProperties):
 				sys.exit(1)
 			return rc
 
-	@dbus.service.method(
-		dbus_interface="org.freedesktop.DBus.ObjectManager",
-		out_signature='a{oa{sa{sv}}}', async_callbacks=('cb', 'cbe'))
-	def GetManagedObjects(self, cb, cbe):
-		r = cfg.create_request_entry(-1, ObjectManager._get_managed_objects,
-									(self, ), cb, cbe, False)
-		cfg.worker_q.put(r)
-
 	def locked(self):
 		"""
 		If some external code need to run across a number of different

daemons/lvmdbusd/udevwatch.py

@@ -10,18 +10,11 @@
 import pyudev
 import threading
 from . import cfg
-from .request import RequestEntry
-from . import utils
 
 observer = None
 observer_lock = threading.RLock()
 
 
-def _udev_event():
-	utils.log_debug("Processing udev event")
-	cfg.load()
-
-
 # noinspection PyUnusedLocal
 def filter_event(action, device):
 	# Filter for events of interest and add a request object to be processed
@@ -44,10 +37,7 @@ def filter_event(action, device):
 		refresh = True
 
 	if refresh:
-		# Place this on the queue so any other operations will sequence behind it
-		r = RequestEntry(
-			-1, _udev_event, (), None, None, False)
-		cfg.worker_q.put(r)
+		cfg.event()
 
 
 def add():

daemons/lvmdbusd/utils.py

@@ -499,30 +499,6 @@ def validate_tag(interface, tag):
 			% (tag, _ALLOWABLE_TAG_CH))
 
 
-def add_no_notify(cmdline):
-	"""
-	Given a command line to execute we will see if `--config` is present, if it
-	is we will add the global/notify_dbus=0 to it, otherwise we will append it
-	to the end of the list.
-	:param: cmdline: The command line to inspect
-	:type: cmdline: list
-	:return: cmdline with notify_dbus config option present
-	:rtype: list
-	"""
-
-	if 'help' in cmdline:
-		return cmdline
-
-	if '--config' in cmdline:
-		for i, arg in enumerate(cmdline):
-			if arg == '--config':
-				cmdline[i] += "global/notify_dbus=0"
-				break
-	else:
-		cmdline.extend(['--config', 'global/notify_dbus=0'])
-	return cmdline
-
-
 # The methods below which start with mt_* are used to execute the desired code
 # on the the main thread of execution to alleviate any issues the dbus-python
 # library with regards to multi-threaded access.  Essentially, we are trying to

include/configure.h.in

@@ -127,9 +127,6 @@
 /* Path to dmeventd pidfile. */
 #undef DMEVENTD_PIDFILE
 
-/* Define to 1 to enable the device-mapper filemap daemon. */
-#undef DMFILEMAPD
-
 /* Define to enable compat protocol */
 #undef DM_COMPAT
 

lib/cache/lvmetad.c

@@ -1304,7 +1304,7 @@ int lvmetad_vg_remove_pending(struct volume_group *vg)
 	reply = _lvmetad_send(vg->cmd, "set_vg_info",
 			      "name = %s", vg->name,
 			      "uuid = %s", uuid,
-			      "version = %"PRId64, (int64_t)0,
+			      "version = %d", 0,
 			      NULL);
 
 	if (!_lvmetad_handle_reply(reply, "set_vg_info", vg->name, NULL)) {

lib/cache_segtype/cache.c

@@ -36,31 +36,6 @@ static unsigned _feature_mask;
         log_error(t " segment %s of logical volume %s.", ## p,	\
                   dm_config_parent_name(sn), seg->lv->name), 0;
 
-static int _cache_out_line(const char *line, void *_f)
-{
-	log_print("    Setting\t\t%s", line);
-
-	return 1;
-}
-
-static void _cache_display(const struct lv_segment *seg)
-{
-	const struct dm_config_node *n;
-	const struct lv_segment *pool_seg =
-		seg_is_cache_pool(seg) ? seg : first_seg(seg->pool_lv);
-
-	log_print("  Chunk size\t\t%s",
-		  display_size(seg->lv->vg->cmd, pool_seg->chunk_size));
-	log_print("  Metadata format\t%u", pool_seg->cache_metadata_format);
-	log_print("  Mode\t\t%s", get_cache_mode_name(pool_seg));
-	log_print("  Policy\t\t%s", pool_seg->policy_name);
-
-	if ((n = pool_seg->policy_settings->child))
-		dm_config_write_node(n, _cache_out_line, NULL);
-
-	log_print(" ");
-}
-
 /*
  * When older metadata are loaded without newer settings,
  * set then to default settings (the one that could have been
@@ -77,13 +52,7 @@ static void _fix_missing_defaults(struct lv_segment *cpool_seg)
 			    cpool_seg->policy_name);
 	}
 
-	if (cpool_seg->cache_metadata_format == CACHE_METADATA_FORMAT_UNSELECTED) {
-		cpool_seg->cache_metadata_format = CACHE_METADATA_FORMAT_1;
-		log_verbose("Cache pool %s uses implicit metadata format %u.",
-			    display_lvname(cpool_seg->lv), cpool_seg->cache_metadata_format);
-	}
-
-	if (cpool_seg->cache_mode == CACHE_MODE_UNSELECTED) {
+	if (cpool_seg->cache_mode == CACHE_MODE_UNDEFINED) {
 		cpool_seg->cache_mode = CACHE_MODE_WHEN_MISSING;
 		log_verbose("Cache pool %s is missing cache mode, using %s.",
 			    display_lvname(cpool_seg->lv),
@@ -138,16 +107,6 @@ static int _cache_pool_text_import(struct lv_segment *seg,
 			return SEG_LOG_ERROR("Failed to duplicate policy in");
 	}
 
-	if (dm_config_has_node(sn, "metadata_format")) {
-		if (!dm_config_get_uint32(sn, "metadata_format", &seg->cache_metadata_format) ||
-		    ((seg->cache_metadata_format != CACHE_METADATA_FORMAT_1) &&
-		     (seg->cache_metadata_format != CACHE_METADATA_FORMAT_2)))
-			return SEG_LOG_ERROR("Unknown cache metadata format %u number in",
-					     seg->cache_metadata_format);
-		if (seg->cache_metadata_format == CACHE_METADATA_FORMAT_2)
-			seg->lv->status |= LV_METADATA_FORMAT;
-	}
-
 	/*
 	 * Read in policy args:
 	 *   policy_settings {
@@ -205,31 +164,12 @@ static int _cache_pool_text_export(const struct lv_segment *seg,
 	outf(f, "metadata = \"%s\"", seg->metadata_lv->name);
 	outf(f, "chunk_size = %" PRIu32, seg->chunk_size);
 
-	switch (seg->cache_metadata_format) {
-	case CACHE_METADATA_FORMAT_UNSELECTED:
-		/* Unselected format is not printed */
-		break;
-	case CACHE_METADATA_FORMAT_1:
-		/* If format 1 was already specified with cache pool, store it,
-		 * otherwise format gets stored when LV is cached.
-		 * NB: format 1 could be lost anytime, it's a default format.
-		 * Older lvm2 tool can easily drop it.
-		 */
-	case CACHE_METADATA_FORMAT_2: /* more in future ? */
-		outf(f, "metadata_format = " FMTu32, seg->cache_metadata_format);
-		break;
-	default:
-		log_error(INTERNAL_ERROR "LV %s is using unknown cache metadada format %u.",
-			  display_lvname(seg->lv), seg->cache_metadata_format);
-		return 0;
-	}
-
 	/*
 	 * Cache pool used by a cache LV holds data. Not ideal,
 	 * but not worth to break backward compatibility, by shifting
 	 * content to cache segment
 	 */
-	if (seg->cache_mode != CACHE_MODE_UNSELECTED) {
+	if (seg->cache_mode != CACHE_MODE_UNDEFINED) {
 		if (!(cache_mode = get_cache_mode_name(seg)))
 			return_0;
 		outf(f, "cache_mode = \"%s\"", cache_mode);
@@ -273,7 +213,6 @@ static int _target_present(struct cmd_context *cmd,
 		const char *aliasing;
 	} _features[] = {
 		/* Assumption: cache >=1.9 always aliases MQ policy */
-		{ 1, 10, CACHE_FEATURE_METADATA2, 0, "metadata2" },
 		{ 1, 9, CACHE_FEATURE_POLICY_SMQ, CACHE_FEATURE_POLICY_MQ, "policy_smq", "cache-smq",
 		" and aliases cache-mq" },
 		{ 1, 8, CACHE_FEATURE_POLICY_SMQ, 0, "policy_smq", "cache-smq" },
@@ -311,16 +250,6 @@ static int _target_present(struct cmd_context *cmd,
 		for (i = 0; i < DM_ARRAY_SIZE(_features); ++i) {
 			if (_attrs & _features[i].cache_feature)
 				continue; /* already present */
-
-			if (!_features[i].module[0]) {
-				if ((maj > _features[i].maj) ||
-				    (maj == _features[i].maj && min >= _features[i].min)) {
-					log_debug_activation("Cache supports %s.",
-							     _features[i].feature);
-					_attrs |= _features[i].cache_feature;
-				}
-				continue;
-			}
 			if (((maj > _features[i].maj) ||
 			     (maj == _features[i].maj && min >= _features[i].min)) &&
 			    module_present(cmd, _features[i].module)) {
@@ -381,7 +310,6 @@ static int _modules_needed(struct dm_pool *mem,
 #endif /* DEVMAPPER_SUPPORT */
 
 static struct segtype_handler _cache_pool_ops = {
-	.display = _cache_display,
 	.text_import = _cache_pool_text_import,
 	.text_import_area_count = _cache_pool_text_import_area_count,
 	.text_export = _cache_pool_text_export,
@@ -471,7 +399,6 @@ static int _cache_add_target_line(struct dev_manager *dm,
 	struct lv_segment *cache_pool_seg;
 	char *metadata_uuid, *data_uuid, *origin_uuid;
 	uint64_t feature_flags = 0;
-	unsigned attr;
 
 	if (!seg->pool_lv || !seg_is_cache(seg)) {
 		log_error(INTERNAL_ERROR "Passed segment is not cache.");
@@ -499,26 +426,6 @@ static int _cache_add_target_line(struct dev_manager *dm,
 			break;
 		}
 
-	switch (cache_pool_seg->cache_metadata_format) {
-	case CACHE_METADATA_FORMAT_1: break;
-	case CACHE_METADATA_FORMAT_2:
-		if (!_target_present(cmd, NULL, &attr))
-			return_0;
-
-		if (!(attr & CACHE_FEATURE_METADATA2)) {
-			log_error("LV %s has metadata format %u unsuported by kernel.",
-				  display_lvname(seg->lv), cache_pool_seg->cache_metadata_format);
-			return 0;
-		}
-		feature_flags |= DM_CACHE_FEATURE_METADATA2;
-		log_debug_activation("Using metadata2 format for %s.", display_lvname(seg->lv));
-		break;
-	default:
-		log_error(INTERNAL_ERROR "LV %s has unknown metadata format %u.",
-			  display_lvname(seg->lv), cache_pool_seg->cache_metadata_format);
-		return 0;
-	}
-
 	if (!(metadata_uuid = build_dm_uuid(mem, cache_pool_seg->metadata_lv, NULL)))
 		return_0;
 
@@ -545,7 +452,6 @@ static int _cache_add_target_line(struct dev_manager *dm,
 #endif /* DEVMAPPER_SUPPORT */
 
 static struct segtype_handler _cache_ops = {
-	.display = _cache_display,
 	.text_import = _cache_text_import,
 	.text_import_area_count = _cache_text_import_area_count,
 	.text_export = _cache_text_export,

lib/config/config.c

@@ -2442,13 +2442,21 @@ const char *get_default_activation_mirror_image_fault_policy_CFG(struct cmd_cont
 
 int get_default_allocation_thin_pool_chunk_size_CFG(struct cmd_context *cmd, struct profile *profile)
 {
+	const char *str;
 	uint32_t chunk_size;
-	int chunk_size_calc_method;
 
-	if (!get_default_allocation_thin_pool_chunk_size(cmd, profile, &chunk_size,
-							 &chunk_size_calc_method)) {
-		stack; /* Ignore this error, never happens... */
+	if (!(str = find_config_tree_str(cmd, allocation_thin_pool_chunk_size_policy_CFG, profile))) {
+		log_error(INTERNAL_ERROR "Cannot find configuration.");
+		return 0;
+	}
+
+	if (!strcasecmp(str, "generic"))
 		chunk_size = DEFAULT_THIN_POOL_CHUNK_SIZE * 2;
+	else if (!strcasecmp(str, "performance"))
+		chunk_size = DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2;
+	else {
+		log_error("Thin pool chunk size calculation policy \"%s\" is unrecognised.", str);
+		return 0;
 	}
 
 	return (int) chunk_size;

lib/config/config_settings.h

@@ -473,23 +473,14 @@ cfg(allocation_raid_stripe_all_devices_CFG, "raid_stripe_all_devices", allocatio
 	"when the command does not specify the number of 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_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, 0, 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),
+cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 113), NULL, vsn(2, 2, 128),
 	"This has been replaced by the allocation/cache_mode setting.\n",
 	"Cache mode.\n")
 
-cfg(allocation_cache_metadata_format_CFG, "cache_metadata_format", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_CACHE_METADATA_FORMAT, vsn(2, 2, 169), NULL, 0, NULL,
-	"Sets default metadata format for new cache.\n"
-	"#\n"
-	"Accepted values:\n"
-	"  0  Automatically detected best available format\n"
-	"  1  Original format\n"
-	"  2  Improved 2nd. generation format\n"
-	"#\n")
-
-cfg(allocation_cache_mode_CFG, "cache_mode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 128), NULL, 0, NULL,
+cfg(allocation_cache_mode_CFG, "cache_mode", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_MODE, vsn(2, 2, 128), NULL, 0, NULL,
 	"The default cache mode used for new cache.\n"
 	"#\n"
 	"Accepted values:\n"
@@ -501,20 +492,20 @@ cfg(allocation_cache_mode_CFG, "cache_mode", allocation_CFG_SECTION, CFG_PROFILA
 	"#\n"
 	"This setting replaces allocation/cache_pool_cachemode.\n")
 
-cfg(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL,
+cfg(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL,
 	"The default cache policy used for new cache volume.\n"
-	"Since kernel 4.2 the default policy is smq (Stochastic multiqueue),\n"
+	"Since kernel 4.2 the default policy is smq (Stochastic multique),\n"
 	"otherwise the older mq (Multiqueue) policy is selected.\n")
 
-cfg_section(allocation_cache_settings_CFG_SECTION, "cache_settings", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, vsn(2, 2, 128), 0, NULL,
+cfg_section(allocation_cache_settings_CFG_SECTION, "cache_settings", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, vsn(2, 2, 128), 0, NULL,
 	"Settings for the cache policy.\n"
 	"See documentation for individual cache policies for more info.\n")
 
-cfg_section(policy_settings_CFG_SUBSECTION, "policy_settings", allocation_cache_settings_CFG_SECTION, CFG_NAME_VARIABLE | CFG_SECTION_NO_CHECK | CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, vsn(2, 2, 128), 0, NULL,
+cfg_section(policy_settings_CFG_SUBSECTION, "policy_settings", allocation_cache_settings_CFG_SECTION, CFG_NAME_VARIABLE | CFG_SECTION_NO_CHECK | CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, vsn(2, 2, 128), 0, NULL,
 	"Replace this subsection name with a policy name.\n"
 	"Multiple subsections for different policies can be created.\n")
 
-cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 106), 0, NULL,
+cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 106), 0, NULL,
 	"The minimal chunk size in KiB for cache pool volumes.\n"
 	"Using a chunk_size that is too large can result in wasteful use of\n"
 	"the cache, where small reads and writes can cause large sections of\n"
@@ -525,7 +516,7 @@ cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", alloc
 	"on the smaller end of the spectrum. Supported values range from\n"
 	"32KiB to 1GiB in multiples of 32.\n")
 
-cfg(allocation_cache_pool_max_chunks_CFG, "cache_pool_max_chunks", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, 0, vsn(2, 2, 165), NULL, 0, NULL,
+cfg(allocation_cache_pool_max_chunks_CFG, "cache_pool_max_chunks", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, 0, vsn(2, 2, 165), NULL, 0, NULL,
 	"The maximum number of chunks in a cache pool.\n"
 	"For cache target v1.9 the recommended maximumm is 1000000 chunks.\n"
 	"Using cache pool with more chunks may degrade cache performance.\n")
@@ -1001,7 +992,7 @@ cfg_array(global_thin_disabled_features_CFG, "thin_disabled_features", global_CF
 cfg_array(global_cache_disabled_features_CFG, "cache_disabled_features", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 128), NULL, 0, NULL,
 	"Features to not use in the cache driver.\n"
 	"This can be helpful for testing, or to avoid using a feature that is\n"
-	"causing problems. Features include: policy_mq, policy_smq, metadata2.\n"
+	"causing problems. Features include: policy_mq, policy_smq.\n"
 	"#\n"
 	"Example\n"
 	"cache_disabled_features = [ \"policy_smq\" ]\n"

lib/config/defaults.h

@@ -132,7 +132,6 @@
 #define DEFAULT_CACHE_POOL_MIN_METADATA_SIZE 2048  /* KB */
 #define DEFAULT_CACHE_POOL_MAX_METADATA_SIZE (16 * 1024 * 1024)  /* KB */
 #define DEFAULT_CACHE_POLICY "mq"
-#define DEFAULT_CACHE_METADATA_FORMAT CACHE_METADATA_FORMAT_UNSELECTED /* Autodetect */
 #define DEFAULT_CACHE_MODE "writethrough"
 
 #define DEFAULT_UMASK 0077

lib/display/display.c

@@ -386,7 +386,6 @@ int lvdisplay_full(struct cmd_context *cmd,
 	dm_percent_t thin_data_percent, thin_metadata_percent;
 	int thin_active = 0;
 	dm_percent_t thin_percent;
-	struct lv_status_cache *cache_status = NULL;
 
 	if (lv_is_historical(lv))
 		return _lvdisplay_historical_full(cmd, lv);
@@ -492,19 +491,6 @@ int lvdisplay_full(struct cmd_context *cmd,
 		seg = first_seg(lv);
 		log_print("LV Pool metadata       %s", seg->metadata_lv->name);
 		log_print("LV Pool data           %s", seg_lv(seg, 0)->name);
-	} else if (lv_is_cache_origin(lv)) {
-		log_print("LV origin of Cache LV  %s",
-			  get_only_segment_using_this_lv(lv)->lv->name);
-	} else if (lv_is_cache(lv)) {
-		seg = first_seg(lv);
-		if (inkernel && !lv_cache_status(lv, &cache_status))
-                        return_0;
-		log_print("LV Cache pool name     %s", seg->pool_lv->name);
-		log_print("LV Cache origin name   %s", seg_lv(seg, 0)->name);
-	} else if (lv_is_cache_pool(lv)) {
-		seg = first_seg(lv);
-		log_print("LV Pool metadata       %s", seg->metadata_lv->name);
-		log_print("LV Pool data           %s", seg_lv(seg, 0)->name);
 	}
 
 	if (inkernel && info.suspended)
@@ -524,27 +510,6 @@ int lvdisplay_full(struct cmd_context *cmd,
 		  display_size(cmd,
 			       snap_seg ? snap_seg->origin->size : lv->size));
 
-	if (cache_status) {
-		log_print("Cache used blocks      %.2f%%",
-			  dm_percent_to_float(cache_status->data_usage));
-		log_print("Cache metadata blocks  %.2f%%",
-			  dm_percent_to_float(cache_status->metadata_usage));
-		log_print("Cache dirty blocks     %.2f%%",
-			  dm_percent_to_float(cache_status->dirty_usage));
-		log_print("Cache read hits/misses " FMTu64 " / " FMTu64,
-			  cache_status->cache->read_hits,
-			  cache_status->cache->read_misses);
-		log_print("Cache wrt hits/misses  " FMTu64 " / " FMTu64,
-			  cache_status->cache->write_hits,
-			  cache_status->cache->write_misses);
-		log_print("Cache demotions        " FMTu64,
-			  cache_status->cache->demotions);
-		log_print("Cache promotions       " FMTu64,
-			  cache_status->cache->promotions);
-
-		dm_pool_destroy(cache_status->mem);
-	}
-
 	if (thin_data_active)
 		log_print("Allocated pool data    %.2f%%",
 			  dm_percent_to_float(thin_data_percent));

lib/format_text/flags.c

@@ -67,7 +67,6 @@ static const struct flag _lv_flags[] = {
 	{LV_WRITEMOSTLY, "WRITEMOSTLY", STATUS_FLAG},
 	{LV_ACTIVATION_SKIP, "ACTIVATION_SKIP", COMPATIBLE_FLAG},
 	{LV_ERROR_WHEN_FULL, "ERROR_WHEN_FULL", COMPATIBLE_FLAG},
-	{LV_METADATA_FORMAT, "METADATA_FORMAT", STATUS_FLAG},
 	{LV_NOSCAN, NULL, 0},
 	{LV_TEMPORARY, NULL, 0},
 	{POOL_METADATA_SPARE, NULL, 0},

lib/metadata/cache_manip.c

@@ -35,7 +35,7 @@ const char *display_cache_mode(const struct lv_segment *seg)
 		seg = first_seg(seg->pool_lv);
 
 	if (!seg_is_cache_pool(seg) ||
-	    (seg->cache_mode == CACHE_MODE_UNSELECTED))
+	    (seg->cache_mode == CACHE_MODE_UNDEFINED))
 		return "";
 
 	return get_cache_mode_name(seg);
@@ -77,14 +77,13 @@ int set_cache_mode(cache_mode_t *mode, const char *cache_mode)
 int cache_set_cache_mode(struct lv_segment *seg, cache_mode_t mode)
 {
 	struct cmd_context *cmd = seg->lv->vg->cmd;
-	struct profile *profile = seg->lv->profile;
 	const char *str;
 	int id;
 
 	if (seg_is_cache(seg))
 		seg = first_seg(seg->pool_lv);
 	else if (seg_is_cache_pool(seg)) {
-		if (mode == CACHE_MODE_UNSELECTED)
+		if (mode == CACHE_MODE_UNDEFINED)
 			return 1;	/* Defaults only for cache */
 	} else {
 		log_error(INTERNAL_ERROR "Cannot set cache mode for non cache volume %s.",
@@ -92,12 +91,12 @@ int cache_set_cache_mode(struct lv_segment *seg, cache_mode_t mode)
 		return 0;
 	}
 
-	if (mode != CACHE_MODE_UNSELECTED) {
+	if (mode != CACHE_MODE_UNDEFINED) {
 		seg->cache_mode = mode;
 		return 1;
 	}
 
-	if (seg->cache_mode != CACHE_MODE_UNSELECTED)
+	if (seg->cache_mode != CACHE_MODE_UNDEFINED)
 		return 1;               /* Default already set in cache pool */
 
 	/* Figure default settings from config/profiles */
@@ -108,7 +107,7 @@ int cache_set_cache_mode(struct lv_segment *seg, cache_mode_t mode)
 	    find_config_node(cmd, cmd->cft, allocation_cache_pool_cachemode_CFG))
 		id = allocation_cache_pool_cachemode_CFG;
 
-	if (!(str = find_config_tree_str(cmd, id, profile))) {
+	if (!(str = find_config_tree_str(cmd, id, NULL))) {
 		log_error(INTERNAL_ERROR "Cache mode is not determined.");
 		return 0;
 	}
@@ -153,30 +152,25 @@ static uint64_t _cache_min_metadata_size(uint64_t data_size, uint32_t chunk_size
 	return min_meta_size;
 }
 
-int update_cache_pool_params(struct cmd_context *cmd,
-			     struct profile *profile,
-			     uint32_t extent_size,
-			     const struct segment_type *segtype,
-			     unsigned attr,
-			     uint32_t pool_data_extents,
+int update_cache_pool_params(const struct segment_type *segtype,
+			     struct volume_group *vg, unsigned attr,
+			     int passed_args, uint32_t pool_data_extents,
 			     uint32_t *pool_metadata_extents,
 			     int *chunk_size_calc_method, uint32_t *chunk_size)
 {
 	uint64_t min_meta_size;
+	uint32_t extent_size = vg->extent_size;
 	uint64_t pool_metadata_size = (uint64_t) *pool_metadata_extents * extent_size;
 	uint64_t pool_data_size = (uint64_t) pool_data_extents * extent_size;
-	const uint64_t max_chunks =
-		get_default_allocation_cache_pool_max_chunks_CFG(cmd, profile);
+	uint64_t max_chunks =
+		get_default_allocation_cache_pool_max_chunks_CFG(vg->cmd, vg->profile);
 	/* min chunk size in a multiple of DM_CACHE_MIN_DATA_BLOCK_SIZE */
 	uint64_t min_chunk_size = (((pool_data_size + max_chunks - 1) / max_chunks +
 				    DM_CACHE_MIN_DATA_BLOCK_SIZE - 1) /
 				   DM_CACHE_MIN_DATA_BLOCK_SIZE) * DM_CACHE_MIN_DATA_BLOCK_SIZE;
 
-	if (!*chunk_size) {
-		if (!(*chunk_size = find_config_tree_int(cmd, allocation_cache_pool_chunk_size_CFG,
-							 profile) * 2))
-			*chunk_size = get_default_allocation_cache_pool_chunk_size_CFG(cmd,
-										       profile);
+	if (!(passed_args & PASS_ARG_CHUNK_SIZE)) {
+		*chunk_size = DEFAULT_CACHE_POOL_CHUNK_SIZE * 2;
 		if (*chunk_size < min_chunk_size) {
 			/*
 			 * When using more then 'standard' default,
@@ -184,25 +178,25 @@ int update_cache_pool_params(struct cmd_context *cmd,
 			 */
 			log_print_unless_silent("Using %s chunk size instead of default %s, "
 						"so cache pool has less then " FMTu64 " chunks.",
-						display_size(cmd, min_chunk_size),
-						display_size(cmd, *chunk_size),
+						display_size(vg->cmd, min_chunk_size),
+						display_size(vg->cmd, *chunk_size),
 						max_chunks);
 			*chunk_size = min_chunk_size;
 		} else
 			log_verbose("Setting chunk size to %s.",
-				    display_size(cmd, *chunk_size));
+				    display_size(vg->cmd, *chunk_size));
 	} else if (*chunk_size < min_chunk_size) {
 		log_error("Chunk size %s is less then required minimal chunk size %s "
 			  "for a cache pool of %s size and limit " FMTu64 " chunks.",
-			  display_size(cmd, *chunk_size),
-			  display_size(cmd, min_chunk_size),
-			  display_size(cmd, pool_data_size),
+			  display_size(vg->cmd, *chunk_size),
+			  display_size(vg->cmd, min_chunk_size),
+			  display_size(vg->cmd, pool_data_size),
 			  max_chunks);
 		log_error("To allow use of more chunks, see setting allocation/cache_pool_max_chunks.");
 		return 0;
 	}
 
-	if (!validate_cache_chunk_size(cmd, *chunk_size))
+	if (!validate_pool_chunk_size(vg->cmd, segtype, *chunk_size))
 		return_0;
 
 	min_meta_size = _cache_min_metadata_size((uint64_t) pool_data_extents * extent_size, *chunk_size);
@@ -216,31 +210,22 @@ int update_cache_pool_params(struct cmd_context *cmd,
 
 	if (pool_metadata_size > (2 * DEFAULT_CACHE_POOL_MAX_METADATA_SIZE)) {
 		pool_metadata_size = 2 * DEFAULT_CACHE_POOL_MAX_METADATA_SIZE;
-		if (*pool_metadata_extents)
+		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Maximum supported pool metadata size is %s.",
-				 display_size(cmd, pool_metadata_size));
+				 display_size(vg->cmd, pool_metadata_size));
 	} else if (pool_metadata_size < min_meta_size) {
-		if (*pool_metadata_extents)
+		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Minimum required pool metadata size is %s "
 				 "(needs extra %s).",
-				 display_size(cmd, min_meta_size),
-				 display_size(cmd, min_meta_size - pool_metadata_size));
+				 display_size(vg->cmd, min_meta_size),
+				 display_size(vg->cmd, min_meta_size - pool_metadata_size));
 		pool_metadata_size = min_meta_size;
 	}
 
 	if (!(*pool_metadata_extents =
-	      extents_from_size(cmd, pool_metadata_size, extent_size)))
+	      extents_from_size(vg->cmd, pool_metadata_size, extent_size)))
 		return_0;
 
-	if ((uint64_t) *chunk_size > (uint64_t) pool_data_extents * extent_size) {
-		log_error("Size of %s data volume cannot be smaller than chunk size %s.",
-			  segtype->name, display_size(cmd, *chunk_size));
-		return 0;
-	}
-
-	log_verbose("Preferred pool metadata size %s.",
-		    display_size(cmd, (uint64_t)*pool_metadata_extents * extent_size));
-
 	return 1;
 }
 
@@ -251,7 +236,7 @@ int update_cache_pool_params(struct cmd_context *cmd,
 int validate_lv_cache_chunk_size(struct logical_volume *pool_lv, uint32_t chunk_size)
 {
 	struct volume_group *vg = pool_lv->vg;
-	const uint64_t max_chunks = get_default_allocation_cache_pool_max_chunks_CFG(vg->cmd, pool_lv->profile);
+	uint64_t max_chunks = get_default_allocation_cache_pool_max_chunks_CFG(vg->cmd, vg->profile);
 	uint64_t min_size = _cache_min_metadata_size(pool_lv->size, chunk_size);
 	uint64_t chunks = pool_lv->size / chunk_size;
 	int r = 1;
@@ -307,7 +292,7 @@ int validate_lv_cache_create_pool(const struct logical_volume *pool_lv)
 
 	if (!dm_list_empty(&pool_lv->segs_using_this_lv)) {
 		seg = get_only_segment_using_this_lv(pool_lv);
-		log_error("Logical volume %s is already in use by %s.",
+		log_error("Logical volume %s is already in use by %s",
 			  display_lvname(pool_lv),
 			  seg ? display_lvname(seg->lv) : "another LV");
 		return 0;
@@ -348,30 +333,6 @@ int validate_lv_cache_create_origin(const struct logical_volume *origin_lv)
 	return 1;
 }
 
-int validate_cache_chunk_size(struct cmd_context *cmd, uint32_t chunk_size)
-{
-	const uint32_t min_size = DM_CACHE_MIN_DATA_BLOCK_SIZE;
-	const uint32_t max_size = DM_CACHE_MAX_DATA_BLOCK_SIZE;
-	int r = 1;
-
-	if ((chunk_size < min_size) || (chunk_size > max_size)) {
-		log_error("Cache chunk size %s is not in the range %s to %s.",
-			  display_size(cmd, chunk_size),
-			  display_size(cmd, min_size),
-			  display_size(cmd, max_size));
-		r = 0;
-	}
-
-	if (chunk_size & (min_size - 1)) {
-		log_error("Cache chunk size %s must be a multiple of %s.",
-			  display_size(cmd, chunk_size),
-			  display_size(cmd, min_size));
-		r = 0;
-	}
-
-	return r;
-}
-
 /*
  * lv_cache_create
  * @pool
@@ -409,9 +370,6 @@ struct logical_volume *lv_cache_create(struct logical_volume *pool_lv,
 	if (!attach_pool_lv(seg, pool_lv, NULL, NULL, NULL))
 		return_NULL;
 
-	if (!seg->lv->profile) /* Inherit profile from cache-pool */
-		seg->lv->profile = seg->pool_lv->profile;
-
 	return cache_lv;
 }
 
@@ -675,26 +633,6 @@ static const char *_get_default_cache_policy(struct cmd_context *cmd)
 	return def;
 }
 
-/* Autodetect best available cache metadata format for a user */
-static cache_metadata_format_t _get_default_cache_metadata_format(struct cmd_context *cmd)
-{
-	const struct segment_type *segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_CACHE);
-	unsigned attr;
-	cache_metadata_format_t f;
-
-	if (!segtype ||
-	    !segtype->ops->target_present ||
-	    !segtype->ops->target_present(cmd, NULL, &attr)) {
-		f = CACHE_METADATA_FORMAT_1;
-		log_warn("WARNING: Cannot detect default cache metadata format, using format: %u.", f);
-	} else {
-		f = (attr & CACHE_FEATURE_METADATA2) ? CACHE_METADATA_FORMAT_2 : CACHE_METADATA_FORMAT_1;
-		log_debug_metadata("Detected default cache metadata format: %u.", f);
-	}
-
-	return f;
-}
-
 int cache_set_policy(struct lv_segment *seg, const char *name,
 		     const struct dm_config_tree *settings)
 {
@@ -702,36 +640,28 @@ int cache_set_policy(struct lv_segment *seg, const char *name,
 	const struct dm_config_node *cns;
 	struct dm_config_tree *old = NULL, *new = NULL, *tmp = NULL;
 	int r = 0;
-	struct profile *profile = seg->lv->profile;
+	const int passed_seg_is_cache = seg_is_cache(seg);
 
-	if (seg_is_cache(seg))
+	if (passed_seg_is_cache)
 		seg = first_seg(seg->pool_lv);
-	else if (seg_is_cache_pool(seg)) {
-		if (!name && !settings)
-			return 1; /* Policy and settings can be selected later when caching LV */
-	} else {
-		log_error(INTERNAL_ERROR "Cannot set cache metadata format for non cache volume %s.",
-			  display_lvname(seg->lv));
-		return 0;
-	}
 
 	if (name) {
 		if (!(seg->policy_name = dm_pool_strdup(seg->lv->vg->vgmem, name))) {
 			log_error("Failed to duplicate policy name.");
 			return 0;
 		}
-	} else if (!seg->policy_name) {
-		if (!(seg->policy_name = find_config_tree_str(seg->lv->vg->cmd, allocation_cache_policy_CFG,
-							      profile)) &&
+	} else if (!seg->policy_name && passed_seg_is_cache) {
+		if (!(seg->policy_name = find_config_tree_str(seg->lv->vg->cmd, allocation_cache_policy_CFG, NULL)) &&
 		    !(seg->policy_name = _get_default_cache_policy(seg->lv->vg->cmd)))
 			return_0;
+	}
+
+	if (settings) {
 		if (!seg->policy_name) {
 			log_error(INTERNAL_ERROR "Can't set policy settings without policy name.");
 			return 0;
 		}
-	}
 
-	if (settings) {
 		if (seg->policy_settings) {
 			if (!(old = dm_config_create()))
 				goto_out;
@@ -747,26 +677,30 @@ int cache_set_policy(struct lv_segment *seg, const char *name,
 		if ((cn = dm_config_find_node((tmp) ? tmp->root : settings->root, "policy_settings")) &&
 		    !(seg->policy_settings = dm_config_clone_node_with_mem(seg->lv->vg->vgmem, cn, 0)))
 			goto_out;
-	} else if (!seg->policy_settings) {
-		if ((cns = find_config_tree_node(seg->lv->vg->cmd, allocation_cache_settings_CFG_SECTION,
-						 profile))) {
-			/* Try to find our section for given policy */
-			for (cn = cns->child; cn; cn = cn->sib) {
-				if (!cn->child)
-					continue; /* Ignore section without settings */
+	} else if (passed_seg_is_cache && /* Look for command's profile cache_policies */
+		   (cns = find_config_tree_node(seg->lv->vg->cmd, allocation_cache_settings_CFG_SECTION, NULL))) {
+		/* Try to find our section for given policy */
+		for (cn = cns->child; cn; cn = cn->sib) {
+			/* Only matching section names */
+			if (cn->v || strcmp(cn->key, seg->policy_name) != 0)
+				continue;
 
-				if (cn->v || strcmp(cn->key, seg->policy_name) != 0)
-					continue; /* Ignore mismatching sections */
+			if (!cn->child)
+				break;
 
-				/* Clone nodes with policy name */
-				if (!(seg->policy_settings = dm_config_clone_node_with_mem(seg->lv->vg->vgmem,
-											   cn, 0)))
-					return_0;
+			if (!(new = dm_config_create()))
+				goto_out;
 
-				/* Replace policy name key with 'policy_settings' */
-				seg->policy_settings->key = "policy_settings";
-				break; /* Only first match counts */
-			}
+			if (!(new->root = dm_config_clone_node_with_mem(new->mem,
+									cn->child, 1)))
+				goto_out;
+
+			if (!(seg->policy_settings = dm_config_create_node(new, "policy_settings")))
+				goto_out;
+
+			seg->policy_settings->child = new->root;
+
+			break; /* Only first match counts */
 		}
 	}
 
@@ -793,94 +727,17 @@ out:
 	return r;
 }
 
-/*
- * Sets metadata format on cache pool segment with these rules:
- * 1. When 'cache-pool' segment is passed, sets only for selected formats (1 or 2).
- * 2. For 'cache' segment passed in we know cache pool segment.
- *      When passed format is 0 (UNSELECTED) with 'cache' segment - it's the moment
- *      lvm2 has to figure out 'default' metadata format (1 or 2) from
- *      configuration or profiles.
- * 3. If still unselected or selected format is != 1, figure the best supported format
- *    and either use it or validate users settings is possible.
- *
- * Reasoning: A user may create cache-pool and may or may not specify CMFormat.
- * If the CMFormat has been selected (1 or 2) store this in metadata, otherwise
- * for an unused cache-pool UNSELECTED CMFormat is used. When caching LV, CMFormat
- * must be decided and from this moment it's always stored. To support backward
- * compatibility 'CMFormat 1' is used when it is NOT specified for a cached LV in
- * lvm2 metadata (no metadata_format=#F element in cache-pool segment).
- */
-int cache_set_metadata_format(struct lv_segment *seg, cache_metadata_format_t format)
-{
-	cache_metadata_format_t best;
-	struct profile *profile = seg->lv->profile;
-
-	if (seg_is_cache(seg))
-		seg = first_seg(seg->pool_lv);
-	else if (seg_is_cache_pool(seg)) {
-		if (format == CACHE_METADATA_FORMAT_UNSELECTED)
-			return 1; /* Format can be selected later when caching LV */
-	} else {
-		log_error(INTERNAL_ERROR "Cannot set cache metadata format for non cache volume %s.",
-			  display_lvname(seg->lv));
-		return 0;
-	}
-
-	/* Check if we need to search for configured cache metadata format */
-	if (format == CACHE_METADATA_FORMAT_UNSELECTED) {
-		if (seg->cache_metadata_format != CACHE_METADATA_FORMAT_UNSELECTED)
-			return 1; /* Format already selected in cache pool */
-
-		/* Check configurations and profiles */
-		format = find_config_tree_int(seg->lv->vg->cmd, allocation_cache_metadata_format_CFG,
-					      profile);
-	}
-
-	/* See what is a 'best' available cache metadata format
-	 * when the specifed format is other then always existing CMFormat 1 */
-	if (format != CACHE_METADATA_FORMAT_1) {
-		best = _get_default_cache_metadata_format(seg->lv->vg->cmd);
-
-		/* Format was not selected, so use best present on a system */
-		if (format == CACHE_METADATA_FORMAT_UNSELECTED)
-			format = best;
-		else if (format != best) {
-			/* Format is not valid (Only Format 1 or 2 is supported ATM) */
-			log_error("Cache metadata format %u is not supported by kernel target.", format);
-			return 0;
-		}
-	}
-
-	switch (format) {
-	case CACHE_METADATA_FORMAT_2: seg->lv->status |= LV_METADATA_FORMAT; break;
-	case CACHE_METADATA_FORMAT_1: seg->lv->status &= ~LV_METADATA_FORMAT; break;
-	default:
-		log_error(INTERNAL_ERROR "Invalid cache metadata format %u for cache volume %s.",
-			  format, display_lvname(seg->lv));
-		return 0;
-	}
-
-	seg->cache_metadata_format = format;
-
-	return 1;
-}
-
 /*
  * Universal 'wrapper' function  do-it-all
  * to update all commonly specified cache parameters
  */
 int cache_set_params(struct lv_segment *seg,
-		     uint32_t chunk_size,
-		     cache_metadata_format_t format,
 		     cache_mode_t mode,
 		     const char *policy_name,
-		     const struct dm_config_tree *policy_settings)
+		     const struct dm_config_tree *policy_settings,
+		     uint32_t chunk_size)
 {
 	struct lv_segment *pool_seg;
-	struct cmd_context *cmd = seg->lv->vg->cmd;
-
-	if (!cache_set_metadata_format(seg, format))
-		return_0;
 
 	if (!cache_set_cache_mode(seg, mode))
 		return_0;
@@ -891,35 +748,16 @@ int cache_set_params(struct lv_segment *seg,
 	pool_seg = seg_is_cache(seg) ? first_seg(seg->pool_lv) : seg;
 
 	if (chunk_size) {
-		if (seg_is_cache(seg) &&
-		    !validate_lv_cache_chunk_size(pool_seg->lv, chunk_size))
+		if (!validate_lv_cache_chunk_size(pool_seg->lv, chunk_size))
 			return_0;
 		pool_seg->chunk_size = chunk_size;
-	} else if (seg_is_cache(seg)) {
-		/* Chunk size in profile has priority over cache-pool chunk size */
-		if ((chunk_size = find_config_tree_int(cmd, allocation_cache_pool_chunk_size_CFG,
-						       seg->lv->profile) * 2)) {
-			if (!validate_lv_cache_chunk_size(pool_seg->lv, chunk_size))
-				return_0;
-			if (pool_seg->chunk_size != chunk_size)
-				log_verbose("Replacing chunk size %s in cache pool %s with "
-					    "chunk size %s from profile.",
-					    display_size(cmd, pool_seg->chunk_size),
-					    display_lvname(seg->lv),
-					    display_size(cmd, chunk_size));
-			pool_seg->chunk_size = chunk_size;
-		}
-	} else if (seg_is_cache_pool(seg)) {
-		if (!pool_seg->chunk_size &&
-		    /* TODO: some calc_policy solution for cache ? */
-		    !recalculate_pool_chunk_size_with_dev_hints(pool_seg->lv,
+	} else {
+		/* TODO: some calc_policy solution for cache ? */
+		if (!recalculate_pool_chunk_size_with_dev_hints(pool_seg->lv, 0,
 								THIN_CHUNK_SIZE_CALC_METHOD_GENERIC))
 			return_0;
 	}
 
-	if (seg_is_cache(seg))
-		cache_check_for_warns(seg);
-
 	return 1;
 }
 

lib/metadata/lv.c

@@ -227,23 +227,12 @@ char *lvseg_kernel_discards_dup_with_info_and_seg_status(struct dm_pool *mem, co
 {
 	const char *s = "";
 	char *ret;
-	thin_discards_t d;
 
-	if (lvdm->seg_status.type == SEG_STATUS_THIN_POOL) {
-		switch (lvdm->seg_status.thin_pool->discards) {
-		case DM_THIN_DISCARDS_IGNORE: d = THIN_DISCARDS_IGNORE; break;
-		case DM_THIN_DISCARDS_NO_PASSDOWN: d = THIN_DISCARDS_NO_PASSDOWN; break;
-		case DM_THIN_DISCARDS_PASSDOWN: d = THIN_DISCARDS_PASSDOWN; break;
-		default:
-			log_error("Kernel reports unknown discards status %u.",
-				  lvdm->seg_status.thin_pool->discards);
-			return 0;
-		}
-		s = get_pool_discards_name(d);
-	}
+	if (lvdm->seg_status.type == SEG_STATUS_THIN_POOL)
+		s = get_pool_discards_name(lvdm->seg_status.thin_pool->discards);
 
 	if (!(ret = dm_pool_strdup(mem, s))) {
-		log_error("lvseg_kernel_discards_dup_with_info_and_seg_status: dm_pool_strdup failed.");
+		log_error("lvseg_kernel_discards_dup_with_info_and_seg_status: dm_pool_strdup failed");
 		return NULL;
 	}
 
@@ -1279,7 +1268,7 @@ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_
 
 	if (((lv_is_thin_volume(lv) && (seg = first_seg(lv)) && seg->pool_lv && (seg = first_seg(seg->pool_lv))) ||
 	     (lv_is_thin_pool(lv) && (seg = first_seg(lv)))) &&
-	    (seg->zero_new_blocks == THIN_ZERO_YES))
+	    seg->zero_new_blocks)
 		repstr[7] = 'z';
 	else
 		repstr[7] = '-';

lib/metadata/lv_manip.c

@@ -7402,20 +7402,29 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 			return NULL;
 		}
 
-		if (seg_is_thin_volume(lp)) {
-			/* Validate volume size to to aling on chunk for small extents */
-			size = first_seg(pool_lv)->chunk_size;
-			if (size > vg->extent_size) {
-				/* Align extents on chunk boundary size */
-				size = ((uint64_t)vg->extent_size * lp->extents + size - 1) /
-					size * size / vg->extent_size;
-				if (size != lp->extents) {
-					log_print_unless_silent("Rounding size (%d extents) up to chunk boundary "
-								"size (%d extents).", lp->extents, size);
-					lp->extents = size;
-				}
-			}
+		if (seg_is_cache(lp)) {
+			/* validate metadata size */
+			if (!validate_lv_cache_chunk_size(pool_lv, lp->chunk_size))
+				return_0;
 
+			first_seg(pool_lv)->chunk_size = lp->chunk_size;
+		}
+
+		/* Validate volume size to to aling on chunk for small extents */
+		/* Cache chunk size is always set */
+		size = first_seg(pool_lv)->chunk_size;
+		if (size > vg->extent_size) {
+			/* Align extents on chunk boundary size */
+			size = ((uint64_t)vg->extent_size * lp->extents + size - 1) /
+				size * size / vg->extent_size;
+			if (size != lp->extents) {
+				log_print_unless_silent("Rounding size (%d extents) up to chunk boundary "
+							"size (%d extents).", lp->extents, size);
+				lp->extents = size;
+			}
+		}
+
+		if (seg_is_thin_volume(lp)) {
 			thin_pool_was_active = lv_is_active(pool_lv);
 			if (lv_is_new_thin_pool(pool_lv)) {
 				if (!check_new_thin_pool(pool_lv))
@@ -7425,7 +7434,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 				if (!activate_lv_excl_local(cmd, pool_lv)) {
 					log_error("Aborting. Failed to locally activate thin pool %s.",
 						  display_lvname(pool_lv));
-					return NULL;
+					return 0;
 				}
 				if (!pool_below_threshold(first_seg(pool_lv))) {
 					log_error("Cannot create new thin volume, free space in "
@@ -7663,11 +7672,10 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 
 	if (lv_is_cache_pool(lv)) {
 		if (!cache_set_params(first_seg(lv),
-				      lp->chunk_size,
-				      lp->cache_metadata_format,
 				      lp->cache_mode,
 				      lp->policy_name,
-				      lp->policy_settings)) {
+				      lp->policy_settings,
+				      lp->chunk_size)) {
 			stack;
 			goto revert_new_lv;
 		}
@@ -7676,9 +7684,10 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 		first_seg(lv)->max_recovery_rate = lp->max_recovery_rate;
 	} else if (lv_is_thin_pool(lv)) {
 		first_seg(lv)->chunk_size = lp->chunk_size;
-		first_seg(lv)->zero_new_blocks = lp->zero_new_blocks;
+		first_seg(lv)->zero_new_blocks = lp->zero ? 1 : 0;
 		first_seg(lv)->discards = lp->discards;
-		if (!recalculate_pool_chunk_size_with_dev_hints(lv, lp->thin_chunk_size_calc_policy)) {
+		if (!recalculate_pool_chunk_size_with_dev_hints(lv, lp->passed_args,
+								lp->thin_chunk_size_calc_policy)) {
 			stack;
 			goto revert_new_lv;
 		}
@@ -7872,13 +7881,14 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 		lv = tmp_lv;
 
 		if (!cache_set_params(first_seg(lv),
-				      lp->chunk_size,
-				      lp->cache_metadata_format,
 				      lp->cache_mode,
 				      lp->policy_name,
-				      lp->policy_settings))
+				      lp->policy_settings,
+				      (lp->passed_args & PASS_ARG_CHUNK_SIZE) ? lp->chunk_size : 0))
 			return_NULL; /* revert? */
 
+		cache_check_for_warns(first_seg(lv));
+
 		if (!lv_update_and_reload(lv)) {
 			/* FIXME Do a better revert */
 			log_error("Aborting. Manual intervention required.");

lib/metadata/merge.c

@@ -328,13 +328,6 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
 
 	if (seg_is_cache_pool(seg)) {
 		if (!dm_list_empty(&seg->lv->segs_using_this_lv)) {
-			switch (seg->cache_metadata_format) {
-			case CACHE_METADATA_FORMAT_2:
-			case CACHE_METADATA_FORMAT_1:
-				break;
-			default:
-				seg_error("has invalid cache metadata format");
-			}
 			switch (seg->cache_mode) {
 			case CACHE_MODE_WRITETHROUGH:
 			case CACHE_MODE_WRITEBACK:
@@ -346,24 +339,13 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
 			if (!seg->policy_name)
 				seg_error("is missing cache policy name");
 		}
-		if (!validate_cache_chunk_size(lv->vg->cmd, seg->chunk_size))
-			seg_error("has invalid chunk size.");
-		if (seg->lv->status & LV_METADATA_FORMAT) {
-			if (seg->cache_metadata_format != CACHE_METADATA_FORMAT_2)
-				seg_error("sets METADATA_FORMAT flag");
-		} else if (seg->cache_metadata_format == CACHE_METADATA_FORMAT_2)
-			seg_error("is missing METADATA_FORMAT flag");
 	} else { /* !cache_pool */
-		if (seg->cache_metadata_format)
-			seg_error("sets cache metadata format");
 		if (seg->cache_mode)
 			seg_error("sets cache mode");
 		if (seg->policy_name)
 			seg_error("sets policy name");
 		if (seg->policy_settings)
 			seg_error("sets policy settings");
-		if (seg->lv->status & LV_METADATA_FORMAT)
-			seg_error("sets METADATA_FORMAT flag");
 	}
 
 	if (!seg_can_error_when_full(seg) && lv_is_error_when_full(lv))
@@ -398,6 +380,9 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
 			seg_error("is missing a pool metadata LV");
 		} else if (!(seg2 = first_seg(seg->metadata_lv)) || (find_pool_seg(seg2) != seg))
 			seg_error("metadata LV does not refer back to pool LV");
+
+		if (!validate_pool_chunk_size(lv->vg->cmd, seg->segtype, seg->chunk_size))
+			seg_error("has invalid chunk size.");
 	} else { /* !thin_pool && !cache_pool */
 		if (seg->metadata_lv)
 			seg_error("must not have pool metadata LV set");
@@ -409,17 +394,10 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
 
 		if (lv_is_thin_volume(lv))
 			seg_error("is a thin volume that must not contain thin pool segment");
-
-		if (!validate_thin_pool_chunk_size(lv->vg->cmd, seg->chunk_size))
-			seg_error("has invalid chunk size.");
-
-		if (seg->zero_new_blocks != THIN_ZERO_YES &&
-                    seg->zero_new_blocks != THIN_ZERO_NO)
-			seg_error("zero_new_blocks is invalid");
 	} else { /* !thin_pool */
-		if (seg->zero_new_blocks != THIN_ZERO_UNSELECTED)
+		if (seg->zero_new_blocks)
 			seg_error("sets zero_new_blocks");
-		if (seg->discards != THIN_DISCARDS_UNSELECTED)
+		if (seg->discards)
 			seg_error("sets discards");
 		if (!dm_list_empty(&seg->thin_messages))
 			seg_error("sets thin_messages list");

lib/metadata/metadata-exported.h

@@ -141,8 +141,7 @@
 #define LV_RESHAPE_DELTA_DISKS_MINUS		UINT64_C(0x0200000000000000)    /* LV reshape flag delta disks minus image(s) */
 
 #define LV_REMOVE_AFTER_RESHAPE	UINT64_C(0x0400000000000000)	/* LV needs to be removed after a shrinking reshape */
-#define LV_METADATA_FORMAT	UINT64_C(0x0800000000000000)    /* LV has segments with metadata format */
-/* Next unused flag:		UINT64_C(0x1000000000000000)    */
+/* Next unused flag:		UINT64_C(0x0800000000000000)    */
 
 /* Format features flags */
 #define FMT_SEGMENTS		0x00000001U	/* Arbitrary segment params? */
@@ -276,32 +275,18 @@ enum {
 };
 
 typedef enum {
-	THIN_ZERO_UNSELECTED = 0,
-	THIN_ZERO_NO,
-	THIN_ZERO_YES,
-} thin_zero_t;
-
-typedef enum {
-	THIN_DISCARDS_UNSELECTED = 0,
 	THIN_DISCARDS_IGNORE,
 	THIN_DISCARDS_NO_PASSDOWN,
 	THIN_DISCARDS_PASSDOWN,
 } thin_discards_t;
 
 typedef enum {
-	CACHE_MODE_UNSELECTED = 0,
+	CACHE_MODE_UNDEFINED = 0,
 	CACHE_MODE_WRITETHROUGH,
 	CACHE_MODE_WRITEBACK,
 	CACHE_MODE_PASSTHROUGH,
 } cache_mode_t;
 
-/* ATM used for cache only */
-typedef enum {
-	CACHE_METADATA_FORMAT_UNSELECTED = 0,  /* On input means 'auto' */
-	CACHE_METADATA_FORMAT_1,
-	CACHE_METADATA_FORMAT_2,
-} cache_metadata_format_t;
-
 typedef enum {
 	LOCK_TYPE_INVALID = -1,
 	LOCK_TYPE_NONE = 0,
@@ -497,14 +482,13 @@ struct lv_segment {
 	struct lv_segment_area *meta_areas;	/* For RAID */
 	struct logical_volume *metadata_lv;	/* For thin_pool */
 	uint64_t transaction_id;		/* For thin_pool, thin */
-	thin_zero_t zero_new_blocks;		/* For thin_pool */
+	unsigned zero_new_blocks;		/* For thin_pool */
 	thin_discards_t discards;		/* For thin_pool */
 	struct dm_list thin_messages;		/* For thin_pool */
 	struct logical_volume *external_lv;	/* For thin */
 	struct logical_volume *pool_lv;		/* For thin, cache */
 	uint32_t device_id;			/* For thin, 24bit */
 
-	cache_metadata_format_t cache_metadata_format;/* For cache_pool */
 	cache_mode_t cache_mode;		/* For cache_pool */
 	const char *policy_name;		/* For cache_pool */
 	struct dm_config_node *policy_settings;	/* For cache_pool */
@@ -861,22 +845,26 @@ int pool_is_active(const struct logical_volume *pool_lv);
 int pool_supports_external_origin(const struct lv_segment *pool_seg, const struct logical_volume *external_lv);
 int thin_pool_feature_supported(const struct logical_volume *pool_lv, int feature);
 int recalculate_pool_chunk_size_with_dev_hints(struct logical_volume *pool_lv,
+					       int passed_args,
 					       int chunk_size_calc_policy);
-int validate_cache_chunk_size(struct cmd_context *cmd, uint32_t chunk_size);
-int validate_thin_pool_chunk_size(struct cmd_context *cmd, uint32_t chunk_size);
 int validate_pool_chunk_size(struct cmd_context *cmd, const struct segment_type *segtype, uint32_t chunk_size);
 int update_pool_lv(struct logical_volume *lv, int activate);
-int get_default_allocation_thin_pool_chunk_size(struct cmd_context *cmd, struct profile *profile,
-						uint32_t *chunk_size, int *chunk_size_calc_method);
-int update_thin_pool_params(struct cmd_context *cmd,
-			    struct profile *profile,
-			    uint32_t extent_size,
-			    const struct segment_type *segtype,
-			    unsigned attr,
-			    uint32_t pool_data_extents,
+int update_pool_params(const struct segment_type *segtype,
+		       struct volume_group *vg, unsigned target_attr,
+		       int passed_args, uint32_t pool_data_extents,
+		       uint32_t *pool_metadata_extents,
+		       int *chunk_size_calc_policy, uint32_t *chunk_size,
+		       thin_discards_t *discards, int *zero);
+int update_profilable_pool_params(struct cmd_context *cmd, struct profile *profile,
+				  int passed_args, int *chunk_size_calc_method,
+				  uint32_t *chunk_size, thin_discards_t *discards,
+				  int *zero);
+int update_thin_pool_params(const struct segment_type *segtype,
+			    struct volume_group *vg, unsigned attr,
+			    int passed_args, uint32_t pool_data_extents,
 			    uint32_t *pool_metadata_extents,
 			    int *chunk_size_calc_method, uint32_t *chunk_size,
-			    thin_discards_t *discards, thin_zero_t *zero_new_blocks);
+			    thin_discards_t *discards, int *zero);
 const char *get_pool_discards_name(thin_discards_t discards);
 int set_pool_discards(thin_discards_t *discards, const char *str);
 struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv,
@@ -928,8 +916,8 @@ struct lvcreate_params {
 	int wipe_signatures; /* all */
 	int32_t major; /* all */
 	int32_t minor; /* all */
-	int log_count; /* mirror/RAID */
-	int nosync; /* mirror/RAID */
+	int log_count; /* mirror */
+	int nosync; /* mirror */
 	int pool_metadata_spare; /* pools */
 	int type;   /* type arg is given */
 	int temporary; /* temporary LV */
@@ -939,7 +927,6 @@ struct lvcreate_params {
 	int activation_skip; /* activation skip flags */
 	activation_change_t activate; /* non-snapshot, non-mirror */
 	thin_discards_t discards;     /* thin */
-	thin_zero_t zero_new_blocks;
 #define THIN_CHUNK_SIZE_CALC_METHOD_GENERIC 0x01
 #define THIN_CHUNK_SIZE_CALC_METHOD_PERFORMANCE 0x02
 	int thin_chunk_size_calc_policy;
@@ -953,20 +940,27 @@ struct lvcreate_params {
 
 	const char *lock_args;
 
-	uint32_t stripes; /* striped/RAID */
-	uint32_t stripe_size; /* striped/RAID */
+	/* Keep args given by the user on command line */
+	/* FIXME: create some more universal solution here */
+#define PASS_ARG_CHUNK_SIZE		0x01
+#define PASS_ARG_DISCARDS		0x02
+#define PASS_ARG_POOL_METADATA_SIZE	0x04
+#define PASS_ARG_ZERO			0x08
+	int passed_args;
+
+	uint32_t stripes; /* striped */
+	uint32_t stripe_size; /* striped */
 	uint32_t chunk_size; /* snapshot */
-	uint32_t region_size; /* mirror/RAID */
+	uint32_t region_size; /* mirror */
 
-	unsigned stripes_supplied; /* striped/RAID */
-	unsigned stripe_size_supplied; /* striped/RAID */
+	unsigned stripes_supplied; /* striped */
+	unsigned stripe_size_supplied; /* striped */
 
-	uint32_t mirrors; /* mirror/RAID */
+	uint32_t mirrors; /* mirror */
 
 	uint32_t min_recovery_rate; /* RAID */
 	uint32_t max_recovery_rate; /* RAID */
 
-	cache_metadata_format_t cache_metadata_format; /* cache */
 	cache_mode_t cache_mode; /* cache */
 	const char *policy_name; /* cache */
 	struct dm_config_tree *policy_settings; /* cache */
@@ -1218,14 +1212,12 @@ struct logical_volume *first_replicator_dev(const struct logical_volume *lv);
 int lv_is_raid_with_tracking(const struct logical_volume *lv);
 uint32_t lv_raid_image_count(const struct logical_volume *lv);
 int lv_raid_change_image_count(struct logical_volume *lv,
-			       int yes,
 			       uint32_t new_count,
 			       uint32_t new_region_size,
 			       struct dm_list *allocate_pvs);
-int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name,
+int lv_raid_split(struct logical_volume *lv, const char *split_name,
 		  uint32_t new_count, struct dm_list *splittable_pvs);
 int lv_raid_split_and_track(struct logical_volume *lv,
-			    int yes,
 			    struct dm_list *splittable_pvs);
 int lv_raid_merge(struct logical_volume *lv);
 int lv_raid_convert(struct logical_volume *lv,
@@ -1267,22 +1259,17 @@ const char *display_cache_mode(const struct lv_segment *seg);
 const char *get_cache_mode_name(const struct lv_segment *cache_seg);
 int set_cache_mode(cache_mode_t *mode, const char *cache_mode);
 int cache_set_cache_mode(struct lv_segment *cache_seg, cache_mode_t mode);
-int cache_set_metadata_format(struct lv_segment *cache_seg, cache_metadata_format_t format);
 int cache_set_policy(struct lv_segment *cache_seg, const char *name,
 		     const struct dm_config_tree *settings);
 int cache_set_params(struct lv_segment *seg,
-		     uint32_t chunk_size,
-		     cache_metadata_format_t format,
 		     cache_mode_t mode,
 		     const char *policy_name,
-		     const struct dm_config_tree *policy_settings);
+		     const struct dm_config_tree *policy_settings,
+		     uint32_t chunk_size);
 void cache_check_for_warns(const struct lv_segment *seg);
-int update_cache_pool_params(struct cmd_context *cmd,
-			     struct profile *profile,
-			     uint32_t extent_size,
-			     const struct segment_type *segtype,
-			     unsigned attr,
-			     uint32_t pool_data_extents,
+int update_cache_pool_params(const struct segment_type *segtype,
+			     struct volume_group *vg, unsigned attr,
+			     int passed_args, uint32_t pool_data_extents,
 			     uint32_t *pool_metadata_extents,
 			     int *chunk_size_calc_method, uint32_t *chunk_size);
 int validate_lv_cache_chunk_size(struct logical_volume *pool_lv, uint32_t chunk_size);

lib/metadata/pool_manip.c

@@ -394,13 +394,44 @@ int validate_pool_chunk_size(struct cmd_context *cmd,
 			     const struct segment_type *segtype,
 			     uint32_t chunk_size)
 {
-	if (segtype_is_cache(segtype) || segtype_is_cache_pool(segtype))
-		return validate_cache_chunk_size(cmd, chunk_size);
+	uint32_t min_size, max_size;
+	const char *name;
+	int r = 1;
 
-	return validate_thin_pool_chunk_size(cmd, chunk_size);
+	if (segtype_is_cache(segtype) || segtype_is_cache_pool(segtype)) {
+		min_size = DM_CACHE_MIN_DATA_BLOCK_SIZE;
+		max_size = DM_CACHE_MAX_DATA_BLOCK_SIZE;
+		name = "Cache";
+	} else if (segtype_is_thin(segtype)) {
+		min_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
+		max_size = DM_THIN_MAX_DATA_BLOCK_SIZE;
+		name = "Thin";
+	} else {
+		log_error(INTERNAL_ERROR "Cannot validate chunk size of "
+			  "%s segtype.", segtype->name);
+		return 0;
+	}
+
+	if ((chunk_size < min_size) || (chunk_size > max_size)) {
+		log_error("%s pool chunk size %s is not in the range %s to %s.",
+			  name, display_size(cmd, chunk_size),
+			  display_size(cmd, min_size),
+			  display_size(cmd, max_size));
+		r = 0;
+	}
+
+	if (chunk_size & (min_size - 1)) {
+		log_error("%s pool chunk size %s must be a multiple of %s.",
+			  name, display_size(cmd, chunk_size),
+			  display_size(cmd, min_size));
+		r = 0;
+	}
+
+	return r;
 }
 
 int recalculate_pool_chunk_size_with_dev_hints(struct logical_volume *pool_lv,
+					       int passed_args,
 					       int chunk_size_calc_policy)
 {
 	struct logical_volume *pool_data_lv;
@@ -408,17 +439,24 @@ int recalculate_pool_chunk_size_with_dev_hints(struct logical_volume *pool_lv,
 	struct physical_volume *pv;
 	struct cmd_context *cmd = pool_lv->vg->cmd;
 	unsigned long previous_hint = 0, hint = 0;
+	uint32_t default_chunk_size;
 	uint32_t min_chunk_size, max_chunk_size;
 
-	if (!chunk_size_calc_policy)
-		return 1; /* Chunk size was specified by user */
+	if (passed_args & PASS_ARG_CHUNK_SIZE)
+		return 1;
 
 	if (lv_is_thin_pool(pool_lv)) {
+		if (find_config_tree_int(cmd, allocation_thin_pool_chunk_size_CFG, NULL))
+			return 1;
 		min_chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
 		max_chunk_size = DM_THIN_MAX_DATA_BLOCK_SIZE;
+		default_chunk_size = get_default_allocation_thin_pool_chunk_size_CFG(cmd, NULL);
 	} else if (lv_is_cache_pool(pool_lv)) {
+		if (find_config_tree_int(cmd, allocation_cache_pool_chunk_size_CFG, NULL))
+			return 1;
 		min_chunk_size = DM_CACHE_MIN_DATA_BLOCK_SIZE;
 		max_chunk_size = DM_CACHE_MAX_DATA_BLOCK_SIZE;
+		default_chunk_size = get_default_allocation_cache_pool_chunk_size_CFG(cmd, NULL);
 	} else {
 		log_error(INTERNAL_ERROR "%s is not a pool logical volume.", display_lvname(pool_lv));
 		return 0;
@@ -456,14 +494,40 @@ int recalculate_pool_chunk_size_with_dev_hints(struct logical_volume *pool_lv,
 				display_size(cmd, hint), display_lvname(pool_lv),
 				display_size(cmd, min_chunk_size),
 				display_size(cmd, max_chunk_size));
-	else if (hint > first_seg(pool_lv)->chunk_size) {
-		log_debug_alloc("Updating chunk size %s for pool %s to %s.",
-				display_size(cmd, first_seg(pool_lv)->chunk_size),
-				display_lvname(pool_lv),
-				display_size(cmd, hint));
-		first_seg(pool_lv)->chunk_size = hint;
+	else
+		first_seg(pool_lv)->chunk_size =
+			(hint >= default_chunk_size) ? hint : default_chunk_size;
+
+	return 1;
+}
+
+int update_pool_params(const struct segment_type *segtype,
+		       struct volume_group *vg, unsigned target_attr,
+		       int passed_args, uint32_t pool_data_extents,
+		       uint32_t *pool_metadata_extents,
+		       int *chunk_size_calc_policy, uint32_t *chunk_size,
+		       thin_discards_t *discards, int *zero)
+{
+	if (segtype_is_cache_pool(segtype) || segtype_is_cache(segtype)) {
+		if (!update_cache_pool_params(segtype, vg, target_attr, passed_args,
+					      pool_data_extents, pool_metadata_extents,
+					      chunk_size_calc_policy, chunk_size))
+			return_0;
+	} else if (!update_thin_pool_params(segtype, vg, target_attr, passed_args,
+					    pool_data_extents, pool_metadata_extents,
+					    chunk_size_calc_policy, chunk_size,
+					    discards, zero)) /* thin-pool */
+			return_0;
+
+	if ((uint64_t) *chunk_size > (uint64_t) pool_data_extents * vg->extent_size) {
+		log_error("Size of %s data volume cannot be smaller than chunk size %s.",
+			  segtype->name, display_size(vg->cmd, *chunk_size));
+		return 0;
 	}
 
+	log_verbose("Preferred pool metadata size %s.",
+		    display_size(vg->cmd, (uint64_t)*pool_metadata_extents * vg->extent_size));
+
 	return 1;
 }
 

lib/metadata/raid_manip.c

@@ -494,7 +494,7 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
 	int flags_reset = 0, r = 0;
 	va_list ap;
 	fn_on_lv_t fn_pre_on_lv = NULL, fn_post_on_lv;
-	void *fn_pre_data, *fn_post_data = NULL;
+	void *fn_pre_data, *fn_post_data;
 	struct dm_list *removal_lvs;
 
 	va_start(ap, origin_only);
@@ -1023,7 +1023,6 @@ static int _alloc_image_components(struct logical_volume *lv,
 	struct alloc_handle *ah = NULL;
 	struct dm_list *parallel_areas;
 	struct lv_list *lvl_array;
-	const char *raid_segtype;
 
 	if (!(lvl_array = dm_pool_alloc(lv->vg->vgmem,
 					sizeof(*lvl_array) * count * 2)))
@@ -1037,8 +1036,9 @@ static int _alloc_image_components(struct logical_volume *lv,
 	else
 		region_size = seg->region_size;
 
-	raid_segtype = seg_is_raid(seg) ? SEG_TYPE_NAME_RAID0_META : SEG_TYPE_NAME_RAID1;
-	if (!(segtype = get_segtype_from_string(lv->vg->cmd, raid_segtype)))
+	if (seg_is_raid(seg))
+		segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_RAID0_META);
+	else if (!(segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_RAID1)))
 		return_0;
 
 	/*
@@ -1491,7 +1491,7 @@ static int _lv_alloc_reshape_space(struct logical_volume *lv,
 		uint32_t data_rimages = _data_rimages_count(seg, seg->area_count);
 		uint32_t reshape_len = out_of_place_les_per_disk * data_rimages;
 		uint32_t prev_rimage_len = _lv_total_rimage_len(lv);
-		uint64_t lv_size_cur = lv->size;
+		uint64_t lv_size = lv->size;
 
 		if (!lv_extend(lv, seg->segtype, data_rimages,
 			       seg->stripe_size, 1, /* seg_is_any_raid10(seg) ? seg->data_copies : 1, */ seg->region_size,
@@ -1502,7 +1502,7 @@ static int _lv_alloc_reshape_space(struct logical_volume *lv,
 			return 0;
 		}
 
-		lv->size = lv_size_cur;
+		lv->size = lv_size;
 		/* pay attention to lv_extend maybe having allocated more because of layout specific rounding */
 		if (!_lv_set_reshape_len(lv, _lv_total_rimage_len(lv) - prev_rimage_len))
 			return 0;
@@ -1690,7 +1690,7 @@ static int _reshape_adjust_to_size(struct logical_volume *lv,
 
 	/* Externally visible LV size w/o reshape space */
 	lv->le_count = seg->len = new_le_count;
-	lv->size = (uint64_t) (lv->le_count - new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size;
+	lv->size = (lv->le_count - new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size;
 	/* seg->area_len does not change */
 
 	if (old_image_count < new_image_count) {
@@ -1712,7 +1712,7 @@ static int _reshape_adjust_to_size(struct logical_volume *lv,
  * Reshape: add immages to existing raid lv
  *
  */
-static int _lv_raid_change_image_count(struct logical_volume *lv, int yes, uint32_t new_count,
+static int _lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
 				       struct dm_list *allocate_pvs, struct dm_list *removal_lvs,
 				       int commit, int use_existing_area_len);
 static int _raid_reshape_add_images(struct logical_volume *lv,
@@ -1773,7 +1773,7 @@ static int _raid_reshape_add_images(struct logical_volume *lv,
 	log_debug_metadata("Adding %u data and metadata image LV pair%s to %s.",
 			   new_image_count - old_image_count, new_image_count - old_image_count > 1 ? "s" : "",
 			   display_lvname(lv));
-	if (!_lv_raid_change_image_count(lv, 1, new_image_count, allocate_pvs, NULL, 0, 0))
+	if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 0))
 		return 0;
 
 	/* Reshape adding image component pairs -> change sizes/counters accordingly */
@@ -1861,7 +1861,7 @@ static int _raid_reshape_remove_images(struct logical_volume *lv,
 
 		reduced_le_count -= seg->reshape_len * _data_rimages_count(seg, new_image_count);
 		current_le_count = lv->le_count - seg->reshape_len * _data_rimages_count(seg, old_image_count);
-		extend_le_count = (uint32_t)((uint64_t) current_le_count * current_le_count / reduced_le_count);
+		extend_le_count = current_le_count * current_le_count / reduced_le_count;
 		log_warn("WARNING: Removing stripes from active%s logical "
 			 "volume %s will shrink it from %s to %s!",
 			 info.open_count ? " and open" : "", display_lvname(lv),
@@ -1949,7 +1949,7 @@ static int _raid_reshape_remove_images(struct logical_volume *lv,
 		log_debug_metadata("Removing %u data and metadata image LV pair%s from %s.",
 				   old_image_count - new_image_count, old_image_count - new_image_count > 1 ? "s" : "",
 				   display_lvname(lv));
-		if (!_lv_raid_change_image_count(lv, 1, new_image_count, allocate_pvs, removal_lvs, 0, 0))
+		if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, removal_lvs, 0, 0))
 			return 0;
 
 		seg->area_count = new_image_count;
@@ -2087,7 +2087,7 @@ static int _activate_sub_lvs_excl_local(struct logical_volume *lv, uint32_t star
 	return 1;
 }
 
-/* Helper: function to activate any LVs on @lv_list */
+/* Helper: function to activate any sub LVs of @lv exclusively local starting with area indexed by @start_idx */
 static int _activate_sub_lvs_excl_local_list(struct logical_volume *lv, struct dm_list *lv_list)
 {
 	int r = 1;
@@ -2959,7 +2959,7 @@ static int _raid_extract_images(struct logical_volume *lv,
 	return 1;
 }
 
-static int _raid_remove_images(struct logical_volume *lv, int yes,
+static int _raid_remove_images(struct logical_volume *lv,
 			       uint32_t new_count, struct dm_list *allocate_pvs,
 			       struct dm_list *removal_lvs, int commit)
 {
@@ -2982,12 +2982,6 @@ static int _raid_remove_images(struct logical_volume *lv, int yes,
 
 	/* Convert to linear? */
 	if (new_count == 1) {
-		if (!yes && yes_no_prompt("Are you sure you want to convert %s LV %s to type %s loosing all resilience? [y/n]: ",
-					  lvseg_name(first_seg(lv)), display_lvname(lv), SEG_TYPE_NAME_LINEAR) == 'n') {
-			log_error("Logical volume %s NOT converted to \"%s\".",
-				  display_lvname(lv), SEG_TYPE_NAME_LINEAR);
-			return 0;
-		}
 		if (!_raid_remove_top_layer(lv, removal_lvs)) {
 			log_error("Failed to remove RAID layer "
 				  "after linear conversion.");
@@ -3030,7 +3024,7 @@ static int _raid_remove_images(struct logical_volume *lv, int yes,
  * This function adds or removes _both_ portions of the image and commits
  * the results.
  */
-static int _lv_raid_change_image_count(struct logical_volume *lv, int yes, uint32_t new_count,
+static int _lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
 				       struct dm_list *allocate_pvs, struct dm_list *removal_lvs,
 				       int commit, int use_existing_area_len)
 {
@@ -3053,12 +3047,12 @@ static int _lv_raid_change_image_count(struct logical_volume *lv, int yes, uint3
 	}
 
 	if (old_count > new_count)
-		return _raid_remove_images(lv, yes, new_count, allocate_pvs, removal_lvs, commit);
+		return _raid_remove_images(lv, new_count, allocate_pvs, removal_lvs, commit);
 
 	return _raid_add_images(lv, new_count, allocate_pvs, commit, use_existing_area_len);
 }
 
-int lv_raid_change_image_count(struct logical_volume *lv, int yes, uint32_t new_count,
+int lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
 			       const uint32_t new_region_size, struct dm_list *allocate_pvs)
 {
 	struct lv_segment *seg = first_seg(lv);
@@ -3068,10 +3062,10 @@ int lv_raid_change_image_count(struct logical_volume *lv, int yes, uint32_t new_
 		_check_and_adjust_region_size(lv);
 	}
 
-	return _lv_raid_change_image_count(lv, yes, new_count, allocate_pvs, NULL, 1, 0);
+	return _lv_raid_change_image_count(lv, new_count, allocate_pvs, NULL, 1, 0);
 }
 
-int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name,
+int lv_raid_split(struct logical_volume *lv, const char *split_name,
 		  uint32_t new_count, struct dm_list *splittable_pvs)
 {
 	struct lv_list *lvl;
@@ -3116,14 +3110,6 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name,
 		return 0;
 	}
 
-	/* Split on a 2-legged raid1 LV causes loosing all resilience */
-	if (new_count == 1 &&
-	    !yes && yes_no_prompt("Are you sure you want to split %s LV %s loosing all resilience? [y/n]: ",
-				  lvseg_name(first_seg(lv)), display_lvname(lv)) == 'n') {
-		log_error("Logical volume %s NOT split.", display_lvname(lv));
-		return 0;
-	}
-
 	/*
 	 * We only allow a split while there is tracking if it is to
 	 * complete the split of the tracking sub-LV
@@ -3236,7 +3222,6 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name,
  * Returns: 1 on success, 0 on error
  */
 int lv_raid_split_and_track(struct logical_volume *lv,
-			    int yes,
 			    struct dm_list *splittable_pvs)
 {
 	int s;
@@ -3259,14 +3244,6 @@ int lv_raid_split_and_track(struct logical_volume *lv,
 		return 0;
 	}
 
-	/* Split and track changes on a 2-legged raid1 LV causes loosing resilience for newly written data. */
-	if (seg->area_count == 2 &&
-	    !yes && yes_no_prompt("Are you sure you want to split and track %s LV %s loosing resilience for any newly written data? [y/n]: ",
-				  lvseg_name(seg), display_lvname(lv)) == 'n') {
-		log_error("Logical volume %s NOT split.", display_lvname(lv));
-		return 0;
-	}
-
 	for (s = seg->area_count - 1; s >= 0; --s) {
 		if (!lv_is_on_pvs(seg_lv(seg, s), splittable_pvs))
 			continue;
@@ -3292,10 +3269,6 @@ int lv_raid_split_and_track(struct logical_volume *lv,
 	if (!activate_lv_excl_local(lv->vg->cmd, seg_lv(seg, s)))
 		return_0;
 
-	if (seg->area_count == 2)
-		log_warn("Any newly written data will be non-resilient on LV %s during the split!",
-			 display_lvname(lv));
-
 	log_print_unless_silent("Use 'lvconvert --merge %s' to merge back into %s.",
 				display_lvname(seg_lv(seg, s)),
 				display_lvname(lv));
@@ -3913,7 +3886,7 @@ static int _convert_raid1_to_mirror(struct logical_volume *lv,
 	if (new_image_count != seg->area_count) {
 		log_debug_metadata("Changing image count to %u on %s.",
 				   new_image_count, display_lvname(lv));
-		if (!_lv_raid_change_image_count(lv, 1, new_image_count, allocate_pvs, removal_lvs, 0, 0))
+		if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, removal_lvs, 0, 0))
 			return_0;
 	}
 
@@ -3986,10 +3959,6 @@ static int _striped_to_raid0_move_segs_to_raid0_lvs(struct logical_volume *lv,
 		dlv->le_count = le;
 		dlv->size = (uint64_t) le * lv->vg->extent_size;
 		s++;
-
-		/* Try merging raid0 rimage sub LV segments */
-		if (!lv_merge_segments(dlv))
-			return_0;
 	}
 
 	/* Remove the empty segments from the striped LV */
@@ -4344,12 +4313,12 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
 
 	/* raid1 -> raid5* with 2 legs */
 	{ .current_types  = SEG_RAID1,
-	  .possible_types = SEG_RAID4|SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+	  .possible_types = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
 	  .current_areas = 2U,
 	  .options = ALLOW_REGION_SIZE|ALLOW_STRIPE_SIZE },
 
 	/* raid5* -> raid1 with 2 legs */
-	{ .current_types  = SEG_RAID4|SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+	{ .current_types  = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
 	  .possible_types = SEG_RAID1,
 	  .current_areas = 2U,
 	  .options = ALLOW_REGION_SIZE },
@@ -4917,7 +4886,7 @@ static int _takeover_downconvert_wrapper(TAKEOVER_FN_ARGS)
 		log_debug_metadata("Removing %" PRIu32 " component LV pair(s) to %s.",
 				   lv_raid_image_count(lv) - new_image_count,
 				   display_lvname(lv));
-		if (!_lv_raid_change_image_count(lv, 1, new_image_count, allocate_pvs, &removal_lvs, 0, 0))
+		if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, &removal_lvs, 0, 0))
 			return 0;
 
 		seg->area_count = new_image_count;
@@ -5099,7 +5068,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
 				  lvseg_name(seg), display_lvname(lv), new_segtype->name);
 			return 0;
 		}
-		if (!segtype_is_raid4(new_segtype) && !segtype_is_any_raid5(new_segtype)) {
+		if (!segtype_is_any_raid5(new_segtype)) {
 			log_error("Can't convert %s LV %s to %s.",
 				  lvseg_name(seg), display_lvname(lv), new_segtype->name);
 			return 0;
@@ -5126,7 +5095,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
 	if (!_lv_free_reshape_space(lv))
 		return_0;
 
-	/* This helper can be used to convert from striped/raid0* -> raid10_near too */
+	/* This helper can be used to convert from striped/raid0* -> raid10 too */
 	if (seg_is_striped_target(seg)) {
 		log_debug_metadata("Converting LV %s from %s to %s.",
 				   display_lvname(lv), SEG_TYPE_NAME_STRIPED, SEG_TYPE_NAME_RAID0);
@@ -5166,7 +5135,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
 		log_debug_metadata("Adding %" PRIu32 " component LV pair(s) to %s.",
 				   new_image_count - lv_raid_image_count(lv),
 				   display_lvname(lv));
-		if (!_lv_raid_change_image_count(lv, 1, new_image_count, allocate_pvs, NULL, 0, 1))
+		if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 1))
 			return 0;
 
 		seg = first_seg(lv);
@@ -5176,7 +5145,6 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
 	seg->data_copies = new_data_copies;
 
 	if (segtype_is_raid4(new_segtype) &&
-	    seg->area_count != 2 &&
 	    (!_shift_parity_dev(seg) ||
 	     !_rename_area_lvs(lv, "_"))) {
 		log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
@@ -5184,7 +5152,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
 	} else if (segtype_is_raid10_near(new_segtype)) {
 		uint32_t s;
 
-		log_debug_metadata("Reordering areas for raid0 -> raid10_near takeover.");
+		log_debug_metadata("Reordering areas for raid0 -> raid10 takeover.");
 		if (!_reorder_raid10_near_seg_areas(seg, reorder_to_raid10_near))
 			return 0;
 		/* Set rebuild flags accordingly */
@@ -5810,7 +5778,7 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, con
 		return_0;
 
 	/* CLI validation provides the check but be caucious... */
-	if (!lv_is_raid(lv) || !seg || seg_is_any_raid0(seg))
+	if (seg_is_any_raid0(seg))
 		return_0;
 
 	if (region_size == seg->region_size) {
@@ -5910,33 +5878,10 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from,
  * Convert lv from one RAID type (or striped/mirror segtype) to new_segtype,
  * or add/remove LVs to/from a RAID LV.
  *
- * Non RAID (i.e. dm-raid target relative) changes e.g. mirror/striped
- * functions are also called from here.  This supports e.g. conversions
- * from existing striped LVs to raid4/5/6/10 and vice versa.
+ * Non dm-raid changes e.g. mirror/striped functions are also called from here.
  *
  * Takeover is defined as a switch from one raid level to another, potentially
  * involving the addition of one or more image component pairs and rebuild.
- *
- * Complementing takeover, reshaping is defined as changing properties of
- * a RaidLV keeping the RAID level.  These properties are the RAID layout
- * algorithm (e.g. raid5_ls vs. raid5_ra), the stripe size (e.g. 64K vs. 128K)
- * and the number of images.
- *
- * RAID level specific MD kernel constraints apply to reshaping:
- *
- * raid4/5/6 can vary all aforementioned properties within their respective
- * redundancy * constraints (raid4/5 minimum of 3 images and raid6 minimum
- * of 4 images;  the latter is enforced to be 5 by lvm2.
- *
- * raid10 doesn't support the removal of images at all.  It can only add them.
- *
- * For all levels raid4/5/6/10, the stripe size
- * may not be larger than the region size.
- *
- * The maximum supported image count the MD kernel supports is 253;
- * lvm2 may enforce smaller numbers via
- * DEFAULT_RAID_MAX_IMAGES and DEFAULT_RAID1_MAX_IMAGES.
- *
  */
 int lv_raid_convert(struct logical_volume *lv,
 		    const struct segment_type *new_segtype,
@@ -6330,7 +6275,7 @@ try_again:
 	 */
 	if (!_raid_extract_images(lv, force,
 				  raid_seg->area_count - match_count,
-				  (partial_segment_removed || !dm_list_size(remove_pvs)) ?
+				  partial_segment_removed ?
 				  &lv->vg->pvs : remove_pvs, 0,
 				  &old_lvs, &old_lvs)) {
 		log_error("Failed to remove the specified images from %s.",

lib/metadata/segtype.h

@@ -315,7 +315,6 @@ int init_cache_segtypes(struct cmd_context *cmd, struct segtype_library *seglib)
 
 #define CACHE_FEATURE_POLICY_MQ			(1U << 0)
 #define CACHE_FEATURE_POLICY_SMQ		(1U << 1)
-#define CACHE_FEATURE_METADATA2			(1U << 2)
 
 #define SNAPSHOT_FEATURE_FIXED_LEAK		(1U << 0) /* version 1.12 */
 

lib/metadata/thin_manip.c

@@ -547,31 +547,19 @@ int update_pool_lv(struct logical_volume *lv, int activate)
 	return ret;
 }
 
-static uint64_t _estimate_size(uint32_t data_extents, uint32_t extent_size, uint64_t size)
+/* Estimate thin pool chunk size from data and metadata size (in sector units) */
+static size_t _estimate_chunk_size(uint64_t data_size, uint64_t metadata_size, int attr)
 {
 	/*
 	 * nr_pool_blocks = data_size / metadata_size
 	 * chunk_size = nr_pool_blocks * 64b / sector_size
 	 */
-	return (uint64_t) data_extents * extent_size / (size * (SECTOR_SIZE / UINT64_C(64)));
-}
-
-/* Estimate thin pool metadata size from data size and chunks size (in sector units) */
-static uint64_t _estimate_metadata_size(uint32_t data_extents, uint32_t extent_size, uint32_t chunk_size)
-{
-	return _estimate_size(data_extents, extent_size, chunk_size);
-}
-
-/* Estimate thin pool chunk size from data and metadata size (in sector units) */
-static uint32_t _estimate_chunk_size(uint32_t data_extents, uint32_t extent_size,
-				     uint64_t metadata_size, int attr)
-{
-	uint32_t chunk_size = _estimate_size(data_extents, extent_size, metadata_size);
+	size_t chunk_size = data_size / (metadata_size * (SECTOR_SIZE / 64));
 
 	if (attr & THIN_FEATURE_BLOCK_SIZE) {
 		/* Round up to 64KB */
 		chunk_size += DM_THIN_MIN_DATA_BLOCK_SIZE - 1;
-		chunk_size &= ~(uint32_t)(DM_THIN_MIN_DATA_BLOCK_SIZE - 1);
+		chunk_size &= ~(size_t)(DM_THIN_MIN_DATA_BLOCK_SIZE - 1);
 	} else {
 		/* Round up to nearest power of 2 */
 		chunk_size--;
@@ -583,64 +571,47 @@ static uint32_t _estimate_chunk_size(uint32_t data_extents, uint32_t extent_size
 		chunk_size++;
 	}
 
-	if (chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE)
-		chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
-	else if (chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)
-		chunk_size = DM_THIN_MAX_DATA_BLOCK_SIZE;
-
 	return chunk_size;
 }
 
-int get_default_allocation_thin_pool_chunk_size(struct cmd_context *cmd, struct profile *profile,
-						uint32_t *chunk_size, int *chunk_size_calc_method)
-{
-	const char *str;
-
-	if (!(str = find_config_tree_str(cmd, allocation_thin_pool_chunk_size_policy_CFG, profile))) {
-		log_error(INTERNAL_ERROR "Cannot find configuration.");
-		return 0;
-	}
-
-	if (!strcasecmp(str, "generic")) {
-		*chunk_size = DEFAULT_THIN_POOL_CHUNK_SIZE * 2;
-		*chunk_size_calc_method = THIN_CHUNK_SIZE_CALC_METHOD_GENERIC;
-	} else if (!strcasecmp(str, "performance")) {
-		*chunk_size = DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2;
-		*chunk_size_calc_method = THIN_CHUNK_SIZE_CALC_METHOD_PERFORMANCE;
-	} else {
-		log_error("Thin pool chunk size calculation policy \"%s\" is unrecognised.", str);
-		return 0;
-	}
-
-	return 1;
-}
-
-int update_thin_pool_params(struct cmd_context *cmd,
-			    struct profile *profile,
-			    uint32_t extent_size,
-			    const struct segment_type *segtype,
-			    unsigned attr,
+int update_thin_pool_params(const struct segment_type *segtype,
+			    struct volume_group *vg,
+			    unsigned attr, int passed_args,
 			    uint32_t pool_data_extents,
 			    uint32_t *pool_metadata_extents,
 			    int *chunk_size_calc_method, uint32_t *chunk_size,
-			    thin_discards_t *discards, thin_zero_t *zero_new_blocks)
+			    thin_discards_t *discards, int *zero)
 {
+	struct cmd_context *cmd = vg->cmd;
+	struct profile *profile = vg->profile;
+	uint32_t extent_size = vg->extent_size;
 	uint64_t pool_metadata_size = (uint64_t) *pool_metadata_extents * extent_size;
-	uint32_t estimate_chunk_size;
+	size_t estimate_chunk_size;
 	const char *str;
 
-	if (!*chunk_size &&
-	    find_config_tree_node(cmd, allocation_thin_pool_chunk_size_CFG, profile))
-		*chunk_size = find_config_tree_int(cmd, allocation_thin_pool_chunk_size_CFG, profile) * 2;
-
-	if (*chunk_size && !(attr & THIN_FEATURE_BLOCK_SIZE) &&
-	    !is_power_of_2(*chunk_size)) {
-		log_error("Chunk size must be a power of 2 for this thin target version.");
-		return 0;
+	if (!(passed_args & PASS_ARG_CHUNK_SIZE)) {
+		if (!(*chunk_size = find_config_tree_int(cmd, allocation_thin_pool_chunk_size_CFG, profile) * 2)) {
+			if (!(str = find_config_tree_str(cmd, allocation_thin_pool_chunk_size_policy_CFG, profile))) {
+				log_error(INTERNAL_ERROR "Could not find configuration.");
+				return 0;
+			}
+			if (!strcasecmp(str, "generic"))
+				*chunk_size_calc_method = THIN_CHUNK_SIZE_CALC_METHOD_GENERIC;
+			else if (!strcasecmp(str, "performance"))
+				*chunk_size_calc_method = THIN_CHUNK_SIZE_CALC_METHOD_PERFORMANCE;
+			else {
+				log_error("Thin pool chunk size calculation policy \"%s\" is unrecognised.", str);
+				return 0;
+			}
+			if (!(*chunk_size = get_default_allocation_thin_pool_chunk_size_CFG(cmd, profile)))
+				return_0;
+		}
 	}
 
-	if ((*discards == THIN_DISCARDS_UNSELECTED) &&
-	    find_config_tree_node(cmd, allocation_thin_pool_discards_CFG, profile)) {
+	if (!validate_pool_chunk_size(cmd, segtype, *chunk_size))
+		return_0;
+
+	if (!(passed_args & PASS_ARG_DISCARDS)) {
 		if (!(str = find_config_tree_str(cmd, allocation_thin_pool_discards_CFG, profile))) {
 			log_error(INTERNAL_ERROR "Could not find configuration.");
 			return 0;
@@ -649,21 +620,21 @@ int update_thin_pool_params(struct cmd_context *cmd,
 			return_0;
 	}
 
-	if ((*zero_new_blocks == THIN_ZERO_UNSELECTED) &&
-	    find_config_tree_node(cmd, allocation_thin_pool_zero_CFG, profile))
-		*zero_new_blocks = find_config_tree_bool(cmd, allocation_thin_pool_zero_CFG, profile)
-			? THIN_ZERO_YES : THIN_ZERO_NO;
+	if (!(passed_args & PASS_ARG_ZERO))
+		*zero = find_config_tree_bool(cmd, allocation_thin_pool_zero_CFG, profile);
+
+	if (!(attr & THIN_FEATURE_BLOCK_SIZE) &&
+	    !is_power_of_2(*chunk_size)) {
+		log_error("Chunk size must be a power of 2 for this thin target version.");
+		return 0;
+	}
 
 	if (!pool_metadata_size) {
-		if (!*chunk_size) {
-			if (!get_default_allocation_thin_pool_chunk_size(cmd, profile,
-									 chunk_size,
-									 chunk_size_calc_method))
-				return_0;
-
-			pool_metadata_size = _estimate_metadata_size(pool_data_extents, extent_size, *chunk_size);
-
-			/* Check if we should eventually use bigger chunk size */
+		/* Defaults to nr_pool_blocks * 64b converted to size in sectors */
+		pool_metadata_size = (uint64_t) pool_data_extents * extent_size /
+			(*chunk_size * (SECTOR_SIZE / UINT64_C(64)));
+		/* Check if we could eventually use bigger chunk size */
+		if (!(passed_args & PASS_ARG_CHUNK_SIZE)) {
 			while ((pool_metadata_size >
 				(DEFAULT_THIN_POOL_OPTIMAL_SIZE / SECTOR_SIZE)) &&
 			       (*chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE)) {
@@ -672,28 +643,29 @@ int update_thin_pool_params(struct cmd_context *cmd,
 			}
 			log_verbose("Setting chunk size to %s.",
 				    display_size(cmd, *chunk_size));
-		} else {
-			pool_metadata_size = _estimate_metadata_size(pool_data_extents, extent_size, *chunk_size);
-
-			if (pool_metadata_size > (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2)) {
-				/* Suggest bigger chunk size */
-				estimate_chunk_size =
-					_estimate_chunk_size(pool_data_extents, extent_size,
-							     (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2), attr);
-				log_warn("WARNING: Chunk size is too small for pool, suggested minimum is %s.",
-					 display_size(cmd, estimate_chunk_size));
-			}
+		} else if (pool_metadata_size > (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2)) {
+			/* Suggest bigger chunk size */
+			estimate_chunk_size =
+				_estimate_chunk_size((uint64_t) pool_data_extents * extent_size,
+						     (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2), attr);
+			log_warn("WARNING: Chunk size is too small for pool, suggested minimum is %s.",
+				 display_size(cmd, estimate_chunk_size));
 		}
 
 		/* Round up to extent size silently */
 		if (pool_metadata_size % extent_size)
 			pool_metadata_size += extent_size - pool_metadata_size % extent_size;
 	} else {
-		estimate_chunk_size = _estimate_chunk_size(pool_data_extents, extent_size,
-							   pool_metadata_size, attr);
+		estimate_chunk_size =
+			_estimate_chunk_size((uint64_t) pool_data_extents * extent_size,
+					     pool_metadata_size, attr);
+		if (estimate_chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE)
+			estimate_chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
+		else if (estimate_chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)
+			estimate_chunk_size = DM_THIN_MAX_DATA_BLOCK_SIZE;
 
 		/* Check to eventually use bigger chunk size */
-		if (!*chunk_size) {
+		if (!(passed_args & PASS_ARG_CHUNK_SIZE)) {
 			*chunk_size = estimate_chunk_size;
 			log_verbose("Setting chunk size %s.", display_size(cmd, *chunk_size));
 		} else if (*chunk_size < estimate_chunk_size) {
@@ -703,41 +675,22 @@ int update_thin_pool_params(struct cmd_context *cmd,
 		}
 	}
 
-	if (!validate_thin_pool_chunk_size(cmd, *chunk_size))
-		return_0;
-
 	if (pool_metadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) {
 		pool_metadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE;
-		if (*pool_metadata_extents)
+		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Maximum supported pool metadata size is %s.",
 				 display_size(cmd, pool_metadata_size));
 	} else if (pool_metadata_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) {
 		pool_metadata_size = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE;
-		if (*pool_metadata_extents)
+		if (passed_args & PASS_ARG_POOL_METADATA_SIZE)
 			log_warn("WARNING: Minimum supported pool metadata size is %s.",
 				 display_size(cmd, pool_metadata_size));
 	}
 
 	if (!(*pool_metadata_extents =
-	      extents_from_size(cmd, pool_metadata_size, extent_size)))
+	      extents_from_size(vg->cmd, pool_metadata_size, extent_size)))
 		return_0;
 
-	if ((uint64_t) *chunk_size > (uint64_t) pool_data_extents * extent_size) {
-		log_error("Size of %s data volume cannot be smaller than chunk size %s.",
-			  segtype->name, display_size(cmd, *chunk_size));
-		return 0;
-	}
-
-	if ((*discards == THIN_DISCARDS_UNSELECTED) &&
-	    !set_pool_discards(discards, DEFAULT_THIN_POOL_DISCARDS))
-		return_0;
-
-	if (*zero_new_blocks == THIN_ZERO_UNSELECTED)
-		*zero_new_blocks = (DEFAULT_THIN_POOL_ZERO) ? THIN_ZERO_YES : THIN_ZERO_NO;
-
-	log_verbose("Preferred pool metadata size %s.",
-		    display_size(cmd, (uint64_t)*pool_metadata_extents * extent_size));
-
 	return 1;
 }
 
@@ -766,10 +719,11 @@ const char *get_pool_discards_name(thin_discards_t discards)
 		return "nopassdown";
 	case THIN_DISCARDS_IGNORE:
 		return "ignore";
-	default:
-		log_error(INTERNAL_ERROR "Unknown discards type encountered.");
-		return "unknown";
 	}
+
+	log_error(INTERNAL_ERROR "Unknown discards type encountered.");
+
+	return "unknown";
 }
 
 int lv_is_thin_origin(const struct logical_volume *lv, unsigned int *snap_count)
@@ -780,16 +734,20 @@ int lv_is_thin_origin(const struct logical_volume *lv, unsigned int *snap_count)
 	if (snap_count)
 		*snap_count = 0;
 
-	if (lv_is_thin_volume(lv))
-		dm_list_iterate_items(segl, &lv->segs_using_this_lv)
-			if (segl->seg->origin == lv) {
-				r = 1;
-
-				if (!snap_count)
-					break;/* not interested in number of snapshots */
+	if (!lv_is_thin_volume(lv) ||
+	    dm_list_empty(&lv->segs_using_this_lv))
+		return 0;
 
+	dm_list_iterate_items(segl, &lv->segs_using_this_lv) {
+		if (segl->seg->origin == lv) {
+			r = 1;
+			if (snap_count)
 				(*snap_count)++;
-			}
+			else
+				/* not interested in number of snapshots */
+				break;
+		}
+	}
 
 	return r;
 }
@@ -858,27 +816,3 @@ int check_new_thin_pool(const struct logical_volume *pool_lv)
 
 	return 1;
 }
-
-int validate_thin_pool_chunk_size(struct cmd_context *cmd, uint32_t chunk_size)
-{
-	const uint32_t min_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
-	const uint32_t max_size = DM_THIN_MAX_DATA_BLOCK_SIZE;
-	int r = 1;
-
-	if ((chunk_size < min_size) || (chunk_size > max_size)) {
-		log_error("Thin pool chunk size %s is not in the range %s to %s.",
-			  display_size(cmd, chunk_size),
-			  display_size(cmd, min_size),
-			  display_size(cmd, max_size));
-		r = 0;
-	}
-
-	if (chunk_size & (min_size - 1)) {
-		log_error("Thin pool chunk size %s must be a multiple of %s.",
-			  display_size(cmd, chunk_size),
-			  display_size(cmd, min_size));
-		r = 0;
-	}
-
-	return r;
-}

lib/report/columns.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -140,7 +140,6 @@ FIELD(LVSSTATUS, lv, NUM, "CacheWriteHits", lvid, 16, cache_write_hits, cache_wr
 FIELD(LVSSTATUS, lv, NUM, "CacheWriteMisses", lvid, 0, cache_write_misses, cache_write_misses, "Cache write misses.", 0)
 FIELD(LVSSTATUS, lv, STR_LIST, "KCacheSettings", lvid, 18, kernel_cache_settings, kernel_cache_settings, "Cache settings/parameters as set in kernel, including default values (cached segments only).", 0)
 FIELD(LVSSTATUS, lv, STR, "KCachePolicy", lvid, 18, kernel_cache_policy, kernel_cache_policy, "Cache policy used in kernel.", 0)
-FIELD(LVSSTATUS, lv, NUM, "KMFmt", lvid, 0, kernelmetadataformat, kernel_metadata_format, "Cache metadata format used in kernel.", 0)
 FIELD(LVSSTATUS, lv, STR, "Health", lvid, 15, lvhealthstatus, lv_health_status, "LV health status.", 0)
 FIELD(LVSSTATUS, lv, STR, "KDiscards", lvid, 0, kdiscards, kernel_discards, "For thin pools, how discards are handled in kernel.", 0)
 FIELD(LVSSTATUS, lv, BIN, "CheckNeeded", lvid, 15, lvcheckneeded, lv_check_needed, "For thin pools and cache volumes, whether metadata check is needed.", 0)
@@ -255,8 +254,7 @@ FIELD(SEGS, seg, SIZ, "Region", region_size, 0, size32, region_size, "For mirror
 FIELD(SEGS, seg, SIZ, "Chunk", list, 0, chunksize, chunk_size, "For snapshots, the unit of data used when tracking changes.", 0)
 FIELD(SEGS, seg, NUM, "#Thins", list, 0, thincount, thin_count, "For thin pools, the number of thin volumes in this pool.", 0)
 FIELD(SEGS, seg, STR, "Discards", list, 0, discards, discards, "For thin pools, how discards are handled.", 0)
-FIELD(SEGS, seg, NUM, "CMFmt", list, 0, cachemetadataformat, cache_metadata_format, "For cache, metadata format in use.", 0)
-FIELD(SEGS, seg, STR, "CacheMode", list, 0, cachemode, cache_mode, "For cache, how writes are cached.", 0)
+FIELD(SEGS, seg, STR, "CacheMode", list, 0, cachemode, cache_mode, "For cache pools, how writes are cached.", 0)
 FIELD(SEGS, seg, BIN, "Zero", list, 0, thinzero, zero, "For thin pools and volumes, if zeroing is enabled.", 0)
 FIELD(SEGS, seg, NUM, "TransId", list, 0, transactionid, transaction_id, "For thin pools, the transaction id and creation transaction id for thins.", 0)
 FIELD(SEGS, seg, NUM, "ThId", list, 0, thinid, thin_id, "For thin volume, the thin device id.", 0)
@@ -285,4 +283,26 @@ FIELD(PVSEGS, pvseg, NUM, "SSize", len, 0, uint32, pvseg_size, "Number of extent
 /*
  * End of PVSEGS type fields
  */
+
+/*
+ * MOUNTINFO type fields
+ */
+FIELD(MOUNTINFO, mountinfo, STR, "Mounted on", mountpoint, 0, string, mount_point, "Mount point of filesystem on device.", 0)
+/*
+ * End of MOUNTINFO type fields
+ */
+
+
+/*
+ * FSINFO type fields
+ */
+FIELD(FSINFO, fsinfo, SIZ, "FSUsed", fs_used, 0, size64, fs_used, "Space used in mounted filesystem on device.", 0)
+FIELD(FSINFO, fsinfo, SIZ, "FSSize", fs_size, 0, size64, fs_size, "Size of mounted filesystem on device.", 0)
+FIELD(FSINFO, fsinfo, SIZ, "FSFree", fs_free, 0, size64, fs_free, "Free space in mounted filesystem on device.", 0)
+FIELD(FSINFO, fsinfo, SIZ, "FSAvail", fs_avail, 0, size64, fs_avail, "Available space in mounted filesystem on device.", 0)
+/*
+ * End of FSINFO type fields
+ */
+
+
 /* *INDENT-ON* */

lib/report/properties.c

@@ -470,7 +470,7 @@ GET_LVSEG_NUM_PROPERTY_FN(chunk_size, (SECTOR_SIZE * lvseg_chunksize(lvseg)))
 #define _chunk_size_set prop_not_implemented_set
 GET_LVSEG_NUM_PROPERTY_FN(thin_count, dm_list_size(&lvseg->lv->segs_using_this_lv))
 #define _thin_count_set prop_not_implemented_set
-GET_LVSEG_NUM_PROPERTY_FN(zero, (lvseg->zero_new_blocks == THIN_ZERO_YES))
+GET_LVSEG_NUM_PROPERTY_FN(zero, lvseg->zero_new_blocks)
 #define _zero_set prop_not_implemented_set
 GET_LVSEG_NUM_PROPERTY_FN(transaction_id, lvseg->transaction_id)
 #define _transaction_id_set prop_not_implemented_set
@@ -482,8 +482,6 @@ GET_LVSEG_STR_PROPERTY_FN(kernel_discards, lvseg_kernel_discards_dup(lvseg->lv->
 #define _kernel_discards_set prop_not_implemented_set
 GET_LVSEG_STR_PROPERTY_FN(cache_mode, lvseg_cachemode_dup(lvseg->lv->vg->vgmem, lvseg))
 #define _cache_mode_set prop_not_implemented_set
-GET_LVSEG_NUM_PROPERTY_FN(cache_metadata_format, lvseg->cache_metadata_format)
-#define _cache_metadata_format_set prop_not_implemented_set
 GET_LVSEG_NUM_PROPERTY_FN(seg_start, (SECTOR_SIZE * lvseg_start(lvseg)))
 #define _seg_start_set prop_not_implemented_set
 GET_LVSEG_NUM_PROPERTY_FN(seg_start_pe, lvseg->le)
@@ -515,8 +513,6 @@ GET_LVSEG_STR_PROPERTY_FN(seg_monitor, lvseg_monitor_dup(lvseg->lv->vg->vgmem, l
 #define _kernel_cache_settings_set prop_not_implemented_set
 #define _kernel_cache_policy_get prop_not_implemented_get
 #define _kernel_cache_policy_set prop_not_implemented_set
-#define _kernel_metadata_format_get prop_not_implemented_get
-#define _kernel_metadata_format_set prop_not_implemented_set
 
 /* PVSEG */
 GET_PVSEG_NUM_PROPERTY_FN(pvseg_start, pvseg->pe)
@@ -524,6 +520,16 @@ GET_PVSEG_NUM_PROPERTY_FN(pvseg_start, pvseg->pe)
 GET_PVSEG_NUM_PROPERTY_FN(pvseg_size, (SECTOR_SIZE * pvseg->len))
 #define _pvseg_size_set prop_not_implemented_set
 
+#define _mount_point_get prop_not_implemented_get
+#define _mount_point_set prop_not_implemented_set
+#define _fs_used_get prop_not_implemented_get
+#define _fs_used_set prop_not_implemented_set
+#define _fs_size_get prop_not_implemented_get
+#define _fs_size_set prop_not_implemented_set
+#define _fs_free_get prop_not_implemented_get
+#define _fs_free_set prop_not_implemented_set
+#define _fs_avail_get prop_not_implemented_get
+#define _fs_avail_set prop_not_implemented_set
 
 struct lvm_property_type _properties[] = {
 #include "columns.h"

lib/report/report.c

@@ -36,6 +36,8 @@ struct lvm_report_object {
 	struct lv_segment *seg;
 	struct pv_segment *pvseg;
 	struct label *label;
+	struct lvm_mountinfo *mountinfo;
+	struct lvm_fsinfo *fsinfo;
 };
 
 static uint32_t log_seqnum = 1;
@@ -54,7 +56,6 @@ enum {
 
 static const uint64_t _zero64 = UINT64_C(0);
 static const uint64_t _one64 = UINT64_C(1);
-static const uint64_t _two64 = UINT64_C(2);
 static const char _str_zero[] = "0";
 static const char _str_one[] = "1";
 static const char _str_no[] = "no";
@@ -1538,21 +1539,6 @@ static int _kernel_cache_policy_disp(struct dm_report *rh, struct dm_pool *mem,
 				GET_FIELD_RESERVED_VALUE(cache_policy_undef));
 }
 
-static int _kernelmetadataformat_disp(struct dm_report *rh, struct dm_pool *mem,
-				      struct dm_report_field *field,
-				      const void *data, void *private)
-{
-	const struct lv_with_info_and_seg_status *lvdm = (const struct lv_with_info_and_seg_status *) data;
-	unsigned format;
-
-	if (lvdm->seg_status.type == SEG_STATUS_CACHE) {
-		format = (lvdm->seg_status.cache->feature_flags & DM_CACHE_FEATURE_METADATA2);
-		return dm_report_field_uint64(rh, field, format ? &_two64 : &_one64);
-	}
-
-	return _field_set_value(field, "", &GET_TYPE_RESERVED_VALUE(num_undef_64));
-}
-
 static int _cache_policy_disp(struct dm_report *rh, struct dm_pool *mem,
 			      struct dm_report_field *field,
 			      const void *data, void *private)
@@ -2320,8 +2306,8 @@ static int _lv_size_disp(struct dm_report *rh, struct dm_pool *mem,
 	const struct lv_segment *seg = first_seg(lv);
 	uint64_t size = lv->le_count;
 
-	if (seg && !lv_is_raid_image(lv))
-		size -= seg->reshape_len * (seg->area_count > 2 ? (seg->area_count - seg->segtype->parity_devs) : 1);
+	if (!lv_is_raid_image(lv))
+		size -= seg->reshape_len * (seg->area_count > 2 ? seg->area_count : 1);
 
 	size *= lv->vg->extent_size;
 
@@ -2582,7 +2568,7 @@ static int _segdata_offset(struct dm_report *rh, struct dm_pool *mem,
 
 		if (lv_raid_data_offset(lv, &data_offset)) {
 			if (new_data_offset && !lv_raid_image_in_sync(seg->lv))
-				data_offset = data_offset ? 0 : (uint64_t) seg->reshape_len * lv->vg->extent_size;
+				data_offset = data_offset ? 0 : seg->reshape_len * lv->vg->extent_size;
 
 			return dm_report_field_uint64(rh, field, &data_offset);
 		}
@@ -2734,29 +2720,6 @@ static int _cachemode_disp(struct dm_report *rh, struct dm_pool *mem,
 	return _field_string(rh, field, display_cache_mode(seg));
 }
 
-static int _cachemetadataformat_disp(struct dm_report *rh, struct dm_pool *mem,
-				     struct dm_report_field *field,
-				     const void *data, void *private)
-{
-	const struct lv_segment *seg = (const struct lv_segment *) data;
-	const uint64_t *fmt;
-
-	if (seg_is_cache(seg))
-		seg = first_seg(seg->pool_lv);
-
-	if (seg_is_cache_pool(seg)) {
-		switch (seg->cache_metadata_format) {
-		case CACHE_METADATA_FORMAT_1:
-		case CACHE_METADATA_FORMAT_2:
-			fmt = (seg->cache_metadata_format == CACHE_METADATA_FORMAT_2) ? &_two64 : &_one64;
-			return dm_report_field_uint64(rh, field, fmt);
-		default: /* unselected/undefined for all other cases */;
-		}
-	}
-
-	return _field_set_value(field, "", &GET_TYPE_RESERVED_VALUE(num_undef_64));
-}
-
 static int _originsize_disp(struct dm_report *rh, struct dm_pool *mem,
 			    struct dm_report_field *field,
 			    const void *data, void *private)
@@ -3693,7 +3656,7 @@ static int _thinzero_disp(struct dm_report *rh, struct dm_pool *mem,
 		seg = first_seg(seg->pool_lv);
 
 	if (seg_is_thin_pool(seg))
-		return _binary_disp(rh, mem, field, (seg->zero_new_blocks == THIN_ZERO_YES), GET_FIRST_RESERVED_NAME(zero_y), private);
+		return _binary_disp(rh, mem, field, seg->zero_new_blocks, GET_FIRST_RESERVED_NAME(zero_y), private);
 
 	return _binary_undef_disp(rh, mem, field, private);
 }
@@ -3830,6 +3793,13 @@ static struct volume_group _unknown_vg = {
 	.tags = DM_LIST_HEAD_INIT(_unknown_vg.tags),
 };
 
+static struct lvm_mountinfo _unknown_mountinfo = {
+	.mountpoint = ""
+};
+
+static struct lvm_fsinfo _unknown_fsinfo = {
+};
+
 static void *_obj_get_vg(void *obj)
 {
 	struct volume_group *vg = ((struct lvm_report_object *)obj)->vg;
@@ -3867,6 +3837,16 @@ static void *_obj_get_pvseg(void *obj)
 	return ((struct lvm_report_object *)obj)->pvseg;
 }
 
+static void *_obj_get_mountinfo(void *obj)
+{
+	return ((struct lvm_report_object *)obj)->mountinfo;
+}
+
+static void *_obj_get_fsinfo(void *obj)
+{
+	return ((struct lvm_report_object *)obj)->fsinfo;
+}
+
 static void *_obj_get_devtypes(void *obj)
 {
 	return obj;
@@ -3892,6 +3872,8 @@ static const struct dm_report_object_type _report_types[] = {
 	{ LABEL, "Physical Volume Label", "pv_", _obj_get_label },
 	{ SEGS, "Logical Volume Segment", "seg_", _obj_get_seg },
 	{ PVSEGS, "Physical Volume Segment", "pvseg_", _obj_get_pvseg },
+	{ MOUNTINFO, "Mount Point", "mount_", _obj_get_mountinfo },
+	{ FSINFO, "Filesystem", "fs_", _obj_get_fsinfo },
 	{ 0, "", "", NULL },
 };
 
@@ -3924,6 +3906,8 @@ typedef struct volume_group type_vg;
 typedef struct lv_segment type_seg;
 typedef struct pv_segment type_pvseg;
 typedef struct label type_label;
+typedef struct lvm_mountinfo type_mountinfo;
+typedef struct lvm_fsinfo type_fsinfo;
 
 typedef dev_known_type_t type_devtype;
 
@@ -4051,7 +4035,8 @@ int report_object(void *handle, int selection_only, const struct volume_group *v
 		  const struct logical_volume *lv, const struct physical_volume *pv,
 		  const struct lv_segment *seg, const struct pv_segment *pvseg,
 		  const struct lv_with_info_and_seg_status *lvdm,
-		  const struct label *label)
+		  const struct label *label,
+		  const struct lvm_mountinfo *mountinfo, const struct lvm_fsinfo *fsinfo)
 {
 	struct selection_handle *sh = selection_only ? (struct selection_handle *) handle : NULL;
 	struct device dummy_device = { .dev = 0 };
@@ -4062,7 +4047,9 @@ int report_object(void *handle, int selection_only, const struct volume_group *v
 		.pv = (struct physical_volume *) pv,
 		.seg = (struct lv_segment *) seg,
 		.pvseg = (struct pv_segment *) pvseg,
-		.label = (struct label *) (label ? : (pv ? pv_label(pv) : NULL))
+		.label = (struct label *) (label ? : (pv ? pv_label(pv) : NULL)),
+		.mountinfo = (struct lvm_mountinfo *) mountinfo ? : &_unknown_mountinfo,
+		.fsinfo = (struct lvm_fsinfo *) fsinfo ? : &_unknown_fsinfo,
 	};
 
 	/* FIXME workaround for pv_label going through cache; remove once struct

lib/report/report.h

@@ -32,9 +32,22 @@ typedef enum {
 	SEGS		= 256,
 	PVSEGS		= 512,
 	LABEL		= 1024,
-	DEVTYPES	= 2048
+	DEVTYPES	= 2048,
+	MOUNTINFO	= 4096,
+	FSINFO		= 8192
 } report_type_t;
 
+struct lvm_mountinfo {
+	const char *mountpoint;
+};
+
+struct lvm_fsinfo {
+	uint64_t fs_used;
+	uint64_t fs_size;
+	uint64_t fs_free;
+	uint64_t fs_avail;
+};
+
 /*
  * The "struct selection_handle" is used only for selection
  * of items that should be processed further (not for display!).
@@ -104,7 +117,8 @@ int report_object(void *handle, int selection_only, const struct volume_group *v
 		  const struct logical_volume *lv, const struct physical_volume *pv,
 		  const struct lv_segment *seg, const struct pv_segment *pvseg,
 		  const struct lv_with_info_and_seg_status *lvdm,
-		  const struct label *label);
+		  const struct label *label,
+		  const struct lvm_mountinfo *mountinfo, const struct lvm_fsinfo *fsinfo);
 int report_devtypes(void *handle);
 int report_cmdlog(void *handle, const char *type, const char *context,
 		  const char *object_type_name, const char *object_name,

lib/thin/thin.c

@@ -45,7 +45,7 @@ static void _thin_pool_display(const struct lv_segment *seg)
 		  dm_list_size(&seg->lv->segs_using_this_lv));
 	log_print("  Transaction ID\t%" PRIu64, seg->transaction_id);
 	log_print("  Zero new blocks\t%s",
-		  (seg->zero_new_blocks == THIN_ZERO_YES) ? "yes" : "no");
+		  seg->zero_new_blocks ? "yes" : "no");
 
 	log_print(" ");
 }
@@ -84,7 +84,6 @@ static int _thin_pool_text_import(struct lv_segment *seg,
 	const char *lv_name;
 	struct logical_volume *pool_data_lv, *pool_metadata_lv;
 	const char *discards_str = NULL;
-	uint32_t zero = 0;
 
 	if (!dm_config_get_str(sn, "metadata", &lv_name))
 		return SEG_LOG_ERROR("Metadata must be a string in");
@@ -125,11 +124,9 @@ static int _thin_pool_text_import(struct lv_segment *seg,
 				     seg->device_id);
 
 	if (dm_config_has_node(sn, "zero_new_blocks") &&
-	    !dm_config_get_uint32(sn, "zero_new_blocks", &zero))
+	    !dm_config_get_uint32(sn, "zero_new_blocks", &seg->zero_new_blocks))
 		return SEG_LOG_ERROR("Could not read zero_new_blocks for");
 
-	seg->zero_new_blocks = (zero) ? THIN_ZERO_YES : THIN_ZERO_NO;
-
 	/* Read messages */
 	for (; sn; sn = sn->sib)
 		if (!(sn->v) && !_thin_pool_add_message(seg, sn->key, sn->child))
@@ -168,13 +165,8 @@ static int _thin_pool_text_export(const struct lv_segment *seg, struct formatter
 		return 0;
 	}
 
-	if (seg->zero_new_blocks == THIN_ZERO_YES)
+	if (seg->zero_new_blocks)
 		outf(f, "zero_new_blocks = 1");
-	else if (seg->zero_new_blocks != THIN_ZERO_NO) {
-		log_error(INTERNAL_ERROR "Invalid zero new blocks value %d.",
-			  seg->zero_new_blocks);
-		return 0;
-	}
 
 	dm_list_iterate_items(tmsg, &seg->thin_messages) {
 		/* Extra validation */
@@ -312,7 +304,7 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
 					       seg->transaction_id,
 					       metadata_dlid, pool_dlid,
 					       seg->chunk_size, low_water_mark,
-					       (seg->zero_new_blocks == THIN_ZERO_YES) ? 0 : 1))
+					       seg->zero_new_blocks ? 0 : 1))
 		return_0;
 
 	if (attr & THIN_FEATURE_DISCARDS) {

libdaemon/client/config-util.c

@@ -260,7 +260,7 @@ struct dm_config_node *config_make_nodes_v(struct dm_config_tree *cft,
 		key[fmt - next] = '\0';
 		fmt += 2;
 
-		if (!strcmp(fmt, FMTd64)) {
+		if (!strcmp(fmt, "%d") || !strcmp(fmt, FMTd64)) {
 			int64_t value = va_arg(ap, int64_t);
 			if (!(cn = make_int_node(cft, key, value, parent, pre_sib)))
 				return 0;

libdm/.exported_symbols.Base

@@ -234,6 +234,7 @@ dm_tree_free
 dm_tree_get_cookie
 dm_tree_children_use_uuid
 dm_tree_next_child
+dm_tree_node_add_cache_target
 dm_tree_node_add_crypt_target
 dm_tree_node_add_error_target
 dm_tree_node_add_linear_target

libdm/.exported_symbols.DM_1_02_138

@@ -1,9 +1,6 @@
 dm_bit_get_last
 dm_bit_get_prev
-dm_filemapd_mode_from_string
 dm_stats_update_regions_from_fd
 dm_bitset_parse_list
 dm_stats_bind_from_fd
-dm_stats_start_filemapd
 dm_tree_node_add_raid_target_with_params_v2
-dm_tree_node_add_cache_target

libdm/libdevmapper.h

@@ -359,7 +359,7 @@ struct dm_status_cache {
 	uint64_t demotions;
 	uint64_t promotions;
 
-	uint64_t feature_flags;		/* DM_CACHE_FEATURE_? */
+	uint64_t feature_flags;
 
 	int core_argc;
 	char **core_argv;
@@ -1369,73 +1369,6 @@ uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd,
 uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
 					  uint64_t group_id);
 
-
-/*
- * The file map monitoring daemon can monitor files in two distinct
- * ways: the mode affects the behaviour of the daemon when a file
- * under monitoring is renamed or unlinked, and the conditions which
- * cause the daemon to terminate.
- *
- * In both modes, the daemon will always shut down when the group
- * being monitored is deleted.
- *
- * Follow inode:
- * The daemon follows the inode of the file, as it was at the time the
- * daemon started. The file descriptor referencing the file is kept
- * open at all times, and the daemon will exit when it detects that
- * the file has been unlinked and it is the last holder of a reference
- * to the file.
- *
- * This mode is useful if the file is expected to be renamed, or moved
- * within the file system, while it is being monitored.
- *
- * Follow path:
- * The daemon follows the path that was given on the daemon command
- * line. The file descriptor referencing the file is re-opened on each
- * iteration of the daemon, and the daemon will exit if no file exists
- * at this location (a tolerance is allowed so that a brief delay
- * between unlink() and creat() is permitted).
- *
- * This mode is useful if the file is updated by unlinking the original
- * and placing a new file at the same path.
- */
-
-typedef enum {
-	DM_FILEMAPD_FOLLOW_INODE,
-	DM_FILEMAPD_FOLLOW_PATH,
-	DM_FILEMAPD_FOLLOW_NONE
-} dm_filemapd_mode_t;
-
-/*
- * Parse a string representation of a dmfilemapd mode.
- *
- * Returns a valid dm_filemapd_mode_t value on success, or
- * DM_FILEMAPD_FOLLOW_NONE on error.
- */
-dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str);
-
-/*
- * Start the dmfilemapd filemap monitoring daemon for the specified
- * file descriptor, group, and file system path. The daemon will
- * monitor the file for allocation changes, and when a change is
- * detected, call dm_stats_update_regions_from_fd() to update the
- * mapped regions for the file.
- *
- * The path provided to dm_stats_start_filemapd() must be an absolute
- * path, and should reflect the path of 'fd' at the time that it was
- * opened.
- *
- * The mode parameter controls the behaviour of the daemon when the
- * file being monitored is unlinked or moved: see the comments for
- * dm_filemapd_mode_t for a full description and possible values.
- *
- * The daemon can be stopped at any time by sending SIGTERM to the
- * daemon pid.
- */
-int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
-			    dm_filemapd_mode_t mode, unsigned foreground,
-			    unsigned verbose);
-
 /*
  * Call this to actually run the ioctl.
  */
@@ -1890,7 +1823,6 @@ int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
 #define DM_CACHE_FEATURE_WRITEBACK    0x00000001
 #define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002
 #define DM_CACHE_FEATURE_PASSTHROUGH  0x00000004
-#define DM_CACHE_FEATURE_METADATA2    0x00000008 /* cache v1.10 */
 
 struct dm_config_node;
 /*

libdm/libdm-deptree.c

@@ -2514,17 +2514,12 @@ static int _cache_emit_segment_line(struct dm_task *dmt,
 	/* Features */
 	/* feature_count = hweight32(seg->flags); */
 	/* EMIT_PARAMS(pos, " %u", feature_count); */
-	if (seg->flags & DM_CACHE_FEATURE_METADATA2)
-		EMIT_PARAMS(pos, " 2 metadata2 ");
-	else
-		EMIT_PARAMS(pos, " 1 ");
-
 	if (seg->flags & DM_CACHE_FEATURE_PASSTHROUGH)
-		EMIT_PARAMS(pos, "passthrough");
-        else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK)
-		EMIT_PARAMS(pos, "writeback");
-	else
-		EMIT_PARAMS(pos, "writethrough");
+		EMIT_PARAMS(pos, " 1 passthrough");
+	else if (seg->flags & DM_CACHE_FEATURE_WRITETHROUGH)
+		EMIT_PARAMS(pos, " 1 writethrough");
+	else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK)
+		EMIT_PARAMS(pos, " 1 writeback");
 
 	/* Cache Policy */
 	name = seg->policy_name ? : "default";
@@ -3403,33 +3398,19 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 {
 	struct dm_config_node *cn;
 	struct load_segment *seg;
-	static const uint64_t _modemask =
-		DM_CACHE_FEATURE_PASSTHROUGH |
-		DM_CACHE_FEATURE_WRITETHROUGH |
-		DM_CACHE_FEATURE_WRITEBACK;
 
-	/* Detect unknown (bigger) feature bit */
-	if (feature_flags >= (DM_CACHE_FEATURE_METADATA2 * 2)) {
-		log_error("Unsupported cache's feature flags set " FMTu64 ".",
-			  feature_flags);
-		return 0;
-	}
-
-	switch (feature_flags & _modemask) {
-	case DM_CACHE_FEATURE_PASSTHROUGH:
-	case DM_CACHE_FEATURE_WRITEBACK:
-		if (strcmp(policy_name, "cleaner") == 0) {
-			/* Enforce writethrough mode for cleaner policy */
-			feature_flags = ~_modemask;
-			feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
-		}
-                /* Fall through */
-	case DM_CACHE_FEATURE_WRITETHROUGH:
-		break;
-	default:
-		log_error("Invalid cache's feature flag " FMTu64 ".",
-			  feature_flags);
-		return 0;
+	switch (feature_flags &
+		(DM_CACHE_FEATURE_PASSTHROUGH |
+		 DM_CACHE_FEATURE_WRITETHROUGH |
+		 DM_CACHE_FEATURE_WRITEBACK)) {
+		 case DM_CACHE_FEATURE_PASSTHROUGH:
+		 case DM_CACHE_FEATURE_WRITETHROUGH:
+		 case DM_CACHE_FEATURE_WRITEBACK:
+			 break;
+		 default:
+			 log_error("Invalid cache's feature flag " FMTu64 ".",
+				   feature_flags);
+			 return 0;
 	}
 
 	if (data_block_size < DM_CACHE_MIN_DATA_BLOCK_SIZE) {
@@ -3475,7 +3456,8 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
 		return_0;
 
 	seg->data_block_size = data_block_size;
-	seg->flags = feature_flags;
+	/* Enforce WriteThough mode for cleaner policy */
+	seg->flags = (strcmp(policy_name, "cleaner") == 0) ? DM_CACHE_FEATURE_WRITETHROUGH : feature_flags;
 	seg->policy_name = policy_name;
 
 	/* FIXME: better validation missing */
@@ -4034,15 +4016,13 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
 	dnode->callback_data = data;
 }
 
-#if defined(__GNUC__)
 /*
- * Backward compatible implementations.
+ * Backward compatible dm_tree_node_size_changed() implementations.
  *
- * Keep these at the end of the file to make sure that
- * no code in this file accidentally calls it.
+ * Keep these at the end of the file to avoid adding clutter around the
+ * current dm_tree_node_size_changed() version.
  */
-
-/* Backward compatible dm_tree_node_size_changed() implementations. */
+#if defined(__GNUC__)
 int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode);
 DM_EXPORT_SYMBOL_BASE(dm_tree_node_size_changed);
 int dm_tree_node_size_changed_base(const struct dm_tree_node *dnode)
@@ -4050,43 +4030,4 @@ 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);
-DM_EXPORT_SYMBOL_BASE(dm_tree_node_add_cache_target);
-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, data_block_size);
-}
 #endif

libdm/libdm-stats.c

@@ -264,12 +264,9 @@ static int _stats_group_id_present(const struct dm_stats *dms, uint64_t id)
 	if (id == DM_STATS_GROUP_NOT_PRESENT)
 		return 0;
 
-	if (!dms)
+	if (!dms || !dms->regions)
 		return_0;
 
-	if (!dms->regions)
-		return 0;
-
 	if (id > dms->max_region)
 		return 0;
 
@@ -678,7 +675,7 @@ static void _check_group_regions_present(struct dm_stats *dms,
 
 	group_id = i = dm_bit_get_first(regions);
 
-	for (; i > 0; i = dm_bit_get_next(regions, i))
+	for (; i > 0; dm_bit_get_next(regions, i))
 		if (!_stats_region_present(&dms->regions[i])) {
 			log_warn("Group descriptor " FMTi64 " contains "
 				 "non-existent region_id " FMTi64 ".",
@@ -2387,9 +2384,6 @@ bad:
  */
 void dm_stats_destroy(struct dm_stats *dms)
 {
-	if (!dms)
-		return;
-
 	_stats_regions_destroy(dms);
 	_stats_groups_destroy(dms);
 	_stats_clear_binding(dms);
@@ -3318,8 +3312,8 @@ static struct dm_histogram *_aggregate_histogram(const struct dm_stats *dms,
 						 uint64_t area_id)
 {
 	struct dm_histogram *dmh_aggr, *dmh_cur, **dmh_cachep;
-	uint64_t group_id = DM_STATS_GROUP_NOT_PRESENT;
 	int bin, nr_bins, group = 1;
+	uint64_t group_id;
 	size_t hist_size;
 
 	if (area_id == DM_STATS_WALK_REGION) {
@@ -4880,7 +4874,9 @@ out:
 	dm_free((char *) alias);
 	return NULL;
 }
-#else /* !HAVE_LINUX_FIEMAP */
+
+#else /* HAVE_LINUX_FIEMAP */
+
 uint64_t *dm_stats_create_regions_from_fd(struct dm_stats *dms, int fd,
 					  int group, int precise,
 					  struct dm_histogram *bounds,
@@ -4898,158 +4894,6 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
 }
 #endif /* HAVE_LINUX_FIEMAP */
 
-#ifdef DMFILEMAPD
-static const char *_filemapd_mode_names[] = {
-	"inode",
-	"path",
-	NULL
-};
-
-dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str)
-{
-	dm_filemapd_mode_t mode = DM_FILEMAPD_FOLLOW_INODE;
-	const char **mode_name;
-
-	if (mode_str) {
-		for (mode_name = _filemapd_mode_names; *mode_name; mode_name++)
-			if (!strcmp(*mode_name, mode_str))
-				break;
-		if (*mode_name)
-			mode = DM_FILEMAPD_FOLLOW_INODE
-				+ (mode_name - _filemapd_mode_names);
-		else {
-			log_error("Could not parse dmfilemapd mode: %s",
-				  mode_str);
-			return DM_FILEMAPD_FOLLOW_NONE;
-		}
-	}
-	return mode;
-}
-
-#define DM_FILEMAPD "dmfilemapd"
-#define NR_FILEMAPD_ARGS 7 /* includes argv[0] */
-/*
- * Start dmfilemapd to monitor the specified file descriptor, and to
- * update the group given by 'group_id' when the file's allocation
- * changes.
- *
- * usage: dmfilemapd <fd> <group_id> <mode> [<foreground>[<log_level>]]
- */
-int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
-			    dm_filemapd_mode_t mode, unsigned foreground,
-			    unsigned verbose)
-{
-	char fd_str[8], group_str[8], fg_str[2], verb_str[2];
-	const char *mode_str = _filemapd_mode_names[mode];
-	char *args[NR_FILEMAPD_ARGS + 1];
-	pid_t pid = 0;
-	int argc = 0;
-
-	if (fd < 0) {
-		log_error("dmfilemapd file descriptor must be "
-			  "non-negative: %d", fd);
-		return 0;
-	}
-
-	if (path[0] != '/') {
-		log_error("Path argument must specify an absolute path.");
-		return 0;
-	}
-
-	if (mode > DM_FILEMAPD_FOLLOW_PATH) {
-		log_error("Invalid dmfilemapd mode argument: "
-			  "Must be DM_FILEMAPD_FOLLOW_INODE or "
-			  "DM_FILEMAPD_FOLLOW_PATH");
-		return 0;
-	}
-
-	if (foreground > 1) {
-		log_error("Invalid dmfilemapd foreground argument. "
-			  "Must be 0 or 1: %d.", foreground);
-		return 0;
-	}
-
-	if (verbose > 3) {
-		log_error("Invalid dmfilemapd verbose argument. "
-			  "Must be 0..3: %d.", verbose);
-		return 0;
-	}
-
-	/* set argv[0] */
-	args[argc++] = (char *) DM_FILEMAPD;
-
-	/* set <fd> */
-	if ((dm_snprintf(fd_str, sizeof(fd_str), "%d", fd)) < 0) {
-		log_error("Could not format fd argument.");
-		return 0;
-	}
-	args[argc++] = fd_str;
-
-	/* set <group_id> */
-	if ((dm_snprintf(group_str, sizeof(group_str), FMTu64, group_id)) < 0) {
-		log_error("Could not format group_id argument.");
-		return 0;
-	}
-	args[argc++] = group_str;
-
-	/* set <path> */
-	args[argc++] = (char *) path;
-
-	/* set <mode> */
-	args[argc++] = (char *) mode_str;
-
-	/* set <foreground> */
-	if ((dm_snprintf(fg_str, sizeof(fg_str), "%u", foreground)) < 0) {
-		log_error("Could not format foreground argument.");
-		return 0;
-	}
-	args[argc++] = fg_str;
-
-	/* set <verbose> */
-	if ((dm_snprintf(verb_str, sizeof(verb_str), "%u", verbose)) < 0) {
-		log_error("Could not format verbose argument.");
-		return 0;
-	}
-	args[argc++] = verb_str;
-
-	/* terminate args[argc] */
-	args[argc] = NULL;
-
-	log_very_verbose("Spawning daemon as '%s %d " FMTu64 " %s %s %u %u'",
-			 *args, fd, group_id, path, mode_str,
-			 foreground, verbose);
-
-	if (!foreground && ((pid = fork()) < 0)) {
-		log_error("Failed to fork dmfilemapd process.");
-		return 0;
-	}
-
-	if (pid > 0) {
-		log_very_verbose("Forked dmfilemapd process as pid %d", pid);
-		return 1;
-	}
-
-	execvp(args[0], args);
-	log_error("execvp() failed.");
-	if (!foreground)
-		_exit(127);
-	return 0;
-}
-# else /* !DMFILEMAPD */
-dm_filemapd_mode_t dm_filemapd_mode_from_string(const char *mode_str)
-{
-	return 0;
-};
-
-int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
-			    dm_filemapd_mode_t mode, unsigned foreground,
-			    unsigned verbose)
-{
-	log_error("dmfilemapd support disabled.");
-	return 0;
-}
-#endif /* DMFILEMAPD */
-
 /*
  * Backward compatible dm_stats_create_region() implementations.
  *

libdm/libdm-targets.c

@@ -119,7 +119,7 @@ int dm_get_status_raid(struct dm_pool *mem, const char *params,
 		goto_bad;
 
 	msg_fields = "<raid_type> <#devices> <health_chars> and <sync_ratio> ";
-	if (sscanf(params, "%s %u %s " FMTu64 "/" FMTu64,
+	if (sscanf(params, "%s %u %s %" PRIu64 "/%" PRIu64,
 		   s->raid_type,
 		   &s->dev_count,
 		   s->dev_health,
@@ -146,7 +146,7 @@ int dm_get_status_raid(struct dm_pool *mem, const char *params,
 	if (!(s->sync_action = dm_pool_zalloc(mem, pp - p)))
 		goto_bad;
 
-	if (sscanf(p, "%s " FMTu64, s->sync_action, &s->mismatch_count) != 2)
+	if (sscanf(p, "%s %" PRIu64, s->sync_action, &s->mismatch_count) != 2)
 		goto_bad;
 
 	if (num_fields < 7)
@@ -162,7 +162,7 @@ int dm_get_status_raid(struct dm_pool *mem, const char *params,
 	msg_fields = "<data_offset>";
 	if (!(p = _skip_fields(params, 6))) /* skip pre-1.9.0 params */
 		goto bad;
-	if (sscanf(p, FMTu64, &s->data_offset) != 1)
+	if (sscanf(p, "%" PRIu64, &s->data_offset) != 1)
 		goto bad;
 
 out:
@@ -244,14 +244,14 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
 
 	/* Read in args that have definitive placement */
 	if (sscanf(params,
-		   " " FMTu32
-		   " " FMTu64 "/" FMTu64
-		   " " FMTu32
-		   " " FMTu64 "/" FMTu64
-		   " " FMTu64 " " FMTu64
-		   " " FMTu64 " " FMTu64
-		   " " FMTu64 " " FMTu64
-		   " " FMTu64
+		   " %" PRIu32
+		   " %" PRIu64 "/%" PRIu64
+		   " %" PRIu32
+		   " %" PRIu64 "/%" PRIu64
+		   " %" PRIu64 " %" PRIu64
+		   " %" PRIu64 " %" PRIu64
+		   " %" PRIu64 " %" PRIu64
+		   " %" PRIu64
 		   " %d",
 		   &s->metadata_block_size,
 		   &s->metadata_used_blocks, &s->metadata_total_blocks,
@@ -274,10 +274,8 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
 			s->feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
 		else if (!strncmp(p, "writeback ", 10))
 			s->feature_flags |= DM_CACHE_FEATURE_WRITEBACK;
-		else if (!strncmp(p, "passthrough ", 12))
+		else if (!strncmp(p, "passthrough ", 11))
 			s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH;
-		else if (!strncmp(p, "metadata2 ", 10))
-			s->feature_flags |= DM_CACHE_FEATURE_METADATA2;
 		else
 			log_error("Unknown feature in status: %s", params);
 

make.tmpl.in

@@ -44,8 +44,6 @@ EGREP = @EGREP@
 GREP = @GREP@
 SORT = @SORT@
 WC = @WC@
-AR = ar
-RM = rm -f
 
 PYTHON2 = @PYTHON2@
 PYTHON3 = @PYTHON3@
@@ -158,7 +156,6 @@ INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
 INSTALL_ROOT_DATA = $(INSTALL) -m 600
 INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
 
-.SUFFIXES:
 .SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
 
 WFLAGS +=\
@@ -413,8 +410,6 @@ cflow: $(CFLOW_TARGET).cflow $(CFLOW_TARGET).tree $(CFLOW_TARGET).rxref $(CFLOW_
 endif
 endif
 
-.LIBPATTERNS = lib%.so lib%.a
-
 %.o: %.c
 	$(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
 
@@ -466,7 +461,7 @@ endif
 
 $(LIB_STATIC): $(OBJECTS)
 	$(RM) $@
-	$(AR) rsv $@ $(OBJECTS)
+	$(AR) rs $@ $(OBJECTS)
 
 %.d: %.c $(INC_LNS)
 	$(MKDIR_P) $(dir $@); \

man/.gitignore

@@ -1,2 +0,0 @@
-*.gen
-man-generator

man/Makefile.in

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -19,7 +19,6 @@ top_builddir = @top_builddir@
 FSADMMAN = fsadm.8
 BLKDEACTIVATEMAN = blkdeactivate.8
 DMEVENTDMAN = dmeventd.8
-DMFILEMAPDMAN = dmfilemapd.8
 LVMETADMAN = lvmetad.8
 LVMPOLLDMAN = lvmpolld.8
 LVMLOCKDMAN = lvmlockd.8 lvmlockctl.8
@@ -32,19 +31,20 @@ LVMRAIDMAN = lvmraid.7
 
 MAN5=lvm.conf.5
 MAN7=lvmsystemid.7 lvmreport.7 
-MAN8=lvm.8 lvmconf.8 lvmdump.8 lvm-config.8 lvm-dumpconfig.8 lvm-fullreport.8 \
-     lvm-lvpoll.8 lvcreate.8 lvchange.8 lvmconfig.8 lvconvert.8 lvdisplay.8 \
-     lvextend.8 lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \
-     lvscan.8 pvchange.8 pvck.8 pvcreate.8 pvdisplay.8 pvmove.8 pvremove.8 \
-     pvresize.8 pvs.8 pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 \
-     vgck.8 vgcreate.8 vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 \
-     vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
-     vgrename.8 vgs.8 vgscan.8 vgsplit.8 \
-     lvmsar.8 lvmsadc.8 lvmdiskscan.8
+MAN8=lvm.8 lvmconf.8 lvmdump.8
 MAN8DM=dmsetup.8 dmstats.8
 MAN8CLUSTER=
 MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
 
+MAN8GEN=lvm-config.8 lvm-dumpconfig.8 lvm-fullreport.8 lvm-lvpoll.8 \
+	lvcreate.8 lvchange.8 lvmconfig.8 lvconvert.8 lvdisplay.8 lvextend.8 \
+	lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \
+	lvscan.8 pvchange.8 pvck.8 pvcreate.8 pvdisplay.8 pvmove.8 pvremove.8 \
+	pvresize.8 pvs.8 pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 \
+	vgck.8 vgcreate.8 vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 \
+	vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
+	vgrename.8 vgs.8 vgscan.8 vgsplit.8 \
+	lvmsar.8 lvmsadc.8 lvmdiskscan.8 lvmchange.8
 
 ifeq ($(MAKECMDGOALS),all_man)
   MAN_ALL="yes"
@@ -56,7 +56,7 @@ endif
 
 ifeq ($(MAN_ALL),"yes")
   MAN8+=$(FSADMMAN) $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(LVMDBUSDMAN)
-  MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(DMFILEMAPDMAN)
+  MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN)
   MAN8CLUSTER+=$(CLVMDMAN) $(CMIRRORDMAN)
   MAN7+=$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMRAIDMAN)
 else
@@ -88,10 +88,6 @@ else
     MAN8DM+=$(DMEVENTDMAN)
   endif
 
-  ifeq ("@DMFILEMAPD@", "yes")
-    MAN8DM+=$(DMFILEMAPDMAN)
-  endif
-
   ifneq ("@CLVMD@", "none")
     MAN8CLUSTER+=$(CLVMDMAN)
   endif
@@ -117,74 +113,46 @@ MAN5DIR=$(mandir)/man5
 MAN7DIR=$(mandir)/man7
 MAN8DIR=$(mandir)/man8
 
-MANGENERATOR=./man-generator
-TESTMAN=test.gen
-
 include $(top_builddir)/make.tmpl
 
-CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8:%.8_gen=%.8) $(MAN8CLUSTER) \
-	$(MAN8SYSTEMD_GENERATORS) $(MAN8DM) $(MANGENERATOR) $(TESTMAN)
+CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) \
+	$(MAN8SYSTEMD_GENERATORS) $(MAN8DM) *.gen man-generator
 DISTCLEAN_TARGETS+=$(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) \
 	$(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CLVMDMAN) $(CMIRRORDMAN) \
-	$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN) \
-	$(DMFILEMAPDMAN)
+	$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN)
 
 all: man device-mapper
 
-.PHONY: man install_man5 install_man7 install_man8 pregenerated_man
+.PHONY: man install_man5 install_man7 install_man8
 
 device-mapper: $(MAN8DM)
 
-man: $(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS)
+man: $(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS)
 
 all_man: man
 
-$(MAN5) $(MAN7) $(MAN8) $(MAN8DM) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS): Makefile
+$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8DM) $(MAN8CLUSTER):	Makefile
 
-$(MANGENERATOR): Makefile
+Makefile: Makefile.in
+	@:
+
+%: %.in
+	@case "$@" in \
+	  */*) ;; \
+	  *) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $< > $@ ;; \
+	esac
+
+man-generator:
 	$(CC) -DMAN_PAGE_GENERATOR -I$(top_builddir)/tools $(CFLAGS) $(top_srcdir)/tools/command.c -o $@
+	- ./man-generator --primary lvmconfig > test.gen
+	if [ ! -s test.gen ] ; then cp genfiles/*.gen $(top_builddir)/man; fi;
 
-# Test whether or not the man page generator works
-$(TESTMAN): $(MANGENERATOR)
-	- $(MANGENERATOR) --primary lvmconfig > $@
-
-SEE_ALSO=$(srcdir)/see_also.end
-
-%.8_gen: $(srcdir)/%.8_des $(srcdir)/%.8_end $(MANGENERATOR) $(TESTMAN)
-	( \
-	    if [ ! -s $(TESTMAN) ] ; then \
-		echo "Copying pre-generated $@" ; \
-	    else \
-		echo "Generating $@" ; \
-	    fi \
-	)
-	( \
-	    if [ ! -s $(TESTMAN) ] ; then \
-		cat $(srcdir)/$(@:%.8_gen=%.8_pregen) ; \
-	    else \
-		MANCMD=$(basename $@) && \
-		$(MANGENERATOR) --primary $$MANCMD $< && \
-		$(MANGENERATOR) --secondary $$MANCMD && \
-		cat $(srcdir)/$(basename $@).8_end && \
-		cat $(SEE_ALSO) ; \
-	    fi \
-	) > $@
-
-define SUBSTVARS
-echo "Generating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+/data/lvmtest/usr/sbin/clvmd+;s+#LVM_PATH#+/data/lvmtest/sbin/lvm+;s+#DEFAULT_RUN_DIR#+/var/run/lvm+;s+#DEFAULT_PID_DIR#+/var/run+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $< > $@
-endef
-
-%.5: $(srcdir)/%.5_main
-	$(SUBSTVARS)
-
-%.7: $(srcdir)/%.7_main
-	$(SUBSTVARS)
-
-%.8: $(srcdir)/%.8_main
-	$(SUBSTVARS)
-
-%.8: %.8_gen
-	$(SUBSTVARS)
+$(MAN8GEN): man-generator
+	echo "Generating $@" ;
+	if [ ! -e $@.gen ]; then ./man-generator --primary $(basename $@) $(top_srcdir)/man/$@.des > $@.gen; ./man-generator --secondary $(basename $@) >> $@.gen; fi
+	if [ -f $(top_srcdir)/man/$@.end ]; then cat $(top_srcdir)/man/$@.end >> $@.gen; fi;
+	cat $(top_srcdir)/man/see_also.end >> $@.gen
+	$(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $@.gen > $@
 
 install_man5: $(MAN5)
 	$(INSTALL) -d $(MAN5DIR)
@@ -194,9 +162,10 @@ install_man7: $(MAN7)
 	$(INSTALL) -d $(MAN7DIR)
 	$(INSTALL_DATA) $(MAN7) $(MAN7DIR)/
 
-install_man8: $(MAN8) $(MAN8GENERATED)
+install_man8: $(MAN8) $(MAN8GEN)
 	$(INSTALL) -d $(MAN8DIR)
-	$(INSTALL_DATA) $(MAN8) $(MAN8GENERATED) $(MAN8DIR)/
+	$(INSTALL_DATA) $(MAN8) $(MAN8DIR)/
+	$(INSTALL_DATA) $(MAN8GEN) $(MAN8DIR)/
 
 install_lvm2: install_man5 install_man7 install_man8
 
@@ -217,12 +186,3 @@ install_systemd_generators: $(MAN8SYSTEMD_GENERATORS)
 install: install_lvm2 install_device-mapper install_cluster
 
 install_all_man: install install_systemd_generators
-
-# Copy generated man pages back to source tree as fallback for machines where generator doesn't work
-pregenerated_man: all
-	for i in $(srcdir)/*.8_des; do \
-		CMD=`basename $$i .8_des`; \
-		cat $${CMD}.8 > $(srcdir)/$$CMD.8_pregen ; \
-	done
-
-generate: pregenerated_man

man/blkdeactivate.8.in

@@ -12,8 +12,8 @@ blkdeactivate \(em utility to deactivate block devices
 .RB [ \-v ]
 .RI [ device ]
 .SH DESCRIPTION
-The blkdeactivate utility deactivates block devices. For mounted
-block devices, it attempts to unmount it automatically before
+blkdeactivate utility deactivates block devices. If a device
+is mounted, the utility can unmount it automatically before
 trying to deactivate. The utility currently supports
 device-mapper devices (DM), including LVM volumes and
 software RAID MD devices. LVM volumes are handled directly
@@ -35,30 +35,30 @@ Force device removal.
 .BR \-e ", " \-\-errors
 Show errors reported from tools called by \fBblkdeactivate\fP. Without this
 option, any error messages from these external tools are suppressed and the
-\fBblkdeactivate\fP itself provides only a summary message to indicate
-the device was skipped.
+\fBblkdeactivate\fP itself provides only a summary message about device being
+skipped or not.
 .TP
 .BR \-h ", " \-\-help
 Display the help text.
 .TP
 .BR \-l ", " \-\-lvmoption \ \fIlvm_options\fP
-Comma-separated list of LVM specific options:
+Comma separated list of LVM specific options:
 .RS
 .IP \fIretry\fP
 Retry removal several times in case of failure.
 .IP \fIwholevg\fP
 Deactivate the whole LVM Volume Group when processing a Logical Volume.
-Deactivating the Volume Group as a whole is quicker than deactivating
-each Logical Volume separately.
+Deactivating Volume Group as a whole takes less time than deactivating each
+Logical Volume separately.
 .RE
 .TP
 .BR \-m ", " \-\-mpathoption \ \fImpath_options\fP
-Comma-separated list of device-mapper multipath specific options:
+Comma separated list of device-mapper multipath specific options:
 .RS
 .IP \fIdisablequeueing\fP
-Disable queueing on all multipath devices before deactivation.
+Disable queueing on all multipath devices first before deactivation.
 This avoids a situation where blkdeactivate may end up waiting if
-all the paths are unavailable for any underlying device-mapper multipath
+all paths are unavailable for any underlying device-mapper multipath
 device.
 .RE
 .TP
@@ -69,42 +69,33 @@ Without this option used, a device that is mounted is not deactivated.
 .BR \-v ", " \-\-verbose
 Run in verbose mode. Use \-\-vv for even more verbose mode.
 .SH EXAMPLES
-.
-Deactivate all supported block devices found in the system, skipping mounted
-devices.
-.BR
-#
+.sp
+Deactivate all supported block devices found in the system. If a device
+is mounted, skip its deactivation.
+.sp
 .B blkdeactivate
-.BR
-.P
-Deactivate all supported block devices found in the system, unmounting any
-mounted devices first, if possible.
-.BR
-#
+
+Deactivate all supported block devices found in the system. If a device
+is mounted, unmount it first if possible.
+.sp
 .B blkdeactivate \-u
-.BR
-.P
-Deactivate the device /dev/vg/lvol0 together with all its holders, unmounting 
-any mounted devices first, if possible.
-.BR
-#
+
+Deactivate supplied device together with all its holders. If any of the
+devices processed is mounted, unmount it first if possible.
+.sp
 .B blkdeactivate \-u /dev/vg/lvol0
-.BR
-.P
-Deactivate all supported block devices found in the system. If the deactivation
-of a device-mapper device fails, retry it. Deactivate the whole
+
+Deactivate all supported block devices found in the system. Retry deactivation
+of device-mapper devices in case the deactivation fails. Deactivate the whole
 Volume Group at once when processing an LVM Logical Volume.
-.BR
-#
+.sp
 .B blkdeactivate \-u \-d retry \-l wholevg
-.BR
-.P
-Deactivate all supported block devices found in the system. If the deactivation
-of a device-mapper device fails, retry it and force removal.
-.BR
-#
+
+Deactivate all supported block devices found in the system. Retry deactivation
+of device-mapper devices in case the deactivation fails and force removal.
+.sp
 .B blkdeactivate \-d force,retry
-.
+
 .SH SEE ALSO
 .BR dmsetup (8),
 .BR lsblk (8),

man/clvmd.8.in

@@ -176,9 +176,9 @@ clvmd attempts to activate the LV only on the local node.
 If the LV type allows concurrent access, then shared mode is used,
 otherwise exclusive.
 .IP \fBn\fP
-clvmd attempts to deactivate the LV on all nodes.
+clvmd deactivates the LV on all nodes.
 .IP \fBln\fP
-clvmd attempts to deactivate the LV on the local node.
+clvmd deactivates the LV on the local node.
 .
 .SH ENVIRONMENT VARIABLES
 .TP

man/dmfilemapd.8_main

@@ -1,212 +0,0 @@
-.TH DMFILEMAPD 8 "Dec 17 2016" "Linux" "MAINTENANCE COMMANDS"
-
-.de OPT_FD
-.  RB [ file_descriptor ]
-..
-.
-.de OPT_GROUP
-.  RB [ group_id ]
-..
-.de OPT_PATH
-.  RB [ abs_path ]
-..
-.
-.de OPT_MODE
-.  RB [ mode ]
-..
-.
-.de OPT_DEBUG
-.  RB [ foreground [ verbose ] ]
-..
-.
-.SH NAME
-.
-dmfilemapd \(em device-mapper filemap monitoring daemon
-.
-.SH SYNOPSIS
-.
-.de CMD_DMFILEMAPD
-.  ad l
-.  IR dmfilemapd
-.  OPT_FD
-.  OPT_GROUP
-.  OPT_PATH
-.  OPT_MODE
-.  OPT_DEBUG
-.  ad b
-..
-.CMD_DMFILEMAPD
-.
-.PD
-.ad b
-.
-.SH DESCRIPTION
-.
-The dmfilemapd daemon monitors groups of \fIdmstats\fP regions that
-correspond to the extents of a file, adding and removing regions to
-reflect the changing state of the file on-disk.
-
-The daemon is normally launched automatically by the \fPdmstats
-create\fP command, but can be run manually, either to create a new
-daemon where one did not previously exist, or to change the options
-previously used, by killing the existing daemon and starting a new
-one.
-.
-.SH OPTIONS
-.
-.HP
-.BR file_descriptor
-.br
-Specify the file descriptor number for the file to be monitored.
-The file descriptor must reference a regular file, open for reading,
-in a local file system that supports the FIEMAP ioctl, and that
-returns data describing the physical location of extents.
-
-The process that executes \fBdmfilemapd\fP is responsible for
-opening the file descriptor that is handed to the daemon.
-.
-.HP
-.BR group_id
-.br
-The \fBdmstats\fP group identifier of the group that \fBdmfilemapd\fP
-should update. The group must exist and it should correspond to
-a set of regions created by a previous filemap operation.
-.
-.HP
-.BR abs_path
-.br
-The absolute path to the file being monitored, at the time that
-it was opened. The use of \fBpath\fP by the daemon differs,
-depending on the filemap following mode in use; see \fBMODES\fP
-and the \fBmode\fP option for more information.
-
-.br
-.HP
-.BR mode
-.br
-The filemap monitoring mode the daemon should use: either "inode"
-(\fBDM_FILEMAP_FOLLOW_INODE\fP), or "path"
-(\fBDM_FILEMAP_FOLLOW_PATH\fP), to enable follow-inode or
-follow-path mode respectively.
-.
-.HP
-.BR [foreground]
-.br
-If set to 1, disable forking and allow the daemon to run in the
-foreground.
-.
-.HP
-.BR [verbose]
-Control daemon logging. If set to zero, the daemon will close all
-stdio streams and run silently. If \fBverbose\fP is a number
-between 1 and 3, stdio will be retained and the daemon will log
-messages to stdout and stderr that match the specified verbosity
-level.
-.
-.
-.SH MODES
-.
-The file map monitoring daemon can monitor files in two distinct
-ways: the mode affects the behaviour of the daemon when a file
-under monitoring is renamed or unlinked, and the conditions which
-cause the daemon to terminate.
-
-In both modes, the daemon will always shut down when the group
-being monitored is deleted.
-
-.P
-.B Follow inode
-.P
-The daemon follows the inode of the file, as it was at the time the
-daemon started. The file descriptor referencing the file is kept
-open at all times, and the daemon will exit when it detects that
-the file has been unlinked and it is the last holder of a reference
-to the file.
-
-This mode is useful if the file is expected to be renamed, or moved
-within the file system, while it is being monitored.
-
-.P
-.B Follow path
-.P
-The daemon follows the path that was given on the daemon command
-line. The file descriptor referencing the file is re-opened on each
-iteration of the daemon, and the daemon will exit if no file exists
-at this location (a tolerance is allowed so that a brief delay
-between removal and replacement is permitted).
-
-This mode is useful if the file is updated by unlinking the original
-and placing a new file at the same path.
-.
-.SH LIMITATIONS
-.
-The daemon attempts to maintain good synchronisation between the file
-extents and the regions contained in the group, however, since the
-daemon can only react to new allocations once they have been written,
-there are inevitably some IO events that cannot be counted when a
-file is growing, particularly if the file is being extended by a
-single thread writing beyond EOF (for example, the \fBdd\fP program).
-
-There is a further loss of events in that there is currently no way
-to atomically resize a \fBdmstats\fP region and preserve its current
-counter values. This affects files when they grow by extending the
-final extent, rather than allocating a new extent: any events that
-had accumulated in the region between any prior operation and the
-resize are lost.
-
-File mapping is currently most effective in cases where the majority
-of IO does not trigger extent allocation. Future updates may address
-these limitations when kernel support is available.
-.
-.SH EXAMPLES
-.
-Normally the daemon is started automatically by the \fBdmstats\fP
-\fBcreate\fP or \fBupdate_filemap\fP commands but it can be run
-manually for debugging or testing purposes.
-.P
-Start the daemon in the background, in follow-path mode
-.br
-#
-.B dmfilemapd 3 0 /srv/images/vm.img path 0 0 3< /srv/images/vm.img
-.br
-.P
-Start the daemon in follow-inode mode, disable forking and enable
-verbose logging
-.br
-#
-.B dmfilemapd 3 0 /var/tmp/data inode 1 3 3< /var/tmp/data
-.br
-Starting dmfilemapd with fd=3, group_id=0 mode=inode, path=/var/tmp/data
-.br
-dm version   [ opencount flush ]   [16384] (*1)
-.br
-dm info   (253:0) [ opencount flush ]   [16384] (*1)
-.br
-dm message   (253:0) [ opencount flush ]  @stats_list dmstats [16384] (*1)
-.br
-Read alias 'data' from aux_data
-.br
-Found group_id 0: alias="data"
-.br
-dm_stats_walk_init: initialised flags to 4000000000000
-.br
-starting stats walk with   GROUP
-.br
-exiting _filemap_monitor_get_events() with deleted=0, check=0
-.br
-Waiting for check interval
-.br
-.P
-.
-.SH AUTHORS
-.
-Bryn M. Reeves <bmr@redhat.com>
-.
-.SH SEE ALSO
-.
-.BR dmstats (8)
-
-LVM2 resource page: https://www.sourceware.org/lvm2/
-.br
-Device-mapper resource page: http://sources.redhat.com/dm/
-.br

man/dmstats.8.in

@@ -14,9 +14,6 @@
 .  RB [ \-\-region ]
 .  RB [ \-\-group ]
 ..
-.de OPT_FOREGROUND
-.  RB [ \-\-foreground ]
-..
 .
 .\" Print units suffix, use with arg to print human
 .\" man2html can't handle too many changes per command
@@ -92,10 +89,6 @@ dmstats \(em device-mapper statistics management
 .  RB [ \-\-bounds
 .  IR \%histogram_boundaries ]
 .  RB [ \-\-filemap ]
-.  RB [ \-\-follow
-.  IR follow_mode ]
-.  OPT_FOREGROUND
-.  RB [ \-\-nomonitor ]
 .  RB [ \-\-nogroup ]
 .  RB [ \-\-precise ]
 .  RB [ \-\-start
@@ -222,9 +215,6 @@ dmstats \(em device-mapper statistics management
 .  IR file_path
 .  RB [ \-\-groupid
 .  IR id ]
-.  RB [ \-\-follow
-.  IR follow_mode ]
-.  OPT_FOREGROUND
 .  ad b
 ..
 .CMD_UPDATE_FILEMAP
@@ -324,60 +314,6 @@ create regions corresponding to the locations of the on-disk extents
 allocated to the file(s).
 .
 .HP
-.BR \-\-nomonitor
-.br
-Disable the \fBdmfilemapd\fP daemon when creating new file mapped
-groups. Normally the device-mapper filemap monitoring daemon,
-\fBdmfilemapd\fP, is started for each file mapped group to update the
-set of regions as the file changes on-disk: use of this option
-disables this behaviour.
-
-Regions in the group may still be updated with the
-\fBupdate_filemap\fP command, or by starting the daemon manually.
-.
-.HP
-.BR \-\-follow
-.IR follow_mode
-.br
-Specify the \fBdmfilemapd\fP file following mode. The file map
-monitoring daemon can monitor files in two distinct ways: the mode
-affects the behaviour of the daemon when a file under monitoring is
-renamed or unlinked, and the conditions which cause the daemon to
-terminate.
-
-The \fBfollow_mode\fP argument is either "inode", for follow-inode
-mode, or "path", for follow-path.
-
-If follow-inode mode is used, the daemon will hold the file open, and
-continue to update regions from the same file descriptor. This means
-that the mapping will follow rename, move (within the same file
-system), and unlink operations. This mode is useful if the file is
-expected to be moved, renamed, or unlinked while it is being
-monitored.
-
-In follow-inode mode, the daemon will exit once it detects that the
-file has been unlinked and it is the last holder of a reference to it.
-
-If follow-path is used, the daemon will re-open the provided path on
-each monitoring iteration. This means that the group will be updated
-to reflect a new file being moved to the same path as the original
-file. This mode is useful for files that are expected to be updated
-via unlink and rename.
-
-In follow-path mode, the daemon will exit if the file is removed and
-not replaced within a brief tolerance interval.
-
-In either mode, the daemon exits automatically if the monitored group
-is removed.
-.
-.HP
-.BR \-\-foreground
-.br
-Specify that the \fBdmfilemapd\fP daemon should run in the foreground.
-The daemon will not fork into the background, and will replace the
-\fBdmstats\fP command that started it.
-.
-.HP
 .BR \-\-groupid
 .IR id
 .br
@@ -632,11 +568,6 @@ By default regions that map a file are placed into a group and the
 group alias is set to the basename of the file. This behaviour can be
 overridden with the \fB\-\-alias\fP and \fB\-\-nogroup\fP options.
 
-Creating a group that maps a file automatically starts a daemon,
-\fBdmfilemapd\fP to monitor the file and update the mapping as the
-extents allocated to the file change. This behaviour can be disabled
-using the \fB\-\-nomonitor\fP option.
-
 Use the \fB\-\-group\fP option to only display information for groups
 when listing and reporting.
 .
@@ -747,23 +678,17 @@ The group to be removed is specified using \fB\-\-groupid\fP.
 .CMD_UPDATE_FILEMAP
 .br
 Update a group of \fBdmstats\fP regions specified by \fBgroup_id\fP,
-that were previously created with \fB\-\-filemap\fP, either directly,
-or by starting the monitoring daemon, \fBdmfilemapd\fP.
-
-This will add and remove regions to reflect changes in the allocated
-extents of the file on-disk, since the time that it was crated or last
-updated.
+that were previously created with \fB\-\-filemap\fP. This will add
+and remove regions to reflect changes in the allocated extents of
+the file on-disk, since the time that it was crated or last updated.
 
 Use of this command is not normally needed since the \fBdmfilemapd\fP
 daemon will automatically monitor filemap groups and perform these
 updates when required.
 
-If a filemapped group was created with \fB\-\-nomonitor\fP, or the
+If a filemapped group was created with \fB\-\-nominitor\fP, or the
 daemon has been killed, the \fBupdate_filemap\fP can be used to
-manually force an update or start a new daemon.
-
-Use \fB\-\-nomonitor\fP to force a direct update and disable starting
-the monitoring daemon.
+manually force an update.
 .
 .SH REGIONS, AREAS, AND GROUPS
 .
@@ -825,93 +750,6 @@ containing device.
 The \fBgroup_id\fP should be treated as an opaque identifier used to
 reference the group.
 .
-.SH FILE MAPPING
-.
-Using \fB\-\-filemap\fP, it is possible to create regions that
-correspond to the extents of a file in the file system. This allows
-IO statistics to be monitored on a per-file basis, for example to
-observe large database files, virtual machine images, or other files
-of interest.
-
-To be able to use file mapping, the file must be backed by a
-device-mapper device, and in a file system that supports the FIEMAP
-ioctl (and which returns data describing the physical location of
-extents). This currently includes \fBxfs(5)\fP and \fBext4(5)\fP.
-
-By default the regions making up a file are placed together in a
-group, and the group alias is set to the \fBbasename(3)\fP of the
-file. This allows statistics to be reported for the file as a whole,
-aggregating values for the regions making up the group. To see only
-the whole file (group) when using the \fBlist\fP and \fBreport\fP
-commands, use \fB\-\-group\fP.
-
-Since it is possible for the file to change after the initial
-group of regions is created, the \fBupdate_filemap\fP command, and
-\fBdmfilemapd\fP daemon are provided to update file mapped groups
-either manually or automatically.
-.
-.P
-.B File follow modes
-.P
-The file map monitoring daemon can monitor files in two distinct ways:
-follow-inode mode, and follow-path mode.
-
-The mode affects the behaviour of the daemon when a file under
-monitoring is renamed or unlinked, and the conditions which cause the
-daemon to terminate.
-
-If follow-inode mode is used, the daemon will hold the file open, and
-continue to update regions from the same file descriptor. This means
-that the mapping will follow rename, move (within the same file
-system), and unlink operations. This mode is useful if the file is
-expected to be moved, renamed, or unlinked while it is being
-monitored.
-
-In follow-inode mode, the daemon will exit once it detects that the
-file has been unlinked and it is the last holder of a reference to it.
-
-If follow-path is used, the daemon will re-open the provided path on
-each monitoring iteration. This means that the group will be updated
-to reflect a new file being moved to the same path as the original
-file. This mode is useful for files that are expected to be updated
-via unlink and rename.
-
-In follow-path mode, the daemon will exit if the file is removed and
-not replaced within a brief tolerance interval (one second).
-
-To stop the daemon, delete the group containing the mapped regions:
-the daemon will automatically shut down.
-
-The daemon can also be safely killed at any time and the group kept:
-if the file is still being allocated the mapping will become
-progressively out-of-date as extents are added and removed (in this
-case the daemon can be re-started or the group updated manually with
-the \fBupdate_filemap\fP command).
-
-See the \fBcreate\fP command and \fB\-\-filemap\fP, \fB\-\-follow\fP,
-and \fB\-\-nomonitor\fP options for further information.
-.
-.P
-.B Limitations
-.P
-The daemon attempts to maintain good synchronisation between the file
-extents and the regions contained in the group, however, since it can
-only react to new allocations once they have been written, there are
-inevitably some IO events that cannot be counted when a file is
-growing, particularly if the file is being extended by a single thread
-writing beyond end-of-file (for example, the \fBdd\fP program).
-
-There is a further loss of events in that there is currently no way
-to atomically resize a \fBdmstats\fP region and preserve its current
-counter values. This affects files when they grow by extending the
-final extent, rather than allocating a new extent: any events that
-had accumulated in the region between any prior operation and the
-resize are lost.
-
-File mapping is currently most effective in cases where the majority
-of IO does not trigger extent allocation. Future updates may address
-these limitations when kernel support is available.
-.
 .SH REPORT FIELDS
 .
 The dmstats report provides several types of field that may be added to

man/lvchange.8.end

@@ -1,4 +1,6 @@
 .SH EXAMPLES
+
 Change LV permission to read-only:
 .sp
 .B lvchange \-pr vg00/lvol1
+

man/lvconvert.8.des

@@ -62,3 +62,4 @@ and vice-versa by e.g. linear <-> raid1 <-> raid5_n (then adding stripes) <-> st
 
 Sub LVs can be displayed with the command
 .B lvs -a
+

man/lvconvert.8.end

@@ -1,4 +1,5 @@
 .SH NOTES
+
 This previous command syntax would perform two different operations:
 .br
 \fBlvconvert --thinpool\fP \fILV1\fP \fB--poolmetadata\fP \fILV2\fP
@@ -17,7 +18,9 @@ If LV1 was not a cache pool, the command would convert LV1 to
 a cache pool, optionally using a specified LV for metadata.
 But, if LV1 was already a cache pool, the command would swap
 the current metadata LV with LV2 (for repair purposes.)
+
 .SH EXAMPLES
+
 Convert a linear LV to a two-way mirror LV.
 .br
 .B lvconvert \-\-type mirror \-\-mirrors 1 vg/lvol1
@@ -110,3 +113,4 @@ Detach and keep the cache pool from a cache LV.
 Detach and remove the cache pool from a cache LV.
 .br
 .B lvconvert \-\-uncache vg/lvol1
+

man/lvcreate.8.des

@@ -25,7 +25,9 @@ Thin LVs are thinly provisioned from a thin pool, and are created with a
 virtual size rather than a physical size. A cache LV is the combination of
 a standard LV with a cache pool, used to cache active portions of the LV
 to improve performance.
+
 .SS Usage notes
+
 In the usage section below, \fB--size\fP \fISize\fP can be replaced
 with \fB--extents\fP \fINumber\fP.  See both descriptions
 the options section.
@@ -34,3 +36,4 @@ In the usage section below, \fB--name\fP is omitted from the required
 options, even though it is typically used.  When the name is not
 specified, a new LV name is generated with the "lvol" prefix and a unique
 numeric suffix.  Also see the description in the options section.
+

man/lvcreate.8.end

@@ -95,3 +95,4 @@ then combining the new origin LV with an existing cache pool.
 .RS
 .B \-L 100G \-n mylv vg00 /dev/slow1
 .RE
+

man/lvdisplay.8_pregen

@@ -1,579 +0,0 @@
-.TH LVDISPLAY 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvdisplay \- Display information about a logical volume
-.
-.SH SYNOPSIS
-\fBlvdisplay\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.SH DESCRIPTION
-lvdisplay shows the attributes of LVs, like size, read/write status,
-snapshot information, etc.
-
-\fBlvs\fP(8) is a preferred alternative that shows the same information
-and more, using a more compact and configurable output format.
-.SH USAGE
-\fBlvdisplay\fP
-.br
-.RS 4
-.ad l
-[ \fB-a\fP|\fB--all\fP ]
-.ad b
-.br
-.ad l
-[ \fB-c\fP|\fB--colon\fP ]
-.ad b
-.br
-.ad l
-[ \fB-C\fP|\fB--columns\fP ]
-.ad b
-.br
-.ad l
-[ \fB-H\fP|\fB--history\fP ]
-.ad b
-.br
-.ad l
-[ \fB-m\fP|\fB--maps\fP ]
-.ad b
-.br
-.ad l
-[ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-P\fP|\fB--partial\fP ]
-.ad b
-.br
-.ad l
-[ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--aligned\fP ]
-.ad b
-.br
-.ad l
-[    \fB--binary\fP ]
-.ad b
-.br
-.ad l
-[    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
-.br
-.ad l
-[    \fB--foreign\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignorelockingfailure\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
-[    \fB--logonly\fP ]
-.ad b
-.br
-.ad l
-[    \fB--noheadings\fP ]
-.ad b
-.br
-.ad l
-[    \fB--nosuffix\fP ]
-.ad b
-.br
-.ad l
-[    \fB--readonly\fP ]
-.ad b
-.br
-.ad l
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
-.br
-.ad l
-[    \fB--segments\fP ]
-.ad b
-.br
-.ad l
-[    \fB--separator\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--shared\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unbuffered\fP ]
-.ad b
-.br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIVG\fP|\fILV\fP|\fITag\fP ... ]
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--aligned\fP
-.br
-Use with --separator to align the output columns
-.ad b
-.HP
-.ad l
-\fB-a\fP|\fB--all\fP
-.br
-Show information about internal LVs.
-These are components of normal LVs, such as mirrors,
-which are not independently accessible, e.g. not mountable.
-.ad b
-.HP
-.ad l
-\fB--binary\fP
-.br
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
-.ad l
-\fB-c\fP|\fB--colon\fP
-.br
-Generate colon separated output for easier parsing in scripts or programs.
-Also see vgs(8) which provides considerably more control over the output.
-.ad b
-.HP
-.ad l
-\fB-C\fP|\fB--columns\fP
-.br
-Display output in columns, the equivalent of vgs(8).
-Options listed are the same as options given in vgs(8).
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
-.br
-See lvmreport(7).
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB--foreign\fP
-.br
-Report/display foreign VGs that would otherwise be skipped.
-See lvmsystemid(7) for more information about foreign VGs.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB-H\fP|\fB--history\fP
-.br
-Include historical LVs in the output.
-(This has no effect unless LVs were removed while
-lvm.conf metadata/record_lvs_history was enabled.
-.ad b
-.HP
-.ad l
-\fB--ignorelockingfailure\fP
-.br
-Allows a command to continue with read-only metadata
-operations after locking failures.
-.ad b
-.HP
-.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
-\fB--logonly\fP
-.br
-Suppress command report and display only log report.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB-m\fP|\fB--maps\fP
-.br
-Display the mapping of logical extents to PVs and physical extents.
-To map physical extents to logical extents use:
-pvs --segments -o+lv_name,seg_start_pe,segtype
-.ad b
-.HP
-.ad l
-\fB--noheadings\fP
-.br
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.ad b
-.HP
-.ad l
-\fB--nosuffix\fP
-.br
-Suppress the suffix on output sizes. Use with --units
-(except h and H) if processing the output.
-.ad b
-.HP
-.ad l
-\fB-o\fP|\fB--options\fP \fIString\fP
-.br
-Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
-The prefix \fB+\fP will append the specified fields to the default fields,
-\fB-\fP will remove the specified fields from the default fields, and
-\fB#\fP will compact specified fields (removing them when empty for all rows.)
-Use \fB-o help\fP to view the list of all available fields.
-Use separate lists of fields to add, remove or compact by repeating the -o option:
--o+field1,field2 -o-field3,field4 -o#field5.
-These lists are evaluated from left to right.
-Use field name \fBlv_all\fP to view all LV fields,
-\fBvg_all\fP all VG fields,
-\fBpv_all\fP all PV fields,
-\fBpvseg_all\fP all PV segment fields,
-\fBseg_all\fP all LV segment fields, and
-\fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
-See lvmreport(7) for more information about reporting.
-.ad b
-.HP
-.ad l
-\fB-P\fP|\fB--partial\fP
-.br
-When set, the tools will do their best to provide access to VGs
-that are only partially available (one or more PVs belonging
-to the VG are missing from the system). Metadata may not be
-changed with this option.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--readonly\fP
-.br
-Run the command in a special read-only mode which will read on-disk
-metadata without needing to take any locks. This can be used to peek
-inside metadata used by a virtual machine image while the virtual
-machine is running.
-It can also be used to peek inside the metadata of clustered VGs
-when clustered locking is not configured or running. No attempt
-will be made to communicate with the device-mapper kernel driver, so
-this option is unable to report whether or not LVs are
-actually in use.
-.ad b
-.HP
-.ad l
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
-.ad l
-\fB--segments\fP
-.br
-.ad b
-.HP
-.ad l
-\fB-S\fP|\fB--select\fP \fIString\fP
-.br
-Select objects for processing and reporting based on specified criteria.
-The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
-For reporting commands, one row is displayed for each object matching the criteria.
-See \fB--options help\fP for selectable object fields.
-Rows can be displayed with an additional "selected" field (-o selected)
-showing 1 if the row matches the selection and 0 otherwise.
-For non-reporting commands which process LVM entities, the selection is
-used to choose items to process.
-.ad b
-.HP
-.ad l
-\fB--separator\fP \fIString\fP
-.br
-String to use to separate each column. Useful if grepping the output.
-.ad b
-.HP
-.ad l
-\fB--shared\fP
-.br
-Report/display shared VGs that would otherwise be skipped when
-lvmlockd is not being used on the host.
-See lvmlockd(8) for more information about shared VGs.
-.ad b
-.HP
-.ad l
-\fB-O\fP|\fB--sort\fP \fIString\fP
-.br
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--unbuffered\fP
-.br
-Produce output immediately without sorting or aligning the columns properly.
-.ad b
-.HP
-.ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
-All sizes are output in these units:
-human-(r)eadable with '<' rounding indicator,
-(h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
-(g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024.
-Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fIVG\fP
-.br
-Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fILV\fP
-.br
-Logical Volume name.  See \fBlvm\fP(8) for valid names.
-An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fITag\fP
-.br
-Tag name.  See \fBlvm\fP(8) for information about tag names and using tags
-in place of a VG, LV or PV.
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvextend.8.end

@@ -1,4 +1,5 @@
 .SH EXAMPLES
+
 Extend the size of an LV by 54MiB, using a specific PV.
 .br
 .B lvextend \-L +54 vg01/lvol10 /dev/sdk3
@@ -12,3 +13,4 @@ space on PV /dev/sdk3. This is equivalent to specifying
 Extend an LV by 16MiB using specific physical extents.
 .br
 .B lvextend \-L+16m vg01/lvol01 /dev/sda:8\-9 /dev/sdb:8\-9
+

man/lvextend.8_pregen

@@ -1,712 +0,0 @@
-.TH LVEXTEND 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvextend \- Add space to a logical volume
-.
-.SH SYNOPSIS
-\fBlvextend\fP \fIoption_args\fP \fIposition_args\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.P
-.ad l
-    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
-.ad b
-.br
-.ad l
- \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.ad b
-.br
-.ad l
-    \fB--commandprofile\fP \fIString\fP
-.ad b
-.br
-.ad l
-    \fB--config\fP \fIString\fP
-.ad b
-.br
-.ad l
- \fB-d\fP|\fB--debug\fP
-.ad b
-.br
-.ad l
-    \fB--driverloaded\fP \fBy\fP|\fBn\fP
-.ad b
-.br
-.ad l
- \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
-.ad b
-.br
-.ad l
- \fB-f\fP|\fB--force\fP
-.ad b
-.br
-.ad l
- \fB-h\fP|\fB--help\fP
-.ad b
-.br
-.ad l
-    \fB--longhelp\fP
-.ad b
-.br
-.ad l
- \fB-m\fP|\fB--mirrors\fP \fINumber\fP
-.ad b
-.br
-.ad l
- \fB-n\fP|\fB--nofsck\fP
-.ad b
-.br
-.ad l
-    \fB--nosync\fP
-.ad b
-.br
-.ad l
-    \fB--noudevsync\fP
-.ad b
-.br
-.ad l
-    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.ad b
-.br
-.ad l
-    \fB--profile\fP \fIString\fP
-.ad b
-.br
-.ad l
- \fB-q\fP|\fB--quiet\fP
-.ad b
-.br
-.ad l
-    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.ad b
-.br
-.ad l
- \fB-r\fP|\fB--resizefs\fP
-.ad b
-.br
-.ad l
- \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.ad b
-.br
-.ad l
- \fB-i\fP|\fB--stripes\fP \fINumber\fP
-.ad b
-.br
-.ad l
- \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.ad b
-.br
-.ad l
- \fB-t\fP|\fB--test\fP
-.ad b
-.br
-.ad l
-    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBmirror\fP|\fBraid\fP|\fBthin\fP|\fBcache\fP|\fBthin-pool\fP|\fBcache-pool\fP
-.ad b
-.br
-.ad l
-    \fB--usepolicies\fP
-.ad b
-.br
-.ad l
- \fB-v\fP|\fB--verbose\fP
-.ad b
-.br
-.ad l
-    \fB--version\fP
-.ad b
-.br
-.ad l
- \fB-y\fP|\fB--yes\fP
-.ad b
-.SH DESCRIPTION
-lvextend extends the size of an LV. This requires allocating logical
-extents from the VG's free physical extents. If the extension adds a new
-LV segment, the new segment will use the existing segment type of the LV.
-
-Extending a copy\-on\-write snapshot LV adds space for COW blocks.
-
-Use \fBlvconvert\fP(8) to change the number of data images in a RAID or
-mirrored LV.
-
-In the usage section below, \fB--size\fP \fISize\fP can be replaced
-with \fB--extents\fP \fINumber\fP.  See both descriptions
-the options section.
-.SH USAGE
-Extend an LV by a specified size.
-.br
-.P
-\fBlvextend\fP \fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV\fP
-.br
-.RS 4
-.ad l
-[ \fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT] ]
-.ad b
-.br
-.ad l
-[ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
-.br
-.ad l
-[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-.ad l
-[    \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIPV\fP ... ]
-.RE
--
-
-Extend an LV by specified PV extents.
-.br
-.P
-\fBlvextend\fP \fILV\fP \fIPV\fP ...
-.br
-.RS 4
-.ad l
-[ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
-.br
-.ad l
-[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
--
-
-Extend a pool metadata SubLV by a specified size.
-.br
-.P
-\fBlvextend\fP \fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT] \fILV\fP\fI_thinpool\fP
-.br
-.RS 4
-.ad l
-[ \fB-i\fP|\fB--stripes\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT] ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIPV\fP ... ]
-.RE
--
-
-Extend an LV according to a predefined policy.
-.br
-.P
-\fBlvextend\fP \fB--usepolicies\fP \fILV\fP\fI_snapshot_thinpool\fP
-.br
-.RS 4
-.ad l
-[ \fB-r\fP|\fB--resizefs\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIPV\fP ... ]
-.RE
--
-
-Common options for command:
-.
-.RS 4
-.ad l
-[ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[ \fB-f\fP|\fB--force\fP ]
-.ad b
-.br
-.ad l
-[ \fB-m\fP|\fB--mirrors\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[ \fB-n\fP|\fB--nofsck\fP ]
-.ad b
-.br
-.ad l
-[    \fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP ]
-.ad b
-.br
-.ad l
-[    \fB--nosync\fP ]
-.ad b
-.br
-.ad l
-[    \fB--noudevsync\fP ]
-.ad b
-.br
-.ad l
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
-.br
-.ad l
-[    \fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBmirror\fP|\fBraid\fP|\fBthin\fP|\fBcache\fP|\fBthin-pool\fP|\fBcache-pool\fP ]
-.ad b
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--alloc\fP \fBcontiguous\fP|\fBcling\fP|\fBcling_by_tags\fP|\fBnormal\fP|\fBanywhere\fP|\fBinherit\fP
-.br
-Determines the allocation policy when a command needs to allocate
-Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy
-which can be changed with vgchange/lvchange, or overriden on the
-command line.
-\fBnormal\fP applies common sense rules such as not placing parallel stripes
-on the same PV.
-\fBinherit\fP applies the VG policy to an LV.
-\fBcontiguous\fP requires new PEs be placed adjacent to existing PEs.
-\fBcling\fP places new PEs on the same PV as existing PEs in the same
-stripe of the LV.
-If there are sufficient PEs for an allocation, but normal does not
-use them, \fBanywhere\fP will use them even if it reduces performance,
-e.g. by placing two stripes on the same PV.
-Optional positional PV args on the command line can also be used to limit
-which PVs the command will use for allocation.
-See \fBlvm\fP(8) for more information about allocation.
-.ad b
-.HP
-.ad l
-\fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.br
-Specifies if metadata should be backed up automatically after a change.
-Enabling this is strongly advised! See vgcfgbackup(8) for more information.
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB-l\fP|\fB--extents\fP [\fB+\fP]\fINumber\fP[PERCENT]
-.br
-Specifies the new size of the LV in logical extents.
-The --size and --extents options are alternate methods of specifying size.
-The total number of physical extents used will be
-greater when redundant data is needed for RAID levels.
-An alternate syntax allows the size to be determined indirectly
-as a percentage of the size of a related VG, LV, or set of PVs. The
-suffix \fB%VG\fP denotes the total size of the VG, the suffix \fB%FREE\fP
-the remaining free space in the VG, and the suffix \fB%PVS\fP the free
-space in the specified PVs.  For a snapshot, the size
-can be expressed as a percentage of the total size of the origin LV
-with the suffix \fB%ORIGIN\fP (\fB100%ORIGIN\fP provides space for
-the whole origin).
-When expressed as a percentage, the size defines an upper limit for the
-number of logical extents in the new LV. The precise number of logical
-extents in the new LV is not determined until the command has completed.
-When the plus \fB+\fP or minus \fB-\fP prefix is used,
-the value is not an absolute size, but is relative and added or subtracted
-from the current size.
-.ad b
-.HP
-.ad l
-\fB-f\fP|\fB--force\fP ...
-.br
-Override various checks, confirmations and protections.
-Use with extreme caution.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB-m\fP|\fB--mirrors\fP \fINumber\fP
-.br
-Not used.
-.ad b
-.HP
-.ad l
-\fB-n\fP|\fB--nofsck\fP
-.br
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use --force to proceed with
-this option.
-.ad b
-.HP
-.ad l
-\fB--nosync\fP
-.br
-Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
-initial synchronization. In case of mirror, raid1 and raid10, any data
-written afterwards will be mirrored, but the original contents will not be
-copied. In case of raid4 and raid5, no parity blocks will be written,
-though any data written afterwards will cause parity blocks to be stored.
-This is useful for skipping a potentially long and resource intensive initial
-sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.
-This option is not valid for raid6, because raid6 relies on proper parity
-(P and Q Syndromes) being created during initial synchronization in order
-to reconstruct proper user date in case of device failures.
-raid0 and raid0_meta do not provide any data copies or parity support
-and thus do not support initial synchronization.
-.ad b
-.HP
-.ad l
-\fB--noudevsync\fP
-.br
-Disables udev synchronisation. The process will not wait for notification
-from udev. It will continue irrespective of any possible udev processing
-in the background. Only use this if udev is not running or has rules that
-ignore the devices LVM creates.
-.ad b
-.HP
-.ad l
-\fB--poolmetadatasize\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.br
-Specifies the new size of the pool metadata LV.
-The plus prefix \fB+\fP can be used, in which case
-the value is added to the current size.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
-.ad l
-\fB-r\fP|\fB--resizefs\fP
-.br
-Resize underlying filesystem together with the LV using fsadm(8).
-.ad b
-.HP
-.ad l
-\fB-L\fP|\fB--size\fP [\fB+\fP]\fISize\fP[m|UNIT]
-.br
-Specifies the new size of the LV.
-The --size and --extents options are alternate methods of specifying size.
-The total number of physical extents used will be
-greater when redundant data is needed for RAID levels.
-When the plus \fB+\fP or minus \fB-\fP prefix is used,
-the value is not an absolute size, but is relative and added or subtracted
-from the current size.
-.ad b
-.HP
-.ad l
-\fB-i\fP|\fB--stripes\fP \fINumber\fP
-.br
-Specifies the number of stripes in a striped LV. This is the number of
-PVs (devices) that a striped LV is spread across. Data that
-appears sequential in the LV is spread across multiple devices in units of
-the stripe size (see --stripesize). This does not change existing
-allocated space, but only applies to space being allocated by the command.
-When creating a RAID 4/5/6 LV, this number does not include the extra
-devices that are required for parity. The largest number depends on
-the RAID type (raid0: 64, raid10: 32, raid4/5: 63, raid6: 62), and
-when unspecified, the default depends on the RAID type
-(raid0: 2, raid10: 4, raid4/5: 3, raid6: 5.)
-To stripe a new raid LV across all PVs by default,
-see lvm.conf allocation/raid_stripe_all_devices.
-.ad b
-.HP
-.ad l
-\fB-I\fP|\fB--stripesize\fP \fISize\fP[k|UNIT]
-.br
-The amount of data that is written to one device before
-moving to the next in a striped LV.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--type\fP \fBlinear\fP|\fBstriped\fP|\fBsnapshot\fP|\fBmirror\fP|\fBraid\fP|\fBthin\fP|\fBcache\fP|\fBthin-pool\fP|\fBcache-pool\fP
-.br
-The LV type, also known as "segment type" or "segtype".
-See usage descriptions for the specific ways to use these types.
-For more information about redundancy and performance (\fBraid\fP<N>, \fBmirror\fP, \fBstriped\fP, \fBlinear\fP) see \fBlvmraid\fP(7).
-For thin provisioning (\fBthin\fP, \fBthin-pool\fP) see \fBlvmthin\fP(7).
-For performance caching (\fBcache\fP, \fBcache-pool\fP) see \fBlvmcache\fP(7).
-For copy-on-write snapshots (\fBsnapshot\fP) see usage definitions.
-Several commands omit an explicit type option because the type
-is inferred from other options or shortcuts
-(e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache).
-Use inferred types with care because it can lead to unexpected results.
-.ad b
-.HP
-.ad l
-\fB--usepolicies\fP
-.br
-Perform an operation according to the policy configured in lvm.conf
-or a profile.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fILV\fP
-.br
-Logical Volume name.  See \fBlvm\fP(8) for valid names.
-An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-LV followed by _<type> indicates that an LV of the
-given type is required. (raid represents raid<N> type)
-.HP
-\fIPV\fP
-.br
-Physical Volume name, a device path under /dev.
-For commands managing physical extents, a PV positional arg
-generally accepts a suffix indicating a range (or multiple ranges)
-of physical extents (PEs). When the first PE is omitted, it defaults
-to the start of the device, and when the last PE is omitted it defaults to end.
-Start and end range (inclusive): \fIPV\fP[\fB:\fP\fIPE\fP\fB-\fP\fIPE\fP]...
-Start and length range (counting from 0): \fIPV\fP[\fB:\fP\fIPE\fP\fB+\fP\fIPE\fP]...
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH EXAMPLES
-Extend the size of an LV by 54MiB, using a specific PV.
-.br
-.B lvextend \-L +54 vg01/lvol10 /dev/sdk3
-
-Extend the size of an LV by the amount of free
-space on PV /dev/sdk3. This is equivalent to specifying
-"\-l +100%PVS" on the command line.
-.br
-.B lvextend vg01/lvol01 /dev/sdk3
-
-Extend an LV by 16MiB using specific physical extents.
-.br
-.B lvextend \-L+16m vg01/lvol01 /dev/sda:8\-9 /dev/sdb:8\-9
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvm-config.8_pregen

@@ -1,471 +0,0 @@
-.TH LVM CONFIG 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvm config \- Display and manipulate configuration information
-.
-.SH SYNOPSIS
-\fBlvm config\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.SH DESCRIPTION
-This command is the same as \fBlvmconfig\fP(8).
-
-lvm config produces formatted output from the LVM configuration tree. The
-sources of the configuration data include \fBlvm.conf\fP(5) and command
-line settings from \-\-config.
-.SH USAGE
-\fBlvm config\fP
-.br
-.RS 4
-.ad l
-[ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-l\fP|\fB--list\fP ]
-.ad b
-.br
-.ad l
-[    \fB--atversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreadvanced\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignorelocal\fP ]
-.ad b
-.br
-.ad l
-[    \fB--mergedconfig\fP ]
-.ad b
-.br
-.ad l
-[    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--sinceversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showdeprecated\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--validate\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withsummary\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withcomments\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withspaces\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unconfigured\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withversions\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIString\fP ... ]
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--atversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-When configuration is displayed, the configuration settings recognized
-at this LVM version will be considered only. This can be used
-to display a configuration that a certain LVM version understands and
-which does not contain any newer settings for which LVM would
-issue a warning message when checking the configuration.
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB-f\fP|\fB--file\fP \fIString\fP
-.br
-Write output to the named file.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB--ignoreadvanced\fP
-.br
-Exclude advanced configuration settings from the output.
-.ad b
-.HP
-.ad l
-\fB--ignorelocal\fP
-.br
-Ignore local section.
-.ad b
-.HP
-.ad l
-\fB--ignoreunsupported\fP
-.br
-Exclude unsupported configuration settings from the output. These settings are
-either used for debugging and development purposes only or their support is not
-yet complete and they are not meant to be used in production. The \fBcurrent\fP
-and \fBdiff\fP types include unsupported settings in their output by default,
-all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB-l\fP|\fB--list\fP
-.br
-List config settings with summarizing comment. This is the same as using
-options --typeconfig list --withsummary.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB--mergedconfig\fP
-.br
-When the command is run with --config
-and/or --commandprofile (or using LVM_COMMAND_PROFILE
-environment variable), --profile, or --metadataprofile,
-merge all the contents of the "config cascade" before displaying it.
-Without merging, only the configuration at the front of the
-cascade is displayed.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB--metadataprofile\fP \fIString\fP
-.br
-The metadata profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--showdeprecated\fP
-.br
-Include deprecated configuration settings in the output. These settings
-are deprecated after a certain version. If a concrete version is specified
-with --atversion, deprecated settings are automatically included
-if the specified version is lower than the version in which the settings were
-deprecated. The current and diff types include deprecated settings
-in their output by default, all the other types ignore deprecated settings.
-.ad b
-.HP
-.ad l
-\fB--showunsupported\fP
-.br
-Include unsupported configuration settings in the output. These settings
-are either used for debugging or development purposes only, or their support
-is not yet complete and they are not meant to be used in production. The
-current and diff types include unsupported settings in their
-output by default, all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB--sinceversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-This option is currently applicable only with --typeconfig new
-to display all configuration settings introduced since given version.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP
-.br
-See lvmreport(7).
-.ad b
-.HP
-.ad l
-\fB--unconfigured\fP
-.br
-Internal option used for generating config file during build.
-.ad b
-.HP
-.ad l
-\fB--validate\fP
-.br
-Validate current configuration used and exit with appropriate
-return code. The validation is done only for the configuration
-at the front of the "config cascade". To validate the whole
-merged configuration tree, also use --mergedconfig.
-The validation is done even if lvm.conf config/checks is disabled.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB--withcomments\fP
-.br
-Display a full comment for each configuration node. For deprecated
-settings, also display comments about deprecation.
-.ad b
-.HP
-.ad l
-\fB--withspaces\fP
-.br
-Where appropriate, add more spaces in output for better readability.
-.ad b
-.HP
-.ad l
-\fB--withsummary\fP
-.br
-Display a one line comment for each configuration node.
-.ad b
-.HP
-.ad l
-\fB--withversions\fP
-.br
-Also display a comment containing the version of introduction for
-each configuration node. If the setting is deprecated, also display
-the version since which it is deprecated.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvm-dumpconfig.8_pregen

@@ -1,471 +0,0 @@
-.TH LVM DUMPCONFIG 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvm dumpconfig \- Display and manipulate configuration information
-.
-.SH SYNOPSIS
-\fBlvm dumpconfig\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.SH DESCRIPTION
-This command is the same as \fBlvmconfig\fP(8).
-
-lvm dumpconfig produces formatted output from the LVM configuration tree. The
-sources of the configuration data include \fBlvm.conf\fP(5) and command
-line settings from \-\-config.
-.SH USAGE
-\fBlvm dumpconfig\fP
-.br
-.RS 4
-.ad l
-[ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-l\fP|\fB--list\fP ]
-.ad b
-.br
-.ad l
-[    \fB--atversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreadvanced\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignorelocal\fP ]
-.ad b
-.br
-.ad l
-[    \fB--mergedconfig\fP ]
-.ad b
-.br
-.ad l
-[    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--sinceversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showdeprecated\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--validate\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withsummary\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withcomments\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withspaces\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unconfigured\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withversions\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIString\fP ... ]
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--atversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-When configuration is displayed, the configuration settings recognized
-at this LVM version will be considered only. This can be used
-to display a configuration that a certain LVM version understands and
-which does not contain any newer settings for which LVM would
-issue a warning message when checking the configuration.
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB-f\fP|\fB--file\fP \fIString\fP
-.br
-Write output to the named file.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB--ignoreadvanced\fP
-.br
-Exclude advanced configuration settings from the output.
-.ad b
-.HP
-.ad l
-\fB--ignorelocal\fP
-.br
-Ignore local section.
-.ad b
-.HP
-.ad l
-\fB--ignoreunsupported\fP
-.br
-Exclude unsupported configuration settings from the output. These settings are
-either used for debugging and development purposes only or their support is not
-yet complete and they are not meant to be used in production. The \fBcurrent\fP
-and \fBdiff\fP types include unsupported settings in their output by default,
-all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB-l\fP|\fB--list\fP
-.br
-List config settings with summarizing comment. This is the same as using
-options --typeconfig list --withsummary.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB--mergedconfig\fP
-.br
-When the command is run with --config
-and/or --commandprofile (or using LVM_COMMAND_PROFILE
-environment variable), --profile, or --metadataprofile,
-merge all the contents of the "config cascade" before displaying it.
-Without merging, only the configuration at the front of the
-cascade is displayed.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB--metadataprofile\fP \fIString\fP
-.br
-The metadata profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--showdeprecated\fP
-.br
-Include deprecated configuration settings in the output. These settings
-are deprecated after a certain version. If a concrete version is specified
-with --atversion, deprecated settings are automatically included
-if the specified version is lower than the version in which the settings were
-deprecated. The current and diff types include deprecated settings
-in their output by default, all the other types ignore deprecated settings.
-.ad b
-.HP
-.ad l
-\fB--showunsupported\fP
-.br
-Include unsupported configuration settings in the output. These settings
-are either used for debugging or development purposes only, or their support
-is not yet complete and they are not meant to be used in production. The
-current and diff types include unsupported settings in their
-output by default, all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB--sinceversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-This option is currently applicable only with --typeconfig new
-to display all configuration settings introduced since given version.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP
-.br
-See lvmreport(7).
-.ad b
-.HP
-.ad l
-\fB--unconfigured\fP
-.br
-Internal option used for generating config file during build.
-.ad b
-.HP
-.ad l
-\fB--validate\fP
-.br
-Validate current configuration used and exit with appropriate
-return code. The validation is done only for the configuration
-at the front of the "config cascade". To validate the whole
-merged configuration tree, also use --mergedconfig.
-The validation is done even if lvm.conf config/checks is disabled.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB--withcomments\fP
-.br
-Display a full comment for each configuration node. For deprecated
-settings, also display comments about deprecation.
-.ad b
-.HP
-.ad l
-\fB--withspaces\fP
-.br
-Where appropriate, add more spaces in output for better readability.
-.ad b
-.HP
-.ad l
-\fB--withsummary\fP
-.br
-Display a one line comment for each configuration node.
-.ad b
-.HP
-.ad l
-\fB--withversions\fP
-.br
-Also display a comment containing the version of introduction for
-each configuration node. If the setting is deprecated, also display
-the version since which it is deprecated.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvm-fullreport.8_pregen

@@ -1,565 +0,0 @@
-.TH LVM FULLREPORT 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvm fullreport \- Display full report
-.
-.SH SYNOPSIS
-\fBlvm fullreport\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.SH DESCRIPTION
-lvm fullreport produces formatted output about PVs, PV segments, VGs, LVs
-and LV segments. The information is all gathered together for each VG
-(under a per-VG lock) so it is consistent. Information gathered from
-separate calls to \fBvgs\fP, \fBpvs\fP, and \fBlvs\fP can be inconsistent
-if information changes between commands.
-
-.SH USAGE
-\fBlvm fullreport\fP
-.br
-.RS 4
-.ad l
-[ \fB-a\fP|\fB--all\fP ]
-.ad b
-.br
-.ad l
-[ \fB-o\fP|\fB--options\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-P\fP|\fB--partial\fP ]
-.ad b
-.br
-.ad l
-[ \fB-S\fP|\fB--select\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-O\fP|\fB--sort\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--aligned\fP ]
-.ad b
-.br
-.ad l
-[    \fB--binary\fP ]
-.ad b
-.br
-.ad l
-[    \fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP ]
-.ad b
-.br
-.ad l
-[    \fB--foreign\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignorelockingfailure\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
-[    \fB--logonly\fP ]
-.ad b
-.br
-.ad l
-[    \fB--nameprefixes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--noheadings\fP ]
-.ad b
-.br
-.ad l
-[    \fB--nolocking\fP ]
-.ad b
-.br
-.ad l
-[    \fB--nosuffix\fP ]
-.ad b
-.br
-.ad l
-[    \fB--readonly\fP ]
-.ad b
-.br
-.ad l
-[    \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
-.ad b
-.br
-.ad l
-[    \fB--rows\fP ]
-.ad b
-.br
-.ad l
-[    \fB--separator\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--shared\fP ]
-.ad b
-.br
-.ad l
-[    \fB--trustcache\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unbuffered\fP ]
-.ad b
-.br
-.ad l
-[    \fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unquoted\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIVG\fP ... ]
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--aligned\fP
-.br
-Use with --separator to align the output columns
-.ad b
-.HP
-.ad l
-\fB-a\fP|\fB--all\fP
-.br
-.ad b
-.HP
-.ad l
-\fB--binary\fP
-.br
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB--configreport\fP \fBlog\fP|\fBvg\fP|\fBlv\fP|\fBpv\fP|\fBpvseg\fP|\fBseg\fP
-.br
-See lvmreport(7).
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB--foreign\fP
-.br
-Report/display foreign VGs that would otherwise be skipped.
-See lvmsystemid(7) for more information about foreign VGs.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB--ignorelockingfailure\fP
-.br
-Allows a command to continue with read-only metadata
-operations after locking failures.
-.ad b
-.HP
-.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
-\fB--logonly\fP
-.br
-Suppress command report and display only log report.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB--nameprefixes\fP
-.br
-Add an "LVM2_" prefix plus the field name to the output. Useful
-with --noheadings to produce a list of field=value pairs that can
-be used to set environment variables (for example, in udev rules).
-.ad b
-.HP
-.ad l
-\fB--noheadings\fP
-.br
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.ad b
-.HP
-.ad l
-\fB--nolocking\fP
-.br
-Disable locking.
-.ad b
-.HP
-.ad l
-\fB--nosuffix\fP
-.br
-Suppress the suffix on output sizes. Use with --units
-(except h and H) if processing the output.
-.ad b
-.HP
-.ad l
-\fB-o\fP|\fB--options\fP \fIString\fP
-.br
-Comma-separated, ordered list of fields to display in columns.
-String arg syntax is: [+|-|#]Field1[,Field2 ...]
-The prefix \fB+\fP will append the specified fields to the default fields,
-\fB-\fP will remove the specified fields from the default fields, and
-\fB#\fP will compact specified fields (removing them when empty for all rows.)
-Use \fB-o help\fP to view the list of all available fields.
-Use separate lists of fields to add, remove or compact by repeating the -o option:
--o+field1,field2 -o-field3,field4 -o#field5.
-These lists are evaluated from left to right.
-Use field name \fBlv_all\fP to view all LV fields,
-\fBvg_all\fP all VG fields,
-\fBpv_all\fP all PV fields,
-\fBpvseg_all\fP all PV segment fields,
-\fBseg_all\fP all LV segment fields, and
-\fBpvseg_all\fP all PV segment columns.
-See the lvm.conf report section for more config options.
-See lvmreport(7) for more information about reporting.
-.ad b
-.HP
-.ad l
-\fB-P\fP|\fB--partial\fP
-.br
-When set, the tools will do their best to provide access to VGs
-that are only partially available (one or more PVs belonging
-to the VG are missing from the system). Metadata may not be
-changed with this option.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--readonly\fP
-.br
-Run the command in a special read-only mode which will read on-disk
-metadata without needing to take any locks. This can be used to peek
-inside metadata used by a virtual machine image while the virtual
-machine is running.
-It can also be used to peek inside the metadata of clustered VGs
-when clustered locking is not configured or running. No attempt
-will be made to communicate with the device-mapper kernel driver, so
-this option is unable to report whether or not LVs are
-actually in use.
-.ad b
-.HP
-.ad l
-\fB--reportformat\fP \fBbasic\fP|\fBjson\fP
-.br
-Overrides current output format for reports which is defined globally by
-the report/output_format setting in lvm.conf.
-\fBbasic\fP is the original format with columns and rows.
-If there is more than one report per command, each report is prefixed
-with the report name for identification. \fBjson\fP produces report
-output in JSON format. See \fBlvmreport\fP(7) for more information.
-.ad b
-.HP
-.ad l
-\fB--rows\fP
-.br
-Output columns as rows.
-.ad b
-.HP
-.ad l
-\fB-S\fP|\fB--select\fP \fIString\fP
-.br
-Select objects for processing and reporting based on specified criteria.
-The criteria syntax is described by \fB--select help\fP and \fBlvmreport\fP(7).
-For reporting commands, one row is displayed for each object matching the criteria.
-See \fB--options help\fP for selectable object fields.
-Rows can be displayed with an additional "selected" field (-o selected)
-showing 1 if the row matches the selection and 0 otherwise.
-For non-reporting commands which process LVM entities, the selection is
-used to choose items to process.
-.ad b
-.HP
-.ad l
-\fB--separator\fP \fIString\fP
-.br
-String to use to separate each column. Useful if grepping the output.
-.ad b
-.HP
-.ad l
-\fB--shared\fP
-.br
-Report/display shared VGs that would otherwise be skipped when
-lvmlockd is not being used on the host.
-See lvmlockd(8) for more information about shared VGs.
-.ad b
-.HP
-.ad l
-\fB-O\fP|\fB--sort\fP \fIString\fP
-.br
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with \fB-\fP for a reverse sort on that column.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--trustcache\fP
-.br
-Avoids certain device scanning during command processing. Do not use.
-.ad b
-.HP
-.ad l
-\fB--unbuffered\fP
-.br
-Produce output immediately without sorting or aligning the columns properly.
-.ad b
-.HP
-.ad l
-\fB--units\fP \fBr\fP|\fBR\fP|\fBh\fP|\fBH\fP|\fBb\fP|\fBB\fP|\fBs\fP|\fBS\fP|\fBk\fP|\fBK\fP|\fBm\fP|\fBM\fP|\fBg\fP|\fBG\fP|\fBt\fP|\fBT\fP|\fBp\fP|\fBP\fP|\fBe\fP|\fBE\fP
-.br
-All sizes are output in these units:
-human-(r)eadable with '<' rounding indicator,
-(h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,
-(g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024.
-Custom units can be specified, e.g. --units 3M.
-.ad b
-.HP
-.ad l
-\fB--unquoted\fP
-.br
-When used with --nameprefixes, output values in the field=value
-pairs are not quoted.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fIVG\fP
-.br
-Volume Group name.  See \fBlvm\fP(8) for valid names.
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvm-lvpoll.8.end

@@ -4,6 +4,7 @@ To find the name of the pvmove LV that was created by an original
 \fBpvmove /dev/name\fP command, use the command:
 .br
 \fBlvs -a -S move_pv=/dev/name\fP.
+
 .SH EXAMPLES
 
 Continue polling a pvmove operation.
@@ -29,3 +30,4 @@ Continue snapshot merge.
 Continue thin snapshot merge.
 .br
 .B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
+

man/lvm-lvpoll.8_pregen

@@ -1,332 +0,0 @@
-.TH LVM LVPOLL 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvm lvpoll \- Continue already initiated poll operation on a logical volume
-.
-.SH SYNOPSIS
-\fBlvm lvpoll\fP \fIoption_args\fP \fIposition_args\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-.SH DESCRIPTION
-lvm lvpoll is an internal command used by \fBlvmpolld\fP(8) to monitor and
-complete \fBlvconvert\fP(8) and \fBpvmove\fP(8) operations. lvpoll itself
-does not initiate these operations and should not normally need to be run
-directly.
-.SH USAGE
-\fBlvm lvpoll\fP \fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP \fILV\fP ...
-.br
-.RS 4
-.ad l
-[ \fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[ \fB-i\fP|\fB--interval\fP \fINumber\fP ]
-.ad b
-.br
-.ad l
-[    \fB--abort\fP ]
-.ad b
-.br
-.ad l
-[    \fB--handlemissingpvs\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--abort\fP
-.br
-Stop processing a poll operation in lvmpolld.
-.ad b
-.HP
-.ad l
-\fB-A\fP|\fB--autobackup\fP \fBy\fP|\fBn\fP
-.br
-Specifies if metadata should be backed up automatically after a change.
-Enabling this is strongly advised! See vgcfgbackup(8) for more information.
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB--handlemissingpvs\fP
-.br
-Allows a polling operation to continue when PVs are missing,
-e.g. for repairs due to faulty devices.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB-i\fP|\fB--interval\fP \fINumber\fP
-.br
-Report progress at regular intervals.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
-.br
-The command to perform from lvmpolld.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fILV\fP
-.br
-Logical Volume name.  See \fBlvm\fP(8) for valid names.
-An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH NOTES
-
-To find the name of the pvmove LV that was created by an original
-\fBpvmove /dev/name\fP command, use the command:
-.br
-\fBlvs -a -S move_pv=/dev/name\fP.
-.SH EXAMPLES
-
-Continue polling a pvmove operation.
-.br
-.B lvm lvpoll --polloperation pvmove vg00/pvmove0
-
-Abort a pvmove operation.
-.br
-.B lvm lvpoll --polloperation pvmove --abort vg00/pvmove0
-
-Continue polling a mirror conversion.
-.br
-.B lvm lvpoll --polloperation convert vg00/lvmirror
-
-Continue mirror repair.
-.br
-.B lvm lvpoll --polloperation convert vg/damaged_mirror --handlemissingpvs
-
-Continue snapshot merge.
-.br
-.B lvm lvpoll --polloperation merge vg/snapshot_old
-
-Continue thin snapshot merge.
-.br
-.B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)

man/lvm.8.in

@@ -82,6 +82,9 @@ if command log reporting is enabled.
 .B lvpoll
 Complete lvmpolld operations (Internal command).
 .TP
+.B pvdata
+Not implemented in LVM2.
+.TP
 .B segtypes
 Display recognised Logical Volume segment types.
 .TP
@@ -202,6 +205,9 @@ Display attributes of a Logical Volume.
 .B lvextend
 Extend the size of a Logical Volume.
 .TP
+.B lvmchange
+Change attributes of the Logical Volume Manager.
+.TP
 .B lvmconfig
 Display the configuration information after
 loading \fBlvm.conf\fP(5) and any other configuration files.
@@ -231,10 +237,9 @@ Report information about Logical Volumes.
 Scan (all disks) for Logical Volumes.
 .PD
 .P
-The following LVM1 commands are not implemented in LVM2:
-.BR lvmchange ", " lvmsadc ", " lvmsar ", " pvdata .
-For performance metrics, use \fBdmstats\fP(8) or to manipulate the kernel
-device-mapper driver used by LVM2 directly, use \fBdmsetup\fP(8).
+The following commands are not implemented in LVM2 but might be
+in the future:
+.BR lvmsadc ", " lvmsar ", " pvdata .
 .
 .SH VALID NAMES
 .
@@ -545,5 +550,4 @@ directly.
 .BR lvmcache (7)
 
 .BR dmsetup (8),
-.BR dmstats (8),
 .BR readline (3)

man/lvmconfig.8_pregen

@@ -1,469 +0,0 @@
-.TH LVMCONFIG 8 "LVM TOOLS 2.02.169(2)-git (2016-11-30)" "Red Hat, Inc."
-.SH NAME
-lvmconfig \- Display and manipulate configuration information
-.
-.SH SYNOPSIS
-\fBlvmconfig\fP
-.br
-    [ \fIoption_args\fP ]
-.br
-    [ \fIposition_args\fP ]
-.br
-.SH DESCRIPTION
-lvmconfig produces formatted output from the LVM configuration tree. The
-sources of the configuration data include \fBlvm.conf\fP(5) and command
-line settings from \-\-config.
-.SH USAGE
-\fBlvmconfig\fP
-.br
-.RS 4
-.ad l
-[ \fB-f\fP|\fB--file\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[ \fB-l\fP|\fB--list\fP ]
-.ad b
-.br
-.ad l
-[    \fB--atversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreadvanced\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignoreunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--ignorelocal\fP ]
-.ad b
-.br
-.ad l
-[    \fB--mergedconfig\fP ]
-.ad b
-.br
-.ad l
-[    \fB--metadataprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--sinceversion\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showdeprecated\fP ]
-.ad b
-.br
-.ad l
-[    \fB--showunsupported\fP ]
-.ad b
-.br
-.ad l
-[    \fB--validate\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withsummary\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withcomments\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withspaces\fP ]
-.ad b
-.br
-.ad l
-[    \fB--unconfigured\fP ]
-.ad b
-.br
-.ad l
-[    \fB--withversions\fP ]
-.ad b
-.br
-[ COMMON_OPTIONS ]
-.RE
-.br
-.RS 4
-[ \fIString\fP ... ]
-.RE
-
-Common options for lvm:
-.
-.RS 4
-.ad l
-[ \fB-d\fP|\fB--debug\fP ]
-.ad b
-.br
-.ad l
-[ \fB-h\fP|\fB--help\fP ]
-.ad b
-.br
-.ad l
-[ \fB-q\fP|\fB--quiet\fP ]
-.ad b
-.br
-.ad l
-[ \fB-t\fP|\fB--test\fP ]
-.ad b
-.br
-.ad l
-[ \fB-v\fP|\fB--verbose\fP ]
-.ad b
-.br
-.ad l
-[ \fB-y\fP|\fB--yes\fP ]
-.ad b
-.br
-.ad l
-[    \fB--commandprofile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--config\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--driverloaded\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
-[    \fB--longhelp\fP ]
-.ad b
-.br
-.ad l
-[    \fB--profile\fP \fIString\fP ]
-.ad b
-.br
-.ad l
-[    \fB--version\fP ]
-.ad b
-.RE
-.SH OPTIONS
-.HP
-.ad l
-\fB--atversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-When configuration is displayed, the configuration settings recognized
-at this LVM version will be considered only. This can be used
-to display a configuration that a certain LVM version understands and
-which does not contain any newer settings for which LVM would
-issue a warning message when checking the configuration.
-.ad b
-.HP
-.ad l
-\fB--commandprofile\fP \fIString\fP
-.br
-The command profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--config\fP \fIString\fP
-.br
-Config settings for the command. These override lvm.conf settings.
-The String arg uses the same format as lvm.conf,
-or may use section/field syntax.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB-d\fP|\fB--debug\fP ...
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-.ad b
-.HP
-.ad l
-\fB--driverloaded\fP \fBy\fP|\fBn\fP
-.br
-If set to no, the command will not attempt to use device-mapper.
-For testing and debugging.
-.ad b
-.HP
-.ad l
-\fB-f\fP|\fB--file\fP \fIString\fP
-.br
-Write output to the named file.
-.ad b
-.HP
-.ad l
-\fB-h\fP|\fB--help\fP
-.br
-Display help text.
-.ad b
-.HP
-.ad l
-\fB--ignoreadvanced\fP
-.br
-Exclude advanced configuration settings from the output.
-.ad b
-.HP
-.ad l
-\fB--ignorelocal\fP
-.br
-Ignore local section.
-.ad b
-.HP
-.ad l
-\fB--ignoreunsupported\fP
-.br
-Exclude unsupported configuration settings from the output. These settings are
-either used for debugging and development purposes only or their support is not
-yet complete and they are not meant to be used in production. The \fBcurrent\fP
-and \fBdiff\fP types include unsupported settings in their output by default,
-all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB-l\fP|\fB--list\fP
-.br
-List config settings with summarizing comment. This is the same as using
-options --typeconfig list --withsummary.
-.ad b
-.HP
-.ad l
-\fB--longhelp\fP
-.br
-Display long help text.
-.ad b
-.HP
-.ad l
-\fB--mergedconfig\fP
-.br
-When the command is run with --config
-and/or --commandprofile (or using LVM_COMMAND_PROFILE
-environment variable), --profile, or --metadataprofile,
-merge all the contents of the "config cascade" before displaying it.
-Without merging, only the configuration at the front of the
-cascade is displayed.
-See \fBlvm.conf\fP(5) for more information about config.
-.ad b
-.HP
-.ad l
-\fB--metadataprofile\fP \fIString\fP
-.br
-The metadata profile to use for command configuration.
-See \fBlvm.conf\fP(5) for more information about profiles.
-.ad b
-.HP
-.ad l
-\fB--profile\fP \fIString\fP
-.br
-An alias for --commandprofile or --metadataprofile, depending
-on the command.
-.ad b
-.HP
-.ad l
-\fB-q\fP|\fB--quiet\fP ...
-.br
-Suppress output and log messages. Overrides --debug and --verbose.
-Repeat once to also suppress any prompts with answer no.
-.ad b
-.HP
-.ad l
-\fB--showdeprecated\fP
-.br
-Include deprecated configuration settings in the output. These settings
-are deprecated after a certain version. If a concrete version is specified
-with --atversion, deprecated settings are automatically included
-if the specified version is lower than the version in which the settings were
-deprecated. The current and diff types include deprecated settings
-in their output by default, all the other types ignore deprecated settings.
-.ad b
-.HP
-.ad l
-\fB--showunsupported\fP
-.br
-Include unsupported configuration settings in the output. These settings
-are either used for debugging or development purposes only, or their support
-is not yet complete and they are not meant to be used in production. The
-current and diff types include unsupported settings in their
-output by default, all the other types ignore unsupported settings.
-.ad b
-.HP
-.ad l
-\fB--sinceversion\fP \fIString\fP
-.br
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-This option is currently applicable only with --typeconfig new
-to display all configuration settings introduced since given version.
-.ad b
-.HP
-.ad l
-\fB-t\fP|\fB--test\fP
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.ad b
-.HP
-.ad l
-\fB--typeconfig\fP \fBcurrent\fP|\fBdefault\fP|\fBdiff\fP|\fBfull\fP|\fBlist\fP|\fBmissing\fP|\fBnew\fP|\fBprofilable\fP|\fBprofilable-command\fP|\fBprofilable-metadata\fP
-.br
-See lvmreport(7).
-.ad b
-.HP
-.ad l
-\fB--unconfigured\fP
-.br
-Internal option used for generating config file during build.
-.ad b
-.HP
-.ad l
-\fB--validate\fP
-.br
-Validate current configuration used and exit with appropriate
-return code. The validation is done only for the configuration
-at the front of the "config cascade". To validate the whole
-merged configuration tree, also use --mergedconfig.
-The validation is done even if lvm.conf config/checks is disabled.
-.ad b
-.HP
-.ad l
-\fB-v\fP|\fB--verbose\fP ...
-.br
-Set verbose level. Repeat from 1 to 4 times to increase the detail
-of messages sent to stdout and stderr.
-.ad b
-.HP
-.ad l
-\fB--version\fP
-.br
-Display version information.
-.ad b
-.HP
-.ad l
-\fB--withcomments\fP
-.br
-Display a full comment for each configuration node. For deprecated
-settings, also display comments about deprecation.
-.ad b
-.HP
-.ad l
-\fB--withspaces\fP
-.br
-Where appropriate, add more spaces in output for better readability.
-.ad b
-.HP
-.ad l
-\fB--withsummary\fP
-.br
-Display a one line comment for each configuration node.
-.ad b
-.HP
-.ad l
-\fB--withversions\fP
-.br
-Also display a comment containing the version of introduction for
-each configuration node. If the setting is deprecated, also display
-the version since which it is deprecated.
-.ad b
-.HP
-.ad l
-\fB-y\fP|\fB--yes\fP
-.br
-Do not prompt for confirmation interactively but always assume the
-answer yes. Use with extreme caution.
-(For automatic no, see -qq.)
-.ad b
-.SH VARIABLES
-.HP
-\fIString\fP
-.br
-See the option description for information about the string content.
-.HP
-\fISize\fP[UNIT]
-.br
-Size is an input number that accepts an optional unit.
-Input units are always treated as base two values, regardless of
-capitalization, e.g. 'k' and 'K' both refer to 1024.
-The default input unit is specified by letter, followed by |UNIT.
-UNIT represents other possible input units: \fBbBsSkKmMgGtTpPeE\fP.
-b|B is bytes, s|S is sectors of 512 bytes, k|K is kilobytes,
-m|M is megabytes, g|G is gigabytes, t|T is terabytes,
-p|P is petabytes, e|E is exabytes.
-(This should not be confused with the output control --units, where
-capital letters mean multiple of 1000.)
-.SH ENVIRONMENT VARIABLES
-See \fBlvm\fP(8) for information about environment variables used by lvm.
-For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
-.SH SEE ALSO
-
-.BR lvm (8)
-.BR lvm.conf (5)
-.BR lvmconfig (8)
-
-.BR pvchange (8)
-.BR pvck (8)
-.BR pvcreate (8)
-.BR pvdisplay (8)
-.BR pvmove (8)
-.BR pvremove (8)
-.BR pvresize (8)
-.BR pvs (8)
-.BR pvscan (8) 
-
-.BR vgcfgbackup (8)
-.BR vgcfgrestore (8)
-.BR vgchange (8)
-.BR vgck (8)
-.BR vgcreate (8)
-.BR vgconvert (8)
-.BR vgdisplay (8)
-.BR vgexport (8)
-.BR vgextend (8)
-.BR vgimport (8)
-.BR vgimportclone (8)
-.BR vgmerge (8)
-.BR vgmknodes (8)
-.BR vgreduce (8)
-.BR vgremove (8)
-.BR vgrename (8)
-.BR vgs (8)
-.BR vgscan (8)
-.BR vgsplit (8) 
-
-.BR lvcreate (8)
-.BR lvchange (8)
-.BR lvconvert (8)
-.BR lvdisplay (8)
-.BR lvextend (8)
-.BR lvreduce (8)
-.BR lvremove (8)
-.BR lvrename (8)
-.BR lvresize (8)
-.BR lvs (8)
-.BR lvscan (8)
-
-.BR lvm2-activation-generator (8)
-.BR blkdeactivate (8)
-.BR lvmdump (8)
-
-.BR dmeventd (8)
-.BR lvmetad (8)
-.BR lvmpolld (8)
-.BR lvmlockd (8)
-.BR lvmlockctl (8)
-.BR clvmd (8)
-.BR cmirrord (8)
-.BR lvmdbusd (8)
-
-.BR lvmsystemid (7)
-.BR lvmreport (7)
-.BR lvmraid (7)
-.BR lvmthin (7)
-.BR lvmcache (7)