metadata: Nuke the exported "pv_read" function.

The toollib code for processing PVs given on commandline tried to be smart and
use pv_read, avoiding real metadata scanning. The premise of the optimisation
was that if there is an active MDA on the PV, it can be reliably used to
establish VG membership. This assumption is however wrong, since it's entirely
possible that this particular MDA is simply out of date, and the PV is not
actually in any VG. While this is a subtle and rare bug, it's still a bug. One
way to trigger it would be to hotplug an old disk which at some point was a PV
in an existing VG, having a seemingly valid MDA but with an old sequence
number. All commands that use normal scanning realize that this PV does not
belong into the VG anymore, but anything based on pv_read alone will believe it
does.

.gitignore

@@ -1,16 +1,13 @@
 *.5
-*.7
 *.8
 *.a
 *.d
 *.o
-*.orig
 *.pc
 *.pot
-*.rej
 *.so
 *.so.*
-*.sw*
+*.swp
 *~
 
 .export.sym
@@ -20,11 +17,11 @@
 Makefile
 make.tmpl
 
+configure.h
+version.h
+
 /autom4te.cache/
-/autoscan.log
 /config.log
 /config.status
-/configure.scan
 /cscope.out
-/tags
 /tmp/

Makefile.in

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -15,10 +15,8 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 
-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
+SUBDIRS = doc include man
 
 ifeq ("@UDEV_RULES@", "yes")
   SUBDIRS += udev
@@ -28,6 +26,8 @@ ifeq ("@INTL@", "yes")
   SUBDIRS += po
 endif
 
+SUBDIRS += lib tools daemons libdm libdaemon
+
 ifeq ("@APPLIB@", "yes")
   SUBDIRS += liblvm
 endif
@@ -36,12 +36,14 @@ ifeq ("@PYTHON_BINDINGS@", "yes")
   SUBDIRS += python
 endif
 
+SUBDIRS += scripts
+
 ifeq ($(MAKECMDGOALS),clean)
   SUBDIRS += test
 endif
 # FIXME Should use intermediate Makefiles here!
 ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS = conf include man test scripts \
+  SUBDIRS = doc include man test scripts \
     libdaemon lib tools daemons libdm \
     udev po liblvm python \
     unit-tests/datastruct unit-tests/mm unit-tests/regex
@@ -53,7 +55,6 @@ DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl
 include make.tmpl
 
 libdm: include
-libdaemon: include
 lib: libdm libdaemon
 liblvm: lib
 daemons: lib libdaemon tools
@@ -66,7 +67,6 @@ libdm.device-mapper: include.device-mapper
 liblvm.device-mapper: include.device-mapper
 daemons.device-mapper: libdm.device-mapper
 tools.device-mapper: libdm.device-mapper
-scripts.device-mapper: include.device-mapper
 device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
 
 ifeq ("@INTL@", "yes")
@@ -93,47 +93,10 @@ cscope.out:
 all: cscope.out
 endif
 DISTCLEAN_TARGETS += cscope.out
-CLEAN_DIRS += autom4te.cache
 
-check check_system check_cluster check_local check_lvmetad check_lvmpolld unit: all
+check check_cluster check_local check_lvmetad unit: all
 	$(MAKE) -C test $(@)
 
-conf.generate: tools
-
-# how to use parenthesis in makefiles
-leftparen:=(
-LVM_VER := $(firstword $(subst $(leftparen), ,$(LVM_VERSION)))
-VER := LVM2.$(LVM_VER)
-# release file name
-FILE_VER := $(VER).tgz
-CLEAN_TARGETS += $(FILE_VER)
-CLEAN_DIRS += $(rpmbuilddir)
-
-dist:
-	@echo "Generating $(FILE_VER)";\
-	(cd $(top_srcdir); git ls-tree -r HEAD --name-only | xargs tar --transform "s,^,$(VER)/," -c) | gzip >$(FILE_VER)
-
-rpm: dist
-	$(RM) -r $(rpmbuilddir)/SOURCES
-	$(MKDIR_P) $(rpmbuilddir)/SOURCES
-	$(LN_S) -f $(abs_top_builddir)/$(FILE_VER) $(rpmbuilddir)/SOURCES
-	$(LN_S) -f $(abs_top_srcdir)/spec/build.inc $(rpmbuilddir)/SOURCES
-	$(LN_S) -f $(abs_top_srcdir)/spec/macros.inc $(rpmbuilddir)/SOURCES
-	$(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES
-	DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\
-	GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\
-	sed -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
-	    -e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
-	    -e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \
-	    $(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
-	rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
-
-generate: conf.generate
-	$(MAKE) -C conf generate
-
-all_man:
-	$(MAKE) -C man all_man
-
 install_system_dirs:
 	$(INSTALL_DIR) $(DESTDIR)$(DEFAULT_SYS_DIR)
 	$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_ARCHIVE_DIR)
@@ -148,14 +111,10 @@ install_initscripts:
 
 install_systemd_generators:
 	$(MAKE) -C scripts install_systemd_generators
-	$(MAKE) -C man install_systemd_generators
 
 install_systemd_units:
 	$(MAKE) -C scripts install_systemd_units
 
-install_all_man:
-	$(MAKE) -C man install_all_man
-
 ifeq ("@PYTHON_BINDINGS@", "yes")
 install_python_bindings:
 	$(MAKE) -C liblvm/python install_python_bindings
@@ -164,11 +123,8 @@ endif
 install_tmpfiles_configuration:
 	$(MAKE) -C scripts install_tmpfiles_configuration
 
-LCOV_TRACES = libdm.info lib.info liblvm.info tools.info \
-	libdaemon/client.info libdaemon/server.info \
-	daemons/clvmd.info daemons/dmeventd.info \
-	daemons/lvmetad.info
-
+LCOV_TRACES = libdm.info lib.info tools.info \
+	daemons/dmeventd.info daemons/clvmd.info
 CLEAN_TARGETS += $(LCOV_TRACES)
 
 ifneq ("$(LCOV)", "")
@@ -197,7 +153,7 @@ lcov: $(LCOV_TRACES)
 	$(RM) -r $(LCOV_REPORTS_DIR)
 	$(MKDIR_P) $(LCOV_REPORTS_DIR)
 	for i in $(LCOV_TRACES); do \
-		test -s $$i -a $$(wc -w <$$i) -ge 100 && lc="$$lc $$i"; \
+		test -s $$i && lc="$$lc $$i"; \
 	done; \
 	test -z "$$lc" || $(GENHTML) -p @abs_top_builddir@ \
 		-o $(LCOV_REPORTS_DIR) $$lc
@@ -229,12 +185,3 @@ memcheck: test-programs
 ruby-test:
 	$(RUBY) report-generators/test/ts.rb
 endif
-
-ifneq ($(shell which ctags),)
-.PHONY: tags
-tags:
-	test -z "$(shell find $(top_srcdir) -type f -name '*.[ch]' -newer tags 2>/dev/null | head -1)" || $(RM) tags
-	test -f tags || find $(top_srcdir) -maxdepth 5 -type f -name '*.[ch]' -exec ctags -a '{}' +
-
-CLEAN_TARGETS += tags
-endif

README

@@ -18,7 +18,7 @@ Mailing list for general discussion related to LVM2:
 
 Mailing lists for LVM2 development, patches and commits:
   lvm-devel@redhat.com
-  Subscribe from https://www.redhat.com/mailman/listinfo/lvm-devel
+  Subscribe from https://www.redhat.com/mailman/listinfo/linux-lvm
 
   lvm2-commits@lists.fedorahosted.org (Read-only archive of commits)
   Subscribe from https://fedorahosted.org/mailman/listinfo/lvm2-commits

VERSION

@@ -1 +1 @@
-2.02.134(2)-git (2015-10-30)
+2.02.99(2)-git (2012-10-22)

VERSION_DM

@@ -1 +1 @@
-1.02.111-git (2015-10-30)
+1.02.78-git (2012-10-22)

WHATS_NEW_DM

@@ -1,311 +1,5 @@
-Version 1.02.111 - 
-====================================
-
-Version 1.02.110 - 30th October 2015
-====================================
-  Disable thin monitoring plugin when it fails too often (>10 times).
-  Fix/restore parsing of empty field '-' when processing dmeventd event.
-  Enhance dm_tree_node_size_changed() to recognize size reduction.
-  Support exit on idle for dmenventd (1 hour).
-  Add support to allow unmonitor device from plugin itself.
-  New design for thread co-operation in dmeventd.
-  Dmeventd read device status with 'noflush'.
-  Dmeventd closes control device when no device is monitored.
-  Thin plugin for dmeventd improved percentage usage.
-  Snapshot plugin for dmeventd improved percentage usage.
-  Add dm_hold_control_dev to allow holding of control device open.
-  Add dm_report_compact_given_fields to remove given empty fields from report.
-  Use libdm status parsing and local mem raid dmeventd plugin.
-  Use local mem pool and lock only lvm2 execution for mirror dmeventd plugin.
-  Lock protect only lvm2 execution for snapshot and thin dmeventd plugin.
-  Use local mempool for raid and mirror plugins.
-  Reworked thread initialization for dmeventd plugins.
-  Dmeventd handles snapshot overflow for now equally as invalid.
-  Convert dmeventd to use common logging macro system from libdm.
-  Return -ENOMEM when device registration fails instead of 0 (=success).
-  Enforce writethrough mode for cleaner policy.
-  Add support for recognition and deactivation of MD devices to blkdeactivate.
-  Move target status functions out of libdm-deptree.
-  Correct use of max_write_behind parameter when generating raid target line.
-  Fix dm-event systemd service to make sure it is executed before mounting.
-
-Version 1.02.109 - 22nd September 2016
-======================================
-  Update man pages for dmsetup and dmstats.
-  Improve help text for dmsetup.
-  Use --noflush and --nolockfs when removing device with --force.
-  Parse new Overflow status string for snapshot target.
-  Check dir path components are valid if using dm_create_dir, error out if not.
-  Fix /dev/mapper handling to remove dangling entries if symlinks are found.
-  Make it possible to use blank value as selection for string list report field.
-
-Version 1.02.108 - 15th September 2015
-======================================
-  Do not check for full thin pool when activating without messages (1.02.107).
-
-Version 1.02.107 - 5th September 2015
-=====================================
-  Parse thin-pool status with one single routine internally.
-  Add --histogram to select default histogram fields for list and report.
-  Add report fields for displaying latency histogram configuration and data.
-  Add dmstats --bounds to specify histogram boundaries for a new region.
-  Add dm_histogram_to_string() to format histogram data in string form.
-  Add public methods to libdm to access numerical histogram config and data.
-  Parse and store histogram data in dm_stats_list() and dm_stats_populate().
-  Add an argument to specify histogram bounds to dm_stats_create_region().
-  Add dm_histogram_bounds_from_{string,uint64_t}() to parse histogram bounds.
-  Add dm_histogram handle type to represent a latency histogram and its bounds.
-  Fix devmapper.pc pkgconfig file to not reference non-existent rt.pc file.
-  Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106)
-
-Version 1.02.106 - 26th August 2015
+Version 1.02.78 - 
 ===================================
-  Add 'precise' column to statistics reports.
-  Add --precise switch to 'dmstats create' to request nanosecond counters.
-  Add precise argument to dm_stats_create_region().
-  Add support to libdm-stats for precise_timestamps
-
-Version 1.02.105 - 17th August 2015
-===================================
-  Fix 'dmstats list -o all' segfault.
-  Separate dmstats statistics fields from region information fields.
-  Add interval and interval_ns fields to dmstats reports.
-  Do not include internal glibc headers in libdm-timestamp.c (1.02.104)
-  Exit immediately if no device is supplied to dmsetup wipe_table.
-  Suppress dmsetup report headings when no data is output. (1.02.104)
-  Adjust dmsetup usage/help output selection to match command invoked.
-  Fix dmsetup -o all to select correct fields in splitname report.
-  Restructure internal dmsetup argument handling across all commands.
-  Add dm_report_is_empty() to indicate there is no data awaiting output.
-  Add more arg validation for dm_tree_node_add_cache_target().
-  Add --alldevices switch to replace use of --force for stats create / delete.
-
-Version 1.02.104 - 10th August 2015
-===================================
-  Add dmstats.8 man page
-  Add dmstats --segments switch to create one region per device segment.
-  Add dmstats --regionid, --allregions to specify a single / all stats regions.
-  Add dmstats --allprograms for stats commands that filter by program ID.
-  Add dmstats --auxdata and --programid args to specify aux data and program ID.
-  Add report stats sub-command to provide repeating stats reports.
-  Add clear, delete, list, and print stats sub-commands.
-  Add create stats sub-command and --start, --length, --areas and --areasize.
-  Recognize 'dmstats' as an alias for 'dmsetup stats' when run with this name.
-  Add a 'stats' command to dmsetup to configure, manage and report stats data.
-  Add statistics fields to dmsetup -o.
-  Add libdm-stats library to allow management of device-mapper statistics.
-  Add --nosuffix to suppress dmsetup unit suffixes in report output.
-  Add --units to control dmsetup report field output units.
-  Add support to redisplay column headings for repeating column reports.
-  Fix report header and row resource leaks.
-  Report timestamps of ioctls with dmsetup -vvv.
-  Recognize report field name variants without any underscores too.
-  Add dmsetup --interval and --count to repeat reports at specified intervals.
-  Add dm_timestamp functions to libdevmapper.
-  Recognise vg/lv name format in dmsetup.
-  Move size display code to libdevmapper as dm_size_to_string.
-
-Version 1.02.103 - 24th July 2015
-=================================
-  Introduce libdevmapper wrappers for all malloc-related functions.
-
-Version 1.02.102 - 7th July 2015
-================================
-  Include tool.h for default non-library use.
-  Introduce format macros with embedded % such as FMTu64.
-
-Version 1.02.101 - 3rd July 2015
-================================
-  Add experimental support to passing messages in suspend tree.
-  Add dm_report_value_cache_{set,get} to support caching during report/select.
-  Add dm_report_reserved_handler to handle report reserved value actions.
-  Support dynamic value in select: DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE.
-  Support fuzzy names in select: DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES.
-  Thin pool trace messages show a device name and major:minor.
-
-Version 1.02.100 - 30th June 2015
-=================================
-  Add since, after, until and before time operators to be used in selection.
-  Add support for time in reports and selection: DM_REPORT_FIELD_TYPE_TIME.
-  Support report reserved value ranges: DM_REPORT_FIELD_RESERVED_VALUE_RANGE.
-  Support report reserved value names: DM_REPORT_FIELD_RESERVED_VALUE_NAMED.
-  Add DM_CONFIG_VALUE_FMT_{INT_OCTAL,STRING_NO_QUOTES} config value format flag.
-  Add DM_CONFIG_VALUE_FMT_COMMON_{ARRAY,EXTRA_SPACE} config value format flag.
-  Add dm_config_value_{get,set}_format_flags to get and set config value format.
-
-Version 1.02.99 - 20th June 2015
-================================
-  New dm_tree_node_set_thin_pool_read_only(DM_1_02_99) for read-only thin pool.
-  Enhance error message when thin-pool message fails.
-  Fix dmeventd logging to avoid threaded use of static variable.
-  Remove redundant dmeventd SIGALRM coded.
-
-Version 1.02.98 - 12th June 2015
-================================
-  Add dm_task_get_errno() to return any unexpected errno from a dm ioctl call.
-  Use copy of errno made after each dm ioctl call in case errno changes later.
-
-Version 1.02.97 - 15th May 2015
-===============================
-  New dm_task_get_info(DM_1_02_97) supports internal_suspend state.
-  New symbols are versioned and comes with versioned symbol name (DM_1_02_97).
-
-Version 1.02.96 - 2nd May 2015
-==============================
-  Fix selection to not match if using reserved value in criteria with >,<,>=,<.
-  Fix selection to not match reserved values for size fields if using >,<,>=,<.
-  Include uuid or device number in log message after ioctl failure.
-  Add DM_INTERNAL_SUSPEND_FLAG to dm-ioctl.h.
-  Install blkdeactivate script and its man page with make install_device-mapper.
-
-Version 1.02.95 - 15th March 2015
-=================================
-  Makefile regenerated.
-
-Version 1.02.94 - 4th March 2015
-================================
-  Add dm_report_object_is_selected for generalized interface for report/select.
-
-Version 1.02.93 - 21st January 2015
-===================================
-  Reduce severity of ioctl error message when dmeventd waitevent is interrupted.
-  Report 'unknown version' when incompatible version numbers were not obtained.
-  Report more info from thin pool status (out of data, metadata-ro, fail).
-  Support error_if_no_space for thin pool target.
-  Fix segfault while using selection with regex and unbuffered reporting.
-  Add dm_report_compact_fields to remove empty fields from report output.
-  Remove unimplemented dm_report_set_output_selection from libdevmapper.h.
-
-Version 1.02.92 - 24th November 2014
-====================================
-  Fix memory corruption with sorting empty string lists (1.02.86).
-  Fix man dmsetup.8 syntax warning of Groff
-  Accept unquoted strings and / in place of {} when parsing configs.
-
-Version 1.02.91 - 11th November 2014
-====================================
-  Update cache creation and dm_config_node to pass policy.
-  Allow activation of any thin-pool if transaction_id supplied is 0.
-  Don't print uninitialized stack bytes when non-root uses dm_check_version().
-  Fix selection criteria to not match reserved values when using >, <, >=, <.
-  Add DM_LIST_HEAD_INIT macro to libdevmapper.h.
-  Fix dm_is_dm_major to not issue error about missing /proc lines for dm module.
-
-Version 1.02.90 - 1st September 2014
-====================================
-  Restore proper buffer size for parsing mountinfo line (1.02.89)
-
-Version 1.02.89 - 26th August 2014
-==================================
-  Improve libdevmapper-event select() error handling.
-  Add extra check for matching transation_id after message submitting.
-  Add dm_report_field_string_list_unsorted for str. list report without sorting.
-  Support --deferred with dmsetup remove to defer removal of open devices.
-  Update dm-ioctl.h to include DM_DEFERRED_REMOVE flag.
-  Add support for selection to match string list subset, recognize { } operator.
-  Fix string list selection with '[value]' to not match list that's superset.
-  Fix string list selection to match whole words only, not prefixes.
-
-Version 1.02.88 - 5th August 2014
-=================================
-  Add dm_tree_set_optional_uuid_suffixes to handle upgrades.
-
-Version 1.02.87 - 23rd July 2014
-================================
-  Fix dm_report_field_string_list to handle delimiter with multiple chars.
-  Add dm_report_field_reserved_value for per-field reserved value definition.
-
-Version 1.02.86 - 23rd June 2014
-================================
-  Make "help" and "?" reporting fields implicit.
-  Recognize implicit "selected" field if using dm_report_init_with_selection.
-  Add support for implicit reporting fields which are predefined in libdm.
-  Add DM_REPORT_FIELD_TYPE_PERCENT: separate number and percent fields.
-  Add dm_percent_range_t,dm_percent_to_float,dm_make_percent to libdm for reuse.
-  Add dm_report_reserved_value to libdevmapper for reserved value definition.
-  Also display field types when listing all fields in selection help.
-  Recognize "help" keyword in selection string to show brief help for selection.
-  Always order items reported as string list field lexicographically.
-  Add dm_report_field_string_list to libdevmapper for direct string list report.
-  Add DM_REPORT_FIELD_TYPE_STRING_LIST: separate string and string list fields.
-  Add dm_str_list to libdevmapper for string list type definition and its reuse.
-  Add dmsetup -S/--select to define selection criteria for dmsetup reports.
-  Add dm_report_init_with_selection to intialize report with selection criteria.
-  Add DM_REPORT_FIELD_TYPE_SIZE: separate number and size reporting fields.
-  Use RemoveOnStop for dm-event.socket systemd unit.
-  Document env var 'DM_DEFAULT_NAME_MANGLING_MODE' in dmsetup man page.
-  Warn user about incorrect use of cookie with 'dmsetup remove --force'.
-  Also recognize 'help'/'?' as reserved sort key name to show help.
-  Add dm_units_to_factor for size unit parsing.
-  Increase bitset size for minors for thin dmeventd plugin.
-
-Version 1.02.85 - 10th April 2014
-=================================
-  Check for sprintf error when building internal device path.
-  Check for sprintf error when creating path for dm control node.
-  When buffer for dm_get_library_version() is too small, return error code.
-  Always reinitialize _name_mangling_mode in dm_lib_init().
-  Add tracking flag about implicitly added devices into dm_tree.
-  Stop timeout thread immediately when the last worker thread is finished.
-  Fix dmeventd logging with parallel wait event processing.
-  Reuse _node_send_messages() for validation of transaction_id in preload.
-  Transaction_id could be lower by one only when messages are prepared.
-  Do not call callback when preload fails.
-  Wrap is_selinux_enabled() to be called just once.
-  Use correctly signed 64b constant when working with raid volumes.
-  Exit dmeventd with pidfile cleanup instead of raising SIGKILL on DIE request.
-  Add new DM_EVENT_GET_PARAMETERS request to dmeventd protocol.
-  Do not use systemd's reload for dmeventd restart, use dmeventd -R instead.
-  Drop cryptsetup rules from 10-dm.rules - cryptsetup >= 1.1.3 sets them.
-
-Version 1.02.84 - 20th January 2014
-===================================
-  Revert activation of activated nodes if a node preload callback fails.
-  Avoid busy looping on CPU when dmeventd reads event DM_WAIT_RETRY.
-  Ensure global mutex is held when working with dmeventd thread.
-  Drop taking timeout mutex for un/registering dmeventd monitor.
-  Allow section names in config file data to be quoted strings.
-  Close fifos before exiting in dmeventd restart() error path.
-  Move printf format string directly into dm_asprintf args list.
-  Catch invalid use of string sort values when reporting numerical fields.
-
-Version 1.02.83 - 13th November 2013
-====================================
-  Consistently report on stderr when device is not found for dmsetup info.
-  Skip race errors when non-udev dmsetup build runs on udev-enabled system.
-  Skip error message when holders are not present in sysfs.
-  Use __linux__ instead of linux define to make libdevmapper.h C compliant.
-  Use mutex to avoid possible race while creating/destroying memory pools.
-  Require libpthread to build now.
-
-Version 1.02.82 - 4th October 2013
-==================================
-  Define symbolic names for subsystem udev flags in libdevmapper for easier use.
-  Make subsystem udev rules responsible for importing DM_SUBSYSTEM_UDEV_FLAG*.
-
-Version 1.02.81 - 23rd September 2013
-=====================================
-  Tidy dmeventd fifo initialisation.
-
-Version 1.02.80 - 20th September 2013
-=====================================
-  Detect invalid sector supplied to 'dmsetup message'.
-  Free any previously-set string if a dm_task_set_* function is called again.
-  Do not allow passing empty new name for dmsetup rename.
-  Display any output returned by 'dmsetup message'.
-  Add dm_task_get_message_response to libdevmapper.
-
-Version 1.02.79 - 13th August 2013
-==================================
-  Create dmeventd timeout threads as "detached" so exit status is freed.
-  Add DM_ABORT_ON_INTERNAL_ERRORS env var support to abort on internal errors.
-
-Version 1.02.78 - 24th July 2013
-================================
-  Process thin messages once to active thin pool target for dm_tree.
-  Optimize out setting the same value or read_ahead.
-  Add DM_ARRAY_SIZE public macro.
-  Move syslog code out of signal handle in dmeventd.
   Add DM_TO_STRING public macro.
   Always return success on dmeventd -V command call.
   Fix parsing of 64bit snapshot status in dmeventd snapshot plugin.

acinclude.m4

@@ -1,63 +0,0 @@
-dnl AC_GCC_VERSION
-dnl check for compiler version
-dnl sets COMPILER_VERSION and GCC_VERSION
-
-AC_DEFUN([AC_CC_VERSION],
-[
-    AC_MSG_CHECKING([C compiler version])
-    COMPILER_VERSION=`$CC -v 2>&1 | grep version`
-    case "$COMPILER_VERSION" in
-        *gcc*)
-	   dnl Ok, how to turn $3 into the real $3
-	   GCC_VERSION=`echo $COMPILER_VERSION | \
-	   sed -e 's/[[^ ]]*\ [[^ ]]*\ \([[^ ]]*\)\ .*/\1/'` ;;
-	*) GCC_VERSION=unknown ;;
-    esac
-    AC_MSG_RESULT($GCC_VERSION)
-])
-
-dnl AC_TRY_CCFLAG([CCFLAG], [VAR], [ACTION-IF-WORKS], [ACTION-IF-FAILS])
-dnl check if $CC supports a given flag
-
-AC_DEFUN([AC_TRY_CCFLAG],
-[
-    AC_REQUIRE([AC_PROG_CC])
-    ac_save_CFLAGS=$CFLAGS
-    CFLAGS=$1
-    AC_CACHE_CHECK([whether $CC accepts $1 flag], [ac_cv_flag_$2],
-	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-			   [AS_VAR_SET([ac_cv_flag_$2], [yes])],
-			   [AS_VAR_SET([ac_cv_flag_$2], [no])])])
-    CFLAGS=$ac_save_CFLAGS
-    $2=AS_VAR_GET([ac_cv_flag_$2])
-    if test "$2" = yes; then
-        ifelse([$3], [], [:], [$3])
-    else
-        ifelse([$4], [], [:], [$4])
-    fi
-])
-
-dnl AC_IF_YES([TEST-FOR-YES], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-dnl AS_IF() abstraction, checks shell variable for 'yes'
-AC_DEFUN([AC_IF_YES], [AS_IF([test $$1 = yes], [$2], [$3])])
-
-dnl AC_TRY_LDFLAGS([LDFLAGS], [VAR], [ACTION-IF-WORKS], [ACTION-IF-FAILS])
-dnl check if $CC supports given ld flags
-
-AC_DEFUN([AC_TRY_LDFLAGS],
-[
-    AC_REQUIRE([AC_PROG_CC])
-    ac_save_LDFLAGS=$LDFLAGS
-    LDFLAGS=$1
-	AC_CACHE_CHECK([whether $CC accepts $1 ld flags], [ac_cv_flag_$2],
-	[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
-			[AS_VAR_SET([ac_cv_flag_$2], [yes])],
-			[AS_VAR_SET([ac_cv_flag_$2], [no])])])
-    LDFLAGS=$ac_save_LDFLAGS
-    $2=AS_VAR_GET([ac_cv_flag_$2])
-    if test "$2" = yes; then
-        ifelse([$3], [], [:], [$3])
-    else
-        ifelse([$4], [], [:], [$4])
-    fi
-])

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,11 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
-# Copyright (c) 2004 Scott James Remnant <scott@netsplit.com>.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,8 +39,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -87,8 +85,7 @@ m4_define([_PKG_CONFIG],
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -136,9 +133,9 @@ if test $pkg_failed = yes; then
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -151,7 +148,7 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])[]dnl
+_PKG_TEXT])
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -162,7 +159,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -172,59 +169,3 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-m4_include([acinclude.m4])

autoconf/config.guess

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,22 +17,26 @@ timestamp='2014-01-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
-# Originally written by Per Bothner.
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -50,7 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,33 +139,12 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	;;
-esac
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -194,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
@@ -215,10 +201,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -241,7 +223,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -287,10 +269,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -316,12 +295,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
+    arm:riscos:*:*|arm:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -415,23 +394,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -501,8 +480,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -515,7 +494,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	exit ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -572,7 +551,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -615,52 +594,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
+                        esac ;;
+                    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		    sed 's/^              //' << EOF >$dummy.c
 
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
 
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
 
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -751,22 +730,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -790,14 +769,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -809,35 +788,30 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
     i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-	case ${UNAME_MACHINE} in
+    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -874,22 +848,15 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -899,56 +866,52 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
+        esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -967,63 +930,51 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
+	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1032,11 +983,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1068,7 +1019,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1096,13 +1047,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-	exit ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1137,8 +1088,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1181,10 +1132,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1210,11 +1161,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1227,9 +1178,6 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1256,31 +1204,19 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1294,10 +1230,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
+    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1342,13 +1275,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1366,11 +1299,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
 esac
 
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1388,11 +1321,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	"4"
+          "4"
 #else
-	""
+	  ""
 #endif
-	); exit (0);
+         ); exit (0);
 #endif
 #endif
 

autoconf/config.sub

@@ -1,31 +1,38 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2014-01-01'
+timestamp='2009-11-20'
 
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +75,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -115,18 +123,13 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -149,12 +152,12 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
-	-bluegene*)
-		os=-cnk
+        -bluegene*)
+	        os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -170,10 +173,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
-		os=-chorusrdb
+ 	-chorusrdb)
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,12 +221,6 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -248,28 +245,20 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -287,45 +276,34 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rl78 | rx \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -335,21 +313,6 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -364,31 +327,25 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -406,34 +363,29 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -458,7 +410,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -528,20 +480,11 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-	cegcc)
+        cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -573,7 +516,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16 | cr16-*)
+	cr16)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -731,6 +674,7 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -788,15 +732,11 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze*)
+        microblaze)
 		basic_machine=microblaze-xilinx
 		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -831,18 +771,10 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -907,12 +839,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -995,10 +921,9 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	ppc)	basic_machine=powerpc-unknown
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1023,11 +948,7 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
+	rdos)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1096,9 +1017,6 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1155,8 +1073,20 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tile*)
-		basic_machine=$basic_machine-unknown
+		basic_machine=tile-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1226,9 +1156,6 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1326,11 +1253,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+        -auroraux)
+	        os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1354,21 +1281,20 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1415,7 +1341,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1464,7 +1390,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1500,14 +1426,15 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
-	-nacl*)
-		;;
 	-none)
 		;;
 	*)
@@ -1530,10 +1457,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-	score-*)
+        score-*)
 		os=-elf
 		;;
-	spu-*)
+        spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1545,23 +1472,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1581,11 +1493,14 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-	mep-*)
+        mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1594,9 +1509,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1615,7 +1527,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

conf/.gitignore

@@ -1,6 +0,0 @@
-command_profile_template.profile
-example.conf
-lvmlocal.conf
-metadata_profile_template.profile
-configure.h
-lvm-version.h

conf/Makefile.in

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
-#
-# This file is part of LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-
-CONFSRC=example.conf
-CONFDEST=lvm.conf
-CONFLOCAL=lvmlocal.conf
-
-PROFILE_TEMPLATES=command_profile_template.profile metadata_profile_template.profile
-PROFILES=$(PROFILE_TEMPLATES) \
-	$(srcdir)/cache-mq.profile \
-	$(srcdir)/cache-smq.profile \
-	$(srcdir)/thin-generic.profile \
-	$(srcdir)/thin-performance.profile
-
-include $(top_builddir)/make.tmpl
-
-.PHONY: install_conf install_localconf install_profiles
-
-generate:
-	(cat $(top_srcdir)/conf/example.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withcomments --ignorelocal --withspaces) > example.conf.in
-	(cat $(top_srcdir)/conf/lvmlocal.conf.base && LD_LIBRARY_PATH=$(top_builddir)/libdm:$(LD_LIBRARY_PATH) $(top_builddir)/tools/lvm dumpconfig --type default --unconfigured --withcomments --withspaces local) > lvmlocal.conf.in
-
-install_conf: $(CONFSRC)
-	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
-		echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
-		$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
-	fi
-
-install_localconf: $(CONFLOCAL)
-	@if [ ! -e $(confdir)/$(CONFLOCAL) ]; then \
-		echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL)"; \
-		$(INSTALL_WDATA) -D $< $(confdir)/$(CONFLOCAL); \
-	fi
-
-install_profiles: $(PROFILES)
-	$(INSTALL_DIR) $(DESTDIR)$(DEFAULT_PROFILE_DIR)
-	$(INSTALL_DATA) $(PROFILES) $(DESTDIR)$(DEFAULT_PROFILE_DIR)/
-
-install_lvm2: install_conf install_localconf install_profiles
-
-install: install_lvm2
-
-DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES)

conf/cache-mq.profile

@@ -1,20 +0,0 @@
-# Demo configuration 'mq' cache policy
-#
-# Note: This policy has been deprecated in favor of the smq policy
-# keyword "default" means, setting is left with kernel defaults.
-#
-
-allocation {
-	cache_pool_chunk_size = 64
-	cache_mode = "writethrough"
-	cache_policy = "mq"
-	cache_settings {
-		mq {
-			sequential_threshold = "default"	#  #nr_sequential_ios
-			random_threshold = "default"		#  #nr_random_ios
-			read_promote_adjustment = "default"
-			write_promote_adjustment = "default"
-			discard_promote_adjustment = "default"
-		}
-	}
-}

conf/cache-smq.profile

@@ -1,14 +0,0 @@
-# Demo configuration 'smq' cache policy
-#
-# The stochastic multi-queue (smq) policy addresses some of the problems
-# with the multiqueue (mq) policy and uses less memory.
-#
-
-allocation {
-	cache_pool_chunk_size = 64
-	cache_mode = "writethrough"
-	cache_policy = "smq"
-	cache_settings {
-	        # currently no settins for "smq" policy
-	}
-}

conf/command_profile_template.profile.in

@@ -1,49 +0,0 @@
-# This is a command profile template for the LVM2 system.
-#
-# It contains all configuration settings that are customizable by command
-# profiles. To create a new command profile, select the settings you want
-# to customize and add them in a new file named <profile_name>.profile.
-# Then install the new profile in a directory as defined by config/profile_dir
-# setting found in @DEFAULT_SYS_DIR@/lvm.conf file.
-#
-# Command profiles can be referenced by using the --commandprofile option then.
-#
-# Refer to 'man lvm.conf' for further information about profiles and
-# general configuration file layout.
-#
-global {
-	units="h"
-	si_unit_consistency=1
-	suffix=1
-	lvdisplay_shows_full_device_path=0
-}
-report {
-	compact_output=0
-	aligned=1
-	buffered=1
-	headings=1
-	separator=" "
-	list_item_separator=","
-	prefixes=0
-	quoted=1
-	colums_as_rows=0
-	binary_values_as_numeric=0
-	devtypes_sort="devtype_name"
-	devtypes_cols="devtype_name,devtype_max_partitions,devtype_description"
-	devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description"
-	lvs_sort="vg_name,lv_name"
-	lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv"
-	lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile"
-	vgs_sort="vg_name"
-	vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free"
-	vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile"
-	pvs_sort="pv_name"
-	pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free"
-	pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid"
-	segs_sort="vg_name,lv_name,seg_start"
-	segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size"
-	segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize"
-	pvsegs_sort="pv_name,pvseg_start"
-	pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size"
-	pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"
-}

conf/example.conf.base

@@ -1,23 +0,0 @@
-# This is an example configuration file for the LVM2 system.
-# It contains the default settings that would be used if there was no
-# @DEFAULT_SYS_DIR@/lvm.conf file.
-#
-# Refer to 'man lvm.conf' for further information including the file layout.
-#
-# Refer to 'man lvm.conf' for information about how settings configured in
-# this file are combined with built-in values and command line options to
-# arrive at the final values used by LVM.
-#
-# Refer to 'man lvmconfig' for information about displaying the built-in
-# and configured values used by LVM.
-#
-# If a default value is set in this file (not commented out), then a
-# new version of LVM using this file will continue using that value,
-# even if the new version of LVM changes the built-in default value.
-#
-# To put this file in a different directory and override @DEFAULT_SYS_DIR@ set
-# the environment variable LVM_SYSTEM_DIR before running the tools.
-#
-# N.B. Take care that each setting only appears once if uncommenting
-# example settings in this file.
-

conf/lvmlocal.conf.base

@@ -1,19 +0,0 @@
-# This is a local configuration file template for the LVM2 system
-# which should be installed as @DEFAULT_SYS_DIR@/lvmlocal.conf .
-#
-# Refer to 'man lvm.conf' for information about the file layout.
-#
-# To put this file in a different directory and override
-# @DEFAULT_SYS_DIR@ set the environment variable LVM_SYSTEM_DIR before
-# running the tools.
-#
-# The lvmlocal.conf file is normally expected to contain only the
-# "local" section which contains settings that should not be shared or
-# repeated among different hosts.  (But if other sections are present,
-# they *will* get processed.  Settings in this file override equivalent
-# ones in lvm.conf and are in turn overridden by ones in any enabled
-# lvm_<tag>.conf files.)
-#
-# Please take care that each setting only appears once if uncommenting
-# example settings in this file and never copy this file between hosts.
-

conf/lvmlocal.conf.in

@@ -1,56 +0,0 @@
-# This is a local configuration file template for the LVM2 system
-# which should be installed as @DEFAULT_SYS_DIR@/lvmlocal.conf .
-#
-# Refer to 'man lvm.conf' for information about the file layout.
-#
-# To put this file in a different directory and override
-# @DEFAULT_SYS_DIR@ set the environment variable LVM_SYSTEM_DIR before
-# running the tools.
-#
-# The lvmlocal.conf file is normally expected to contain only the
-# "local" section which contains settings that should not be shared or
-# repeated among different hosts.  (But if other sections are present,
-# they *will* get processed.  Settings in this file override equivalent
-# ones in lvm.conf and are in turn overridden by ones in any enabled
-# lvm_<tag>.conf files.)
-#
-# Please take care that each setting only appears once if uncommenting
-# example settings in this file and never copy this file between hosts.
-
-
-# Configuration section local.
-# LVM settings that are specific to the local host.
-local {
-
-	# Configuration option local/system_id.
-	# Defines the local system ID for lvmlocal mode.
-	# This is used when global/system_id_source is set to 'lvmlocal' in the
-	# main configuration file, e.g. lvm.conf. When used, it must be set to
-	# a unique value among all hosts sharing access to the storage,
-	# e.g. a host name.
-	# 
-	# Example
-	# Set no system ID:
-	# system_id = ""
-	# Set the system_id to a specific name:
-	# system_id = "host1"
-	# 
-	# This configuration option has an automatic default value.
-	# system_id = ""
-
-	# Configuration option local/extra_system_ids.
-	# A list of extra VG system IDs the local host can access.
-	# VGs with the system IDs listed here (in addition to the host's own
-	# system ID) can be fully accessed by the local host. (These are
-	# system IDs that the host sees in VGs, not system IDs that identify
-	# the local host, which is determined by system_id_source.)
-	# Use this only after consulting 'man lvmsystemid' to be certain of
-	# correct usage and possible dangers.
-	# This configuration option does not have a default value defined.
-
-	# Configuration option local/host_id.
-	# The lvmlockd sanlock host_id.
-	# This must be unique among all hosts, and must be between 1 and 2000.
-	# This configuration option has an automatic default value.
-	# host_id = 0
-}

conf/metadata_profile_template.profile.in

@@ -1,24 +0,0 @@
-# This is a metadata profile template for the LVM2 system.
-#
-# It contains all configuration settings that are customizable by metadata
-# profiles. To create a new metadata profile, select the settings you want
-# to customize and add them in a new file named <profile_name>.profile.
-# Then install the new profile in a directory as defined by config/profile_dir
-# setting found in @DEFAULT_SYS_DIR@/lvm.conf file.
-#
-# Metadata profiles can be referenced by using the --metadataprofile LVM2
-# command line option.
-#
-# Refer to 'man lvm.conf' for further information about profiles and
-# general configuration file layout.
-#
-allocation {
-	thin_pool_zero=1
-	thin_pool_discards="passdown"
-	thin_pool_chunk_size_policy="generic"
-#	thin_pool_chunk_size=128
-}
-activation {
-	thin_pool_autoextend_threshold=100
-	thin_pool_autoextend_percent=20
-}

conf/thin-generic.profile

@@ -1,4 +0,0 @@
-allocation {
-	thin_pool_chunk_size_policy = "generic"
-	thin_pool_zero = 1
-}

conf/thin-performance.profile

@@ -1,4 +0,0 @@
-allocation {
-	thin_pool_chunk_size_policy = "performance"
-	thin_pool_zero = 0
-}

daemons/Makefile.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -15,7 +15,11 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-.PHONY: dmeventd clvmd cmirrord lvmetad lvmpolld lvmlockd
+ifeq ("@BUILD_LVMETAD@", "yes")
+  SUBDIRS += lvmetad
+endif
+
+.PHONY: dmeventd clvmd cmirrord lvmetad
 
 ifneq ("@CLVMD@", "none")
   SUBDIRS += clvmd
@@ -32,20 +36,8 @@ daemons.cflow: dmeventd.cflow
 endif
 endif
 
-ifeq ("@BUILD_LVMETAD@", "yes")
-  SUBDIRS += lvmetad
-endif
-
-ifeq ("@BUILD_LVMPOLLD@", "yes")
-  SUBDIRS += lvmpolld
-endif
-
-ifeq ("@BUILD_LVMLOCKD@", "yes")
-  SUBDIRS += lvmlockd 
-endif
-
 ifeq ($(MAKECMDGOALS),distclean)
-  SUBDIRS = clvmd cmirrord dmeventd lvmetad lvmpolld lvmlockd
+  SUBDIRS = clvmd cmirrord dmeventd lvmetad
 endif
 
 include $(top_builddir)/make.tmpl

daemons/clvmd/.gitignore

@@ -1 +0,0 @@
-clvmd

daemons/clvmd/Makefile.in

@@ -36,6 +36,10 @@ SOURCES = \
 	lvm-functions.c  \
 	refresh_clvmd.c
 
+ifeq ("@DEBUG@", "yes")
+	DEFS += -DDEBUG
+endif
+
 ifneq (,$(findstring cman,, "@CLVMD@,"))
 	SOURCES += clvmd-cman.c
 	LMLIBS += $(CMAN_LIBS) $(CONFDB_LIBS) $(DLM_LIBS)
@@ -83,8 +87,8 @@ include $(top_builddir)/make.tmpl
 LVMLIBS += -ldevmapper
 LIBS += $(PTHREAD_LIBS)
 
-CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS)
-LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
+DEFS += -D_REENTRANT
+CFLAGS += -fno-strict-aliasing
 
 INSTALL_TARGETS = \
 	install_clvmd

daemons/clvmd/clvm.h

@@ -23,7 +23,6 @@
 #define _CLVM_H
 
 #include "configure.h"
-#include <inttypes.h>
 
 struct clvm_header {
 	uint8_t  cmd;	        /* See below */

daemons/clvmd/clvmd-cman.c

@@ -110,12 +110,12 @@ static void _cluster_init_completed(void)
 	clvmd_cluster_init_completed();
 }
 
-static int _get_main_cluster_fd(void)
+static int _get_main_cluster_fd()
 {
 	return cman_get_fd(c_handle);
 }
 
-static int _get_num_nodes(void)
+static int _get_num_nodes()
 {
 	int i;
 	int nnodes = 0;
@@ -243,8 +243,9 @@ static void _add_up_node(const char *csid)
 	DEBUGLOG("Added new node %d to updown list\n", nodeid);
 }
 
-static void _cluster_closedown(void)
+static void _cluster_closedown()
 {
+	destroy_lvhash();
 	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 	cman_finish(c_handle);
 }
@@ -282,7 +283,7 @@ static void count_clvmds_running(void)
 }
 
 /* Get a list of active cluster members */
-static void get_members(void)
+static void get_members()
 {
 	int retnodes;
 	int status;
@@ -380,7 +381,7 @@ static int nodeid_from_csid(const char *csid)
 	return nodeid;
 }
 
-static int _is_quorate(void)
+static int _is_quorate()
 {
 	return cman_is_quorate(c_handle);
 }

daemons/clvmd/clvmd-command.c

@@ -78,6 +78,9 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
 	unsigned char lock_cmd;
 	unsigned char lock_flags;
 
+	/* Reset test mode before we start */
+	init_test(0);
+
 	/* Do the command */
 	switch (msg->cmd) {
 		/* Just a test message */
@@ -109,6 +112,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
 		lockname = &args[2];
 		/* Check to see if the VG is in use by LVM1 */
 		status = do_check_lvm1(lockname);
+		if (lock_flags & LCK_TEST_MODE)
+			init_test(1);
 		do_lock_vg(lock_cmd, lock_flags, lockname);
 		break;
 
@@ -117,6 +122,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
 		lock_cmd = args[0];
 		lock_flags = args[1];
 		lockname = &args[2];
+		if (lock_flags & LCK_TEST_MODE)
+			init_test(1);
 		status = do_lock_lv(lock_cmd, lock_flags, lockname);
 		/* Replace EIO with something less scary */
 		if (status == EIO) {
@@ -176,58 +183,65 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
 	}
 
 	return status;
+
 }
 
 static int lock_vg(struct local_client *client)
 {
-	struct dm_hash_table *lock_hash;
-	struct clvm_header *header =
-		(struct clvm_header *) client->bits.localsock.cmd;
-	unsigned char lock_cmd;
-	int lock_mode;
-	char *args = header->node + strlen(header->node) + 1;
-	int lkid;
-	int status;
-	char *lockname;
+    struct dm_hash_table *lock_hash;
+    struct clvm_header *header =
+	(struct clvm_header *) client->bits.localsock.cmd;
+    unsigned char lock_cmd;
+    int lock_mode;
+    char *args = header->node + strlen(header->node) + 1;
+    int lkid;
+    int status = 0;
+    char *lockname;
 
-	/*
-	 * Keep a track of VG locks in our own hash table. In current
-	 * practice there should only ever be more than two VGs locked
-	 * if a user tries to merge lots of them at once
-	 */
-	if (!client->bits.localsock.private) {
-		if (!(lock_hash = dm_hash_create(3)))
-			return ENOMEM;
-		client->bits.localsock.private = (void *) lock_hash;
-	} else
-		lock_hash = (struct dm_hash_table *) client->bits.localsock.private;
+    /* Keep a track of VG locks in our own hash table. In current
+       practice there should only ever be more than two VGs locked
+       if a user tries to merge lots of them at once */
+    if (client->bits.localsock.private) {
+	lock_hash = (struct dm_hash_table *)client->bits.localsock.private;
+    }
+    else {
+	lock_hash = dm_hash_create(3);
+	if (!lock_hash)
+	    return ENOMEM;
+	client->bits.localsock.private = (void *)lock_hash;
+    }
 
-	lock_cmd = args[0] & (LCK_NONBLOCK | LCK_HOLD | LCK_SCOPE_MASK | LCK_TYPE_MASK);
-	lock_mode = ((int) lock_cmd & LCK_TYPE_MASK);
-	/* lock_flags = args[1]; */
-	lockname = &args[2];
-	DEBUGLOG("doing PRE command LOCK_VG '%s' at %x (client=%p)\n", lockname, lock_cmd, client);
+    lock_cmd = args[0] & (LCK_NONBLOCK | LCK_HOLD | LCK_SCOPE_MASK | LCK_TYPE_MASK);
+    lock_mode = ((int)lock_cmd & LCK_TYPE_MASK);
+    /* lock_flags = args[1]; */
+    lockname = &args[2];
+    DEBUGLOG("doing PRE command LOCK_VG '%s' at %x (client=%p)\n", lockname, lock_cmd, client);
 
-	if (lock_mode == LCK_UNLOCK) {
-		if (!(lkid = (int) (long) dm_hash_lookup(lock_hash, lockname)))
-			return EINVAL;
+    if (lock_mode == LCK_UNLOCK) {
 
-		if ((status = sync_unlock(lockname, lkid)))
-			status = errno;
-		else
-			dm_hash_remove(lock_hash, lockname);
-	} else {
-		/* Read locks need to be PR; other modes get passed through */
-		if (lock_mode == LCK_READ)
-			lock_mode = LCK_PREAD;
+	lkid = (int)(long)dm_hash_lookup(lock_hash, lockname);
+	if (lkid == 0)
+	    return EINVAL;
 
-		if ((status = sync_lock(lockname, lock_mode, (lock_cmd & LCK_NONBLOCK) ? LCKF_NOQUEUE : 0, &lkid)))
-			status = errno;
-		else if (!dm_hash_insert(lock_hash, lockname, (void *) (long) lkid))
-			return ENOMEM;
-	}
+	status = sync_unlock(lockname, lkid);
+	if (status)
+	    status = errno;
+	else
+	    dm_hash_remove(lock_hash, lockname);
+    }
+    else {
+	/* Read locks need to be PR; other modes get passed through */
+	if (lock_mode == LCK_READ)
+	    lock_mode = LCK_PREAD;
+	status = sync_lock(lockname, lock_mode, (lock_cmd & LCK_NONBLOCK) ? LCKF_NOQUEUE : 0, &lkid);
+	if (status)
+	    status = errno;
+	else
+	    if (!dm_hash_insert(lock_hash, lockname, (void *)(long)lkid))
+                    return ENOMEM;
+    }
 
-	return status;
+    return status;
 }
 
 
@@ -245,6 +259,7 @@ int do_pre_command(struct local_client *client)
 	int status = 0;
 	char *lockname;
 
+	init_test(0);
 	switch (header->cmd) {
 	case CLVMD_CMD_TEST:
 		status = sync_lock("CLVMD_TEST", LCK_EXCL, 0, &lockid);
@@ -263,6 +278,8 @@ int do_pre_command(struct local_client *client)
 		lock_cmd = args[0];
 		lock_flags = args[1];
 		lockname = &args[2];
+		if (lock_flags & LCK_TEST_MODE)
+			init_test(1);
 		status = pre_lock_lv(lock_cmd, lock_flags, lockname);
 		break;
 
@@ -294,16 +311,20 @@ int do_post_command(struct local_client *client)
 	char *args = header->node + strlen(header->node) + 1;
 	char *lockname;
 
+	init_test(0);
 	switch (header->cmd) {
 	case CLVMD_CMD_TEST:
-		status = sync_unlock("CLVMD_TEST", (int) (long) client->bits.localsock.private);
-		client->bits.localsock.private = NULL;
+		status =
+		    sync_unlock("CLVMD_TEST", (int) (long) client->bits.localsock.private);
+		client->bits.localsock.private = 0;
 		break;
 
 	case CLVMD_CMD_LOCK_LV:
 		lock_cmd = args[0];
 		lock_flags = args[1];
 		lockname = &args[2];
+		if (lock_flags & LCK_TEST_MODE)
+			init_test(1);
 		status = post_lock_lv(lock_cmd, lock_flags, lockname);
 		break;
 
@@ -323,7 +344,6 @@ void cmd_client_cleanup(struct local_client *client)
 	int lkid;
 	char *lockname;
 
-	DEBUGLOG("Client thread cleanup (%p)\n", client);
 	if (!client->bits.localsock.private)
 		return;
 
@@ -332,14 +352,15 @@ void cmd_client_cleanup(struct local_client *client)
 	dm_hash_iterate(v, lock_hash) {
 		lkid = (int)(long)dm_hash_get_data(lock_hash, v);
 		lockname = dm_hash_get_key(lock_hash, v);
-		DEBUGLOG("Cleanup (%p): Unlocking lock %s %x\n", client, lockname, lkid);
+		DEBUGLOG("cleanup: Unlocking lock %s %x\n", lockname, lkid);
 		(void) sync_unlock(lockname, lkid);
 	}
 
 	dm_hash_destroy(lock_hash);
-	client->bits.localsock.private = NULL;
+	client->bits.localsock.private = 0;
 }
 
+
 static int restart_clvmd(void)
 {
 	const char **argv;

daemons/clvmd/clvmd-common.h

@@ -18,10 +18,16 @@
 #ifndef _LVM_CLVMD_COMMON_H
 #define _LVM_CLVMD_COMMON_H
 
-#define _REENTRANT
+#include "configure.h"
 
-#include "tool.h"
+#define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
+
+#include "libdevmapper.h"
 
 #include "lvm-logging.h"
 
+#include <unistd.h>
+#include <sys/stat.h>
+
 #endif

daemons/clvmd/clvmd-corosync.c

@@ -89,7 +89,7 @@ quorum_callbacks_t quorum_callbacks = {
 
 struct node_info
 {
-	enum {NODE_DOWN, NODE_CLVMD} state;
+	enum {NODE_UNKNOWN, NODE_DOWN, NODE_UP, NODE_CLVMD} state;
 	int nodeid;
 };
 
@@ -255,6 +255,26 @@ static void corosync_cpg_confchg_callback(cpg_handle_t handle,
 			ninfo->state = NODE_DOWN;
 	}
 
+	for (i=0; i<member_list_entries; i++) {
+		if (member_list[i].nodeid == 0) continue;
+		ninfo = dm_hash_lookup_binary(node_hash,
+				(char *)&member_list[i].nodeid,
+				COROSYNC_CSID_LEN);
+		if (!ninfo) {
+			ninfo = malloc(sizeof(struct node_info));
+			if (!ninfo) {
+				break;
+			}
+			else {
+				ninfo->nodeid = member_list[i].nodeid;
+				dm_hash_insert_binary(node_hash,
+						(char *)&ninfo->nodeid,
+						COROSYNC_CSID_LEN, ninfo);
+			}
+		}
+		ninfo->state = NODE_CLVMD;
+	}
+
 	num_nodes = member_list_entries;
 }
 
@@ -345,6 +365,9 @@ static int _init_cluster(void)
 
 static void _cluster_closedown(void)
 {
+	DEBUGLOG("cluster_closedown\n");
+	destroy_lvhash();
+
 	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 	cpg_finalize(cpg_handle);
 	quorum_finalize(quorum_handle);
@@ -385,7 +408,7 @@ static int _name_from_csid(const char *csid, char *name)
 	return 0;
 }
 
-static int _get_num_nodes(void)
+static int _get_num_nodes()
 {
 	DEBUGLOG("num_nodes = %d\n", num_nodes);
 	return num_nodes;
@@ -417,6 +440,7 @@ static int _cluster_do_node_callback(struct local_client *master_client,
 {
 	struct dm_hash_node *hn;
 	struct node_info *ninfo;
+	int somedown = 0;
 
 	dm_hash_iterate(hn, node_hash)
 	{
@@ -428,10 +452,12 @@ static int _cluster_do_node_callback(struct local_client *master_client,
 		DEBUGLOG("down_callback. node %d, state = %d\n", ninfo->nodeid,
 			 ninfo->state);
 
-		if (ninfo->state == NODE_CLVMD)
-			callback(master_client, csid, 1);
+		if (ninfo->state != NODE_DOWN)
+			callback(master_client, csid, ninfo->state == NODE_CLVMD);
+		if (ninfo->state != NODE_CLVMD)
+			somedown = -1;
 	}
-	return 0;
+	return somedown;
 }
 
 /* Real locking */
@@ -502,7 +528,7 @@ static int _unlock_resource(const char *resource, int lockid)
 	return 0;
 }
 
-static int _is_quorate(void)
+static int _is_quorate()
 {
 	int quorate;
 	if (quorum_getquorate(quorum_handle, &quorate) == CS_OK)

daemons/clvmd/clvmd-openais.c

@@ -197,7 +197,9 @@ static int add_internal_client(int fd, fd_callback_t callback)
 
 	DEBUGLOG("Add_internal_client, fd = %d\n", fd);
 
-	if (!(client = dm_zalloc(sizeof(*client)))) {
+	client = calloc(1, sizeof(struct local_client));
+	if (!client)
+	{
 		DEBUGLOG("malloc failed\n");
 		return -1;
 	}
@@ -243,7 +245,7 @@ static void openais_cpg_confchg_callback(cpg_handle_t handle,
 	struct node_info *ninfo;
 
 	DEBUGLOG("confchg callback. %" PRIsize_t " joined, "
-		 FMTsize_t " left, %" PRIsize_t " members\n",
+		 "%" PRIsize_t " left, %" PRIsize_t " members\n",
 		 joined_list_entries, left_list_entries, member_list_entries);
 
 	for (i=0; i<joined_list_entries; i++) {
@@ -365,6 +367,9 @@ static int _init_cluster(void)
 
 static void _cluster_closedown(void)
 {
+	DEBUGLOG("cluster_closedown\n");
+	destroy_lvhash();
+
 	saLckFinalize(lck_handle);
 	cpg_finalize(cpg_handle);
 }
@@ -684,6 +689,6 @@ struct cluster_ops *init_openais_cluster(void)
 {
 	if (!_init_cluster())
 		return &_cluster_openais_ops;
-
-	return NULL;
+	else
+		return NULL;
 }

daemons/clvmd/clvmd-singlenode.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -19,6 +19,7 @@
 #include "locking.h"
 #include "clvm.h"
 #include "clvmd-comms.h"
+#include "lvm-functions.h"
 #include "clvmd.h"
 
 #include <sys/un.h>
@@ -31,14 +32,10 @@ static int listen_fd = -1;
 static struct dm_hash_table *_locks;
 static int _lockid;
 
-static pthread_mutex_t _lock_mutex = PTHREAD_MUTEX_INITIALIZER;
-/* Using one common condition for all locks for simplicity */
-static pthread_cond_t _lock_cond = PTHREAD_COND_INITIALIZER;
-
 struct lock {
-	struct dm_list list;
 	int lockid;
 	int mode;
+	int excl;
 };
 
 static void close_comms(void)
@@ -108,7 +105,6 @@ static int _init_cluster(void)
 	r = init_comms();
 	if (r) {
 		dm_hash_destroy(_locks);
-		_locks = NULL;
 		return r;
 	}
 
@@ -120,13 +116,11 @@ static void _cluster_closedown(void)
 {
 	close_comms();
 
-	/* If there is any awaited resource, kill it softly */
-	pthread_mutex_lock(&_lock_mutex);
+	DEBUGLOG("cluster_closedown\n");
+	destroy_lvhash();
 	dm_hash_destroy(_locks);
 	_locks = NULL;
 	_lockid = 0;
-	pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */
-	pthread_mutex_unlock(&_lock_mutex);
 }
 
 static void _get_our_csid(char *csid)
@@ -166,115 +160,64 @@ static int _cluster_do_node_callback(struct local_client *master_client,
 
 int _lock_file(const char *file, uint32_t flags);
 
-static const char *_get_mode(int mode)
-{
-	switch (mode) {
-	case LCK_NULL: return "NULL";
-	case LCK_READ: return "READ";
-	case LCK_PREAD: return "PREAD";
-	case LCK_WRITE: return "WRITE";
-	case LCK_EXCL: return "EXCLUSIVE";
-	case LCK_UNLOCK: return "UNLOCK";
-	default: return "????";
-	}
-}
+static pthread_mutex_t _lock_mutex = PTHREAD_MUTEX_INITIALIZER;
+/* Using one common condition for all locks for simplicity */
+static pthread_cond_t _lock_cond = PTHREAD_COND_INITIALIZER;
 
 /* Real locking */
 static int _lock_resource(const char *resource, int mode, int flags, int *lockid)
 {
-	/* DLM table of allowed transition states */
-	static const int _dlm_table[6][6] = {
-	/* Mode	   NL	CR	CW	PR	PW	EX */
-	/* NL */ { 1,	 1,	 1,	 1,	 1,	 1},
-	/* CR */ { 1,	 1,	 1,	 1,	 1,	 0},
-	/* CW */ { 1,	 1,	 1,	 0,	 0,	 0},
-	/* PR */ { 1,	 1,	 0,	 1,	 0,	 0},
-	/* PW */ { 1,	 1,	 0,	 0,	 0,	 0},
-	/* EX */ { 1,	 0,	 0,	 0,	 0,	 0}
-	};
+	struct lock *lck;
 
-	struct lock *lck = NULL, *lckt;
-	struct dm_list *head;
-
-	DEBUGLOG("Locking resource %s, flags=0x%02x (%s%s%s), mode=%s (%d)\n",
-		 resource, flags,
-		 (flags & LCKF_NOQUEUE) ? "NOQUEUE" : "",
-		 ((flags & (LCKF_NOQUEUE | LCKF_CONVERT)) ==
-		  (LCKF_NOQUEUE | LCKF_CONVERT)) ? "|" : "",
-		 (flags & LCKF_CONVERT) ? "CONVERT" : "",
-		 _get_mode(mode), mode);
+	DEBUGLOG("Locking resource %s, flags=%d, mode=%d\n",
+		 resource, flags, mode);
 
 	mode &= LCK_TYPE_MASK;
 	pthread_mutex_lock(&_lock_mutex);
-
 retry:
-	if (!(head = dm_hash_lookup(_locks, resource))) {
-		if (flags & LCKF_CONVERT) {
-			/* In real DLM, lock is identified only by lockid, resource is not used */
-			DEBUGLOG("Unlocked resource %s cannot be converted\n", resource);
-			goto_bad;
-		}
+	if (!(lck = dm_hash_lookup(_locks, resource))) {
 		/* Add new locked resource */
-		if (!(head = dm_malloc(sizeof(struct dm_list))) ||
-		    !dm_hash_insert(_locks, resource, head)) {
-			dm_free(head);
-			goto_bad;
-		}
+		if (!(lck = dm_zalloc(sizeof(struct lock))) ||
+		    !dm_hash_insert(_locks, resource, lck))
+			goto bad;
 
-		dm_list_init(head);
-	} else	/* Update/convert locked resource */
-		dm_list_iterate_items(lck, head) {
-			/* Check is all locks are compatible with requested lock */
-			if (flags & LCKF_CONVERT) {
-				if (lck->lockid != *lockid)
-					continue;
-
-				DEBUGLOG("Converting resource %s lockid=%d mode:%s -> %s...\n",
-					 resource, lck->lockid, _get_mode(lck->mode), _get_mode(mode));
-				dm_list_iterate_items(lckt, head) {
-					if ((lckt->lockid != *lockid) &&
-					    !_dlm_table[mode][lckt->mode]) {
-						if (!(flags & LCKF_NOQUEUE) &&
-						    /* TODO: Real dlm uses here conversion queues */
-						    !pthread_cond_wait(&_lock_cond, &_lock_mutex) &&
-						    _locks) /* End of the game? */
-							goto retry;
-						goto bad;
-					}
-				}
-				lck->mode = mode; /* Lock is now converted */
-				goto out;
-			} else if (!_dlm_table[mode][lck->mode]) {
-				DEBUGLOG("Resource %s already locked lockid=%d, mode:%s\n",
-					 resource, lck->lockid, _get_mode(lck->mode));
-				if (!(flags & LCKF_NOQUEUE) &&
-				    !pthread_cond_wait(&_lock_cond, &_lock_mutex) &&
-				    _locks) { /* End of the game? */
-					DEBUGLOG("Resource %s retrying lock in mode:%s...\n",
-						 resource, _get_mode(mode));
-					goto retry;
-				}
-				goto bad;
-			}
-		}
-
-	if (!(flags & LCKF_CONVERT)) {
-		if (!(lck = dm_malloc(sizeof(struct lock))))
-			goto_bad;
-
-		*lockid = lck->lockid = ++_lockid;
-		lck->mode = mode;
-		dm_list_add(head, &lck->list);
+		lck->lockid = ++_lockid;
+		goto out;
 	}
+
+        /* Update/convert lock */
+	if (flags == LCKF_CONVERT) {
+		if (lck->excl)
+			mode = LCK_EXCL;
+	} else if ((lck->mode == LCK_WRITE) || (lck->mode == LCK_EXCL)) {
+		DEBUGLOG("Resource %s already %s locked (%d)...\n", resource,
+			 (lck->mode == LCK_WRITE) ? "write" : "exclusively", lck->lockid);
+		goto maybe_retry;
+	} else if (lck->mode > mode) {
+		DEBUGLOG("Resource %s already locked and %s lock requested...\n",
+			 resource,
+			 (mode == LCK_READ) ? "READ" :
+			 (mode == LCK_WRITE) ? "WRITE" : "EXCLUSIVE");
+		goto maybe_retry;
+	}
+
 out:
-	pthread_cond_broadcast(&_lock_cond); /* to wakeup waiters */
+	*lockid = lck->lockid;
+	lck->mode = mode;
+	lck->excl |= (mode == LCK_EXCL);
+	DEBUGLOG("Locked resource %s, lockid=%d, mode=%d\n", resource, lck->lockid, mode);
+	pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */
 	pthread_mutex_unlock(&_lock_mutex);
-	DEBUGLOG("Locked resource %s, lockid=%d, mode=%s\n",
-		 resource, lck->lockid, _get_mode(lck->mode));
 
 	return 0;
+
+maybe_retry:
+	if (!(flags & LCK_NONBLOCK)) {
+		pthread_cond_wait(&_lock_cond, &_lock_mutex);
+		DEBUGLOG("Resource %s RETRYING lock...\n", resource);
+		goto retry;
+	}
 bad:
-	pthread_cond_broadcast(&_lock_cond); /* to wakeup waiters */
 	pthread_mutex_unlock(&_lock_mutex);
 	DEBUGLOG("Failed to lock resource %s\n", resource);
 
@@ -284,44 +227,35 @@ bad:
 static int _unlock_resource(const char *resource, int lockid)
 {
 	struct lock *lck;
-	struct dm_list *head;
-	int r = 1;
 
 	if (lockid < 0) {
 		DEBUGLOG("Not tracking unlock of lockid -1: %s, lockid=%d\n",
 			 resource, lockid);
-		return 1;
+		return 0;
 	}
 
 	DEBUGLOG("Unlocking resource %s, lockid=%d\n", resource, lockid);
 	pthread_mutex_lock(&_lock_mutex);
-	pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */
 
-	if (!(head = dm_hash_lookup(_locks, resource))) {
+	if (!(lck = dm_hash_lookup(_locks, resource))) {
 		pthread_mutex_unlock(&_lock_mutex);
-		DEBUGLOG("Resource %s is not locked.\n", resource);
+		DEBUGLOG("Resource %s, lockid=%d is not locked.\n", resource, lockid);
 		return 1;
 	}
 
-	dm_list_iterate_items(lck, head)
-		if (lck->lockid == lockid) {
-			dm_list_del(&lck->list);
-			dm_free(lck);
-			r = 0;
-			goto out;
-		}
-
-	DEBUGLOG("Resource %s has wrong lockid %d.\n", resource, lockid);
-out:
-	if (dm_list_empty(head)) {
-		//DEBUGLOG("Resource %s is no longer hashed (lockid=%d).\n", resource, lockid);
-		dm_hash_remove(_locks, resource);
-		dm_free(head);
+	if (lck->lockid != lockid) {
+		pthread_mutex_unlock(&_lock_mutex);
+		DEBUGLOG("Resource %s has wrong lockid %d, expected %d.\n",
+			 resource, lck->lockid, lockid);
+		return 1;
 	}
 
+	dm_hash_remove(_locks, resource);
+	pthread_cond_broadcast(&_lock_cond); /* wakeup waiters */
 	pthread_mutex_unlock(&_lock_mutex);
+	dm_free(lck);
 
-	return r;
+	return 0;
 }
 
 static int _is_quorate(void)

daemons/clvmd/clvmd.h

@@ -53,12 +53,13 @@ struct localsock_bits {
 	int finished;		/* Flag to tell subthread to exit */
 	int all_success;	/* Set to 0 if any node (or the pre_command)
 				   failed */
-	int cleanup_needed;     /* helper for cleanup_zombie */
 	struct local_client *pipe_client;
 	pthread_t threadid;
-	enum { PRE_COMMAND, POST_COMMAND } state;
+	enum { PRE_COMMAND, POST_COMMAND, QUIT } state;
 	pthread_mutex_t mutex;	/* Main thread and worker synchronisation */
 	pthread_cond_t cond;
+
+	pthread_mutex_t reply_mutex;	/* Protect reply structure */
 };
 
 /* Entries for PIPE clients */

daemons/clvmd/lvm-functions.c

@@ -17,6 +17,7 @@
 
 #include <pthread.h>
 
+#include "lvm-types.h"
 #include "clvm.h"
 #include "clvmd-comms.h"
 #include "clvmd.h"
@@ -130,15 +131,14 @@ static const char *decode_flags(unsigned char flags)
 	static char buf[128];
 	int len;
 
-	len = sprintf(buf, "0x%x ( %s%s%s%s%s%s%s%s)", flags,
+	len = sprintf(buf, "0x%x ( %s%s%s%s%s%s%s)", flags,
 		flags & LCK_PARTIAL_MODE	  ? "PARTIAL_MODE|" : "",
 		flags & LCK_MIRROR_NOSYNC_MODE	  ? "MIRROR_NOSYNC|" : "",
 		flags & LCK_DMEVENTD_MONITOR_MODE ? "DMEVENTD_MONITOR|" : "",
 		flags & LCK_ORIGIN_ONLY_MODE ? "ORIGIN_ONLY|" : "",
 		flags & LCK_TEST_MODE ? "TEST|" : "",
-		flags & LCK_CONVERT_MODE ? "CONVERT|" : "",
-		flags & LCK_DMEVENTD_MONITOR_IGNORE ? "DMEVENTD_MONITOR_IGNORE|" : "",
-		flags & LCK_REVERT_MODE ? "REVERT|" : "");
+		flags & LCK_CONVERT ? "CONVERT|" : "",
+		flags & LCK_DMEVENTD_MONITOR_IGNORE ? "DMEVENTD_MONITOR_IGNORE|" : "");
 
 	if (len > 1)
 		buf[len - 2] = ' ';
@@ -180,19 +180,8 @@ static int insert_info(const char *resource, struct lv_info *lvi)
 
 static void remove_info(const char *resource)
 {
-	int num_open;
-
 	pthread_mutex_lock(&lv_hash_lock);
 	dm_hash_remove(lv_hash, resource);
-
-	/* When last lock is remove, validate there are not left opened devices */
-	if (!dm_hash_get_first(lv_hash)) {
-		if (critical_section())
-			log_error(INTERNAL_ERROR "No volumes are locked however clvmd is in activation mode critical section.");
-		if ((num_open = dev_cache_check_for_open_devices()))
-			log_error(INTERNAL_ERROR "No volumes are locked however %d devices are still open.", num_open);
-	}
-
 	pthread_mutex_unlock(&lv_hash_lock);
 }
 
@@ -235,7 +224,7 @@ void destroy_lvhash(void)
 		if ((status = sync_unlock(resource, lvi->lock_id)))
 			DEBUGLOG("unlock_all. unlock failed(%d): %s\n",
 				 status,  strerror(errno));
-		dm_free(lvi);
+		free(lvi);
 	}
 
 	dm_hash_destroy(lv_hash);
@@ -251,6 +240,9 @@ static int hold_lock(char *resource, int mode, int flags)
 	int saved_errno;
 	struct lv_info *lvi;
 
+	if (test_mode())
+		return 0;
+
 	/* Mask off invalid options */
 	flags &= LCKF_NOQUEUE | LCKF_CONVERT;
 
@@ -264,7 +256,7 @@ static int hold_lock(char *resource, int mode, int flags)
 		}
 		if ((lvi->lock_mode == LCK_EXCL) && (mode == LCK_WRITE)) {
 			DEBUGLOG("hold_lock, lock already held LCK_EXCL, "
-				 "ignoring LCK_WRITE request\n");
+				 "ignoring LCK_WRITE request");
 			return 0;
 		}
 	}
@@ -276,16 +268,20 @@ static int hold_lock(char *resource, int mode, int flags)
 	}
 	if (lvi) {
 		/* Already exists - convert it */
-		status = sync_lock(resource, mode, flags, &lvi->lock_id);
+		status =
+		    sync_lock(resource, mode, flags, &lvi->lock_id);
 		saved_errno = errno;
 		if (!status)
 			lvi->lock_mode = mode;
-		else
+
+		if (status) {
 			DEBUGLOG("hold_lock. convert to %d failed: %s\n", mode,
 				 strerror(errno));
+		}
 		errno = saved_errno;
 	} else {
-		if (!(lvi = dm_malloc(sizeof(struct lv_info)))) {
+		lvi = malloc(sizeof(struct lv_info));
+		if (!lvi) {
 			errno = ENOMEM;
 			return -1;
 		}
@@ -294,7 +290,7 @@ static int hold_lock(char *resource, int mode, int flags)
 		status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id);
 		saved_errno = errno;
 		if (status) {
-			dm_free(lvi);
+			free(lvi);
 			DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode,
 				 strerror(errno));
 		} else
@@ -315,6 +311,9 @@ static int hold_unlock(char *resource)
 	int status;
 	int saved_errno;
 
+	if (test_mode())
+		return 0;
+
 	if (!(lvi = lookup_info(resource))) {
 		DEBUGLOG("hold_unlock, lock not already held\n");
 		return 0;
@@ -324,7 +323,7 @@ static int hold_unlock(char *resource)
 	saved_errno = errno;
 	if (!status) {
 		remove_info(resource);
-		dm_free(lvi);
+		free(lvi);
 	} else {
 		DEBUGLOG("hold_unlock. unlock failed(%d): %s\n", status,
 			 strerror(errno));
@@ -374,8 +373,8 @@ static int do_activate_lv(char *resource, unsigned char command, unsigned char l
 	 * Use lock conversion only if requested, to prevent implicit conversion
 	 * of exclusive lock to shared one during activation.
 	 */
-	if (!test_mode() && command & LCK_CLUSTER_VG) {
-		status = hold_lock(resource, mode, LCKF_NOQUEUE | ((lock_flags & LCK_CONVERT_MODE) ? LCKF_CONVERT:0));
+	if (command & LCK_CLUSTER_VG) {
+		status = hold_lock(resource, mode, LCKF_NOQUEUE | (lock_flags & LCK_CONVERT ? LCKF_CONVERT:0));
 		if (status) {
 			/* Return an LVM-sensible error for this.
 			 * Forcing EIO makes the upper level return this text
@@ -402,13 +401,13 @@ static int do_activate_lv(char *resource, unsigned char command, unsigned char l
 	}
 
 	/* Now activate it */
-	if (!lv_activate(cmd, resource, exclusive, 0, 0, NULL))
+	if (!lv_activate(cmd, resource, exclusive, NULL))
 		goto error;
 
 	return 0;
 
 error:
-	if (!test_mode() && (oldmode == -1 || oldmode != mode))
+	if (oldmode == -1 || oldmode != mode)
 		(void)hold_unlock(resource);
 	return EIO;
 }
@@ -472,7 +471,7 @@ static int do_deactivate_lv(char *resource, unsigned char command, unsigned char
 	if (!lv_deactivate(cmd, resource, NULL))
 		return EIO;
 
-	if (!test_mode() && command & LCK_CLUSTER_VG) {
+	if (command & LCK_CLUSTER_VG) {
 		status = hold_unlock(resource);
 		if (status)
 			return errno;
@@ -484,19 +483,18 @@ static int do_deactivate_lv(char *resource, unsigned char command, unsigned char
 const char *do_lock_query(char *resource)
 {
 	int mode;
-	const char *type;
+	const char *type = NULL;
 
 	mode = get_current_lock(resource);
 	switch (mode) {
-	case LCK_NULL: type = "NL"; break;
-	case LCK_READ: type = "CR"; break;
-	case LCK_PREAD:type = "PR"; break;
-	case LCK_WRITE:type = "PW"; break;
-	case LCK_EXCL: type = "EX"; break;
-	default: type = NULL;
+		case LCK_NULL: type = "NL"; break;
+		case LCK_READ: type = "CR"; break;
+		case LCK_PREAD:type = "PR"; break;
+		case LCK_WRITE:type = "PW"; break;
+		case LCK_EXCL: type = "EX"; break;
 	}
 
-	DEBUGLOG("do_lock_query: resource '%s', mode %i (%s)\n", resource, mode, type ?: "--");
+	DEBUGLOG("do_lock_query: resource '%s', mode %i (%s)\n", resource, mode, type ?: "?");
 
 	return type;
 }
@@ -510,7 +508,7 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 	DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s, critical_section = %d\n",
 		 resource, decode_locking_cmd(command), decode_flags(lock_flags), critical_section());
 
-	if (!cmd->initialized.config || config_files_changed(cmd)) {
+	if (!cmd->config_valid || config_files_changed(cmd)) {
 		/* Reinitialise various settings inc. logging, filters */
 		if (do_refresh_cache()) {
 			log_error("Updated config file invalid. Aborting.");
@@ -519,8 +517,6 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 	}
 
 	pthread_mutex_lock(&lvm_lock);
-	init_test((lock_flags & LCK_TEST_MODE) ? 1 : 0);
-
 	if (lock_flags & LCK_MIRROR_NOSYNC_MODE)
 		init_mirror_in_sync(1);
 
@@ -573,7 +569,6 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 
 	/* clean the pool for another command */
 	dm_pool_empty(cmd->mem);
-	init_test(0);
 	pthread_mutex_unlock(&lvm_lock);
 
 	DEBUGLOG("Command return is %d, critical_section is %d\n", status, critical_section());
@@ -593,8 +588,7 @@ int pre_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 		DEBUGLOG("pre_lock_lv: resource '%s', cmd = %s, flags = %s\n",
 			 resource, decode_locking_cmd(command), decode_flags(lock_flags));
 
-		if (!(lock_flags & LCK_TEST_MODE) &&
-		    hold_lock(resource, LCK_WRITE, LCKF_NOQUEUE | LCKF_CONVERT))
+		if (hold_lock(resource, LCK_WRITE, LCKF_NOQUEUE | LCKF_CONVERT))
 			return errno;
 	}
 	return 0;
@@ -612,8 +606,9 @@ int post_lock_lv(unsigned char command, unsigned char lock_flags,
 	    (command & LCK_CLUSTER_VG)) {
 		int oldmode;
 
-		DEBUGLOG("post_lock_lv: resource '%s', cmd = %s, flags = %s\n",
-			 resource, decode_locking_cmd(command), decode_flags(lock_flags));
+		DEBUGLOG
+		    ("post_lock_lv: resource '%s', cmd = %s, flags = %s\n",
+		     resource, decode_locking_cmd(command), decode_flags(lock_flags));
 
 		/* If the lock state is PW then restore it to what it was */
 		oldmode = get_current_lock(resource);
@@ -626,13 +621,11 @@ int post_lock_lv(unsigned char command, unsigned char lock_flags,
 			if (!status)
 				return EIO;
 
-			if (!(lock_flags & LCK_TEST_MODE)) {
-				if (lvi.exists) {
-					if (hold_lock(resource, LCK_READ, LCKF_CONVERT))
-						return errno;
-				} else if (hold_unlock(resource))
+			if (lvi.exists) {
+				if (hold_lock(resource, LCK_READ, LCKF_CONVERT))
 					return errno;
-			}
+			} else if (hold_unlock(resource))
+				return errno;
 		}
 	}
 	return 0;
@@ -696,8 +689,6 @@ void do_lock_vg(unsigned char command, unsigned char lock_flags, char *resource)
 	}
 
 	pthread_mutex_lock(&lvm_lock);
-	init_test((lock_flags & LCK_TEST_MODE) ? 1 : 0);
-
 	switch (lock_cmd) {
 		case LCK_VG_COMMIT:
 			DEBUGLOG("vg_commit notification for VG %s\n", vgname);
@@ -712,8 +703,6 @@ void do_lock_vg(unsigned char command, unsigned char lock_flags, char *resource)
 			DEBUGLOG("Invalidating cached metadata for VG %s\n", vgname);
 			lvmcache_drop_metadata(vgname, 0);
 	}
-
-	init_test(0);
 	pthread_mutex_unlock(&lvm_lock);
 }
 
@@ -725,7 +714,7 @@ void do_lock_vg(unsigned char command, unsigned char lock_flags, char *resource)
 static int get_initial_state(struct dm_hash_table *excl_uuid)
 {
 	int lock_mode;
-	char lv[65], vg[65], flags[26], vg_flags[26]; /* with space for '\0' */
+	char lv[64], vg[64], flags[25], vg_flags[25];
 	char uuid[65];
 	char line[255];
 	char *lvs_cmd;
@@ -814,7 +803,7 @@ static void check_config(void)
 {
 	int locking_type;
 
-	locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL);
+	locking_type = find_config_tree_int(cmd, global_locking_type_CFG);
 
 	if (locking_type == 3) /* compiled-in cluster support */
 		return;
@@ -822,7 +811,7 @@ static void check_config(void)
 	if (locking_type == 2) { /* External library, check name */
 		const char *libname;
 
-		libname = find_config_tree_str(cmd, global_locking_library_CFG, NULL);
+		libname = find_config_tree_str(cmd, global_locking_library_CFG);
 		if (libname && strstr(libname, "liblvm2clusterlock.so"))
 			return;
 
@@ -842,7 +831,7 @@ void lvm_do_backup(const char *vgname)
 
 	pthread_mutex_lock(&lvm_lock);
 
-	vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, WARN_PV_READ, &consistent);
+	vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, 1, &consistent);
 
 	if (vg && consistent)
 		check_current_backup(vg);
@@ -899,7 +888,7 @@ int init_clvm(struct dm_hash_table *excl_uuid)
 	if (!get_initial_state(excl_uuid))
 		log_error("Cannot load initial lock states.");
 
-	if (!(cmd = create_toolcontext(1, NULL, 0, 1, 1, 1))) {
+	if (!(cmd = create_toolcontext(1, NULL, 0, 1))) {
 		log_error("Failed to allocate command context");
 		return 0;
 	}
@@ -927,6 +916,6 @@ void destroy_lvm(void)
 	if (cmd) {
 		memlock_dec_daemon(cmd);
 		destroy_toolcontext(cmd);
-		cmd = NULL;
 	}
+	cmd = NULL;
 }

daemons/cmirrord/.gitignore

@@ -1 +0,0 @@
-cmirrord

daemons/cmirrord/Makefile.in

@@ -28,8 +28,7 @@ include $(top_builddir)/make.tmpl
 
 LIBS += -ldevmapper
 LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)
-CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS)
-LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
+CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS)
 
 cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \

daemons/cmirrord/clogd.c

@@ -15,7 +15,6 @@
 #include "link_mon.h"
 #include "local.h"
 
-#include <getopt.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -33,49 +32,14 @@ static void daemonize(void);
 static void init_all(void);
 static void cleanup_all(void);
 
-static void usage (FILE *dest)
+int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused)))
 {
-	fprintf (dest, "Usage: cmirrord [options]\n"
-		 "   -f, --foreground    stay in the foreground, log to the terminal\n"
-		 "   -h, --help          print this help\n");
-}
-
-int main(int argc, char *argv[])
-{
-	int foreground_mode = 0;
-	struct option longopts[] = {
-		{ "foreground", no_argument, NULL, 'f' },
-		{ "help"      , no_argument, NULL, 'h' },
-		{ 0, 0, 0, 0 }
-	};
-	int opt;
-
-	while ((opt = getopt_long (argc, argv, "fh", longopts, NULL)) != -1) {
-		switch (opt) {
-		case 'f':
-			foreground_mode = 1;
-			break;
-		case 'h':
-			usage (stdout);
-			exit (0);
-		default:
-			usage (stderr);
-			exit (2);
-		}
-	}
-	if (optind < argc) {
-		usage (stderr);
-		exit (2);
-	}
-
-	if (!foreground_mode)
-		daemonize();
+	daemonize();
 
 	init_all();
 
 	/* Parent can now exit, we're ready to handle requests */
-	if (!foreground_mode)
-		kill(getppid(), SIGTERM);
+	kill(getppid(), SIGTERM);
 
 	LOG_PRINT("Starting cmirrord:");
 	LOG_PRINT(" Built: "__DATE__" "__TIME__"\n");
@@ -238,23 +202,7 @@ static void daemonize(void)
 	    (dup2(devnull, 2) < 0))   /* reopen stderr */
 		exit(EXIT_FAILURE);
 
-	if ((devnull > STDERR_FILENO) && close(devnull)) {
-		LOG_ERROR("Failed to close descriptor %d: %s",
-			  devnull, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
 	LOG_OPEN("cmirrord", LOG_PID, LOG_DAEMON);
-}
-
-/*
- * init_all
- *
- * Initialize modules.  Exit on failure.
- */
-static void init_all(void)
-{
-	int r;
 
 	(void) dm_prepare_selinux_context(CMIRRORD_PIDFILE, S_IFREG);
 	if (dm_create_lockfile(CMIRRORD_PIDFILE) == 0)
@@ -273,6 +221,16 @@ static void init_all(void)
 	signal(SIGUSR2, &sig_handler);
 	sigemptyset(&signal_mask);
 	signal_received = 0;
+}
+
+/*
+ * init_all
+ *
+ * Initialize modules.  Exit on failure.
+ */
+static void init_all(void)
+{
+	int r;
 
 	if ((r = init_local()) ||
 	    (r = init_cluster())) {

daemons/cmirrord/cluster.c

@@ -25,6 +25,7 @@
 #if CMIRROR_HAS_CHECKPOINT
 #include <openais/saAis.h>
 #include <openais/saCkpt.h>
+#endif
 
 /* Open AIS error codes */
 #define str_ais_error(x)						\
@@ -56,40 +57,6 @@
 	((x) == SA_AIS_ERR_TOO_BIG) ? "SA_AIS_ERR_TOO_BIG" :		\
 	((x) == SA_AIS_ERR_NO_SECTIONS) ? "SA_AIS_ERR_NO_SECTIONS" :	\
 	"ais_error_unknown"
-#else
-#define str_ais_error(x)						\
-	((x) == CS_OK) ? "CS_OK" :				\
-	((x) == CS_ERR_LIBRARY) ? "CS_ERR_LIBRARY" :		\
-	((x) == CS_ERR_VERSION) ? "CS_ERR_VERSION" :		\
-	((x) == CS_ERR_INIT) ? "CS_ERR_INIT" :			\
-	((x) == CS_ERR_TIMEOUT) ? "CS_ERR_TIMEOUT" :		\
-	((x) == CS_ERR_TRY_AGAIN) ? "CS_ERR_TRY_AGAIN" :	\
-	((x) == CS_ERR_INVALID_PARAM) ? "CS_ERR_INVALID_PARAM" : \
-	((x) == CS_ERR_NO_MEMORY) ? "CS_ERR_NO_MEMORY" :	\
-	((x) == CS_ERR_BAD_HANDLE) ? "CS_ERR_BAD_HANDLE" :	\
-	((x) == CS_ERR_BUSY) ? "CS_ERR_BUSY" :			\
-	((x) == CS_ERR_ACCESS) ? "CS_ERR_ACCESS" :		\
-	((x) == CS_ERR_NOT_EXIST) ? "CS_ERR_NOT_EXIST" :	\
-	((x) == CS_ERR_NAME_TOO_LONG) ? "CS_ERR_NAME_TOO_LONG" : \
-	((x) == CS_ERR_EXIST) ? "CS_ERR_EXIST" :		\
-	((x) == CS_ERR_NO_SPACE) ? "CS_ERR_NO_SPACE" :		\
-	((x) == CS_ERR_INTERRUPT) ? "CS_ERR_INTERRUPT" :	\
-	((x) == CS_ERR_NAME_NOT_FOUND) ? "CS_ERR_NAME_NOT_FOUND" : \
-	((x) == CS_ERR_NO_RESOURCES) ? "CS_ERR_NO_RESOURCES" :	\
-	((x) == CS_ERR_NOT_SUPPORTED) ? "CS_ERR_NOT_SUPPORTED" : \
-	((x) == CS_ERR_BAD_OPERATION) ? "CS_ERR_BAD_OPERATION" : \
-	((x) == CS_ERR_FAILED_OPERATION) ? "CS_ERR_FAILED_OPERATION" : \
-	((x) == CS_ERR_MESSAGE_ERROR) ? "CS_ERR_MESSAGE_ERROR" : \
-	((x) == CS_ERR_QUEUE_FULL) ? "CS_ERR_QUEUE_FULL" :	\
-	((x) == CS_ERR_QUEUE_NOT_AVAILABLE) ? "CS_ERR_QUEUE_NOT_AVAILABLE" : \
-	((x) == CS_ERR_BAD_FLAGS) ? "CS_ERR_BAD_FLAGS" :	\
-	((x) == CS_ERR_TOO_BIG) ? "CS_ERR_TOO_BIG" :		\
-	((x) == CS_ERR_NO_SECTIONS) ? "CS_ERR_NO_SECTIONS" :	\
-	((x) == CS_ERR_CONTEXT_NOT_FOUND) ? "CS_ERR_CONTEXT_NOT_FOUND" : \
-	((x) == CS_ERR_TOO_MANY_GROUPS) ? "CS_ERR_TOO_MANY_GROUPS" : \
-	((x) == CS_ERR_SECURITY) ? "CS_ERR_SECURITY" : \
-	"cs_error_unknown"
-#endif
 
 #define _RQ_TYPE(x)							\
 	((x) == DM_ULOG_CHECKPOINT_READY) ? "DM_ULOG_CHECKPOINT_READY": \
@@ -104,11 +71,10 @@ static SaVersionT version = { 'B', 1, 1 };
 #endif
 
 #define DEBUGGING_HISTORY 100
-#define DEBUGGING_BUFLEN 128
 #define LOG_SPRINT(cc, f, arg...) do {				\
 		cc->idx++;					\
 		cc->idx = cc->idx % DEBUGGING_HISTORY;		\
-		snprintf(cc->debugging[cc->idx], DEBUGGING_BUFLEN, f, ## arg); \
+		sprintf(cc->debugging[cc->idx], f, ## arg);	\
 	} while (0)
 
 static int log_resp_rec = 0;
@@ -151,7 +117,7 @@ struct clog_cpg {
 	uint32_t checkpoint_requesters[MAX_CHECKPOINT_REQUESTERS];
 	struct checkpoint_data *checkpoint_list;
 	int idx;
-	char debugging[DEBUGGING_HISTORY][DEBUGGING_BUFLEN];
+	char debugging[DEBUGGING_HISTORY][128];
 };
 
 static struct dm_list clog_cpg_list;
@@ -837,11 +803,6 @@ static int import_checkpoint(struct clog_cpg *entry, int no_read,
 {
 	int bitmap_size;
 
-	if (no_read) {
-		LOG_DBG("Checkpoint for this log already received");
-		return 0;
-	}
-
 	bitmap_size = (rq->u_rq.data_size - RECOVERING_REGION_SECTION_SIZE) / 2;
 	if (bitmap_size < 0) {
 		LOG_ERROR("Checkpoint has invalid payload size.");
@@ -985,16 +946,8 @@ static int do_cluster_work(void *data __attribute__((unused)))
 
 	dm_list_iterate_items_safe(entry, tmp, &clog_cpg_list) {
 		r = cpg_dispatch(entry->handle, CS_DISPATCH_ALL);
-		if (r != CS_OK) {
-			if ((r == CS_ERR_BAD_HANDLE) &&
-			    ((entry->state == INVALID) ||
-			     (entry->state == LEAVING)))
-				/* It's ok if we've left the cluster */
-				r = CS_OK;
-			else
-				LOG_ERROR("cpg_dispatch failed: %s",
-					  str_ais_error(r));
-		}
+		if (r != CS_OK)
+			LOG_ERROR("cpg_dispatch failed: %d", r);
 
 		if (entry->free_me) {
 			free(entry);
@@ -1295,9 +1248,7 @@ static void cpg_join_callback(struct clog_cpg *match,
 	uint32_t my_pid = (uint32_t)getpid();
 	uint32_t lowest = match->lowest_id;
 	struct clog_request *rq;
-	char dbuf[64] = { 0 };
-	char *dbuf_p = dbuf;
-	size_t dbuf_rem = sizeof dbuf;
+	char dbuf[32] = { 0 };
 
 	/* Assign my_cluster_id */
 	if ((my_cluster_id == 0xDEAD) && (joined->pid == my_pid))
@@ -1313,17 +1264,9 @@ static void cpg_join_callback(struct clog_cpg *match,
 	if (joined->nodeid == my_cluster_id)
 		goto out;
 
-	for (i = 0; i < member_list_entries - 1; i++) {
-		int written = snprintf(dbuf_p, dbuf_rem, "%u-", member_list[i].nodeid);
-		if (written < 0) continue; /* impossible */
-		if ((unsigned)written >= dbuf_rem) {
-			dbuf_rem = 0;
-			break;
-		}
-		dbuf_rem -= written;
-		dbuf_p += written;
-	}
-	snprintf(dbuf_p, dbuf_rem, "(%u)", joined->nodeid);
+	for (i = 0; i < member_list_entries - 1; i++)
+		sprintf(dbuf+strlen(dbuf), "%u-", member_list[i].nodeid);
+	sprintf(dbuf+strlen(dbuf), "(%u)", joined->nodeid);
 	LOG_COND(log_checkpoint, "[%s] Joining node, %u needs checkpoint [%s]",
 		 SHORT_UUID(match->name.value), joined->nodeid, dbuf);
 

daemons/cmirrord/compat.c

@@ -126,14 +126,13 @@ static int v5_endian_to_network(struct clog_request *rq)
 
 	u_rq->error = xlate32(u_rq->error);
 	u_rq->seq = xlate32(u_rq->seq);
+	u_rq->request_type = xlate32(u_rq->request_type);
+	u_rq->data_size = xlate64(u_rq->data_size);
 
 	rq->originator = xlate32(rq->originator);
 
 	v5_data_endian_switch(rq, 1);
 
-	u_rq->request_type = xlate32(u_rq->request_type);
-	u_rq->data_size = xlate32(u_rq->data_size);
-
 	return size;
 }
 
@@ -168,7 +167,7 @@ static int v5_endian_from_network(struct clog_request *rq)
 	u_rq->error = xlate32(u_rq->error);
 	u_rq->seq = xlate32(u_rq->seq);
 	u_rq->request_type = xlate32(u_rq->request_type);
-	u_rq->data_size = xlate32(u_rq->data_size);
+	u_rq->data_size = xlate64(u_rq->data_size);
 
 	rq->originator = xlate32(rq->originator);
 
@@ -183,11 +182,12 @@ int clog_request_from_network(void *data, size_t data_len)
 {
 	uint64_t *vp = data;
 	uint64_t version = xlate64(vp[0]);
+	uint64_t unconverted_version = vp[1];
 	struct clog_request *rq = data;
 
 	switch (version) {
 	case 5: /* Upstream */
-		if (version == vp[0])
+		if (version == unconverted_version)
 			return 0;
 		break;
 	case 4: /* RHEL 5.[45] */

daemons/cmirrord/functions.c

@@ -32,13 +32,12 @@
 #define LOG_OFFSET 2
 
 #define RESYNC_HISTORY 50
-#define RESYNC_BUFLEN 128
 //static char resync_history[RESYNC_HISTORY][128];
 //static int idx = 0;
 #define LOG_SPRINT(_lc, f, arg...) do {					\
 		lc->idx++;						\
 		lc->idx = lc->idx % RESYNC_HISTORY;			\
-		snprintf(lc->resync_history[lc->idx], RESYNC_BUFLEN, f, ## arg); \
+		sprintf(lc->resync_history[lc->idx], f, ## arg);	\
 	} while (0)
 
 struct log_header {
@@ -89,7 +88,7 @@ struct log_c {
 	size_t disk_size;       /* size of disk_buffer in bytes */
 	void *disk_buffer;      /* aligned memory for O_DIRECT */
 	int idx;
-	char resync_history[RESYNC_HISTORY][RESYNC_BUFLEN];
+	char resync_history[RESYNC_HISTORY][128];
 };
 
 struct mark_entry {
@@ -1445,7 +1444,7 @@ static int disk_status_info(struct log_c *lc, struct dm_ulog_request *rq)
 	char *data = (char *)rq->data;
 	struct stat statbuf;
 
-	if (fstat(lc->disk_fd, &statbuf)) {
+	if(fstat(lc->disk_fd, &statbuf)) {
 		rq->error = -errno;
 		return -errno;
 	}
@@ -1508,7 +1507,7 @@ static int disk_status_table(struct log_c *lc, struct dm_ulog_request *rq)
 	char *data = (char *)rq->data;
 	struct stat statbuf;
 
-	if (fstat(lc->disk_fd, &statbuf)) {
+	if(fstat(lc->disk_fd, &statbuf)) {
 		rq->error = -errno;
 		return -errno;
 	}

daemons/cmirrord/logging.h

@@ -63,7 +63,7 @@ extern int log_resend_requests;
 #ifdef DEBUG
 #define LOG_DBG(f, arg...) LOG_OUTPUT(LOG_DEBUG, f, ## arg)
 #else /* DEBUG */
-#define LOG_DBG(f, arg...) do {} while (0)
+#define LOG_DBG(f, arg...)
 #endif /* DEBUG */
 
 #define LOG_COND(__X, f, arg...) do {\

daemons/dmeventd/.gitignore

@@ -1 +0,0 @@
-dmeventd

daemons/dmeventd/Makefile.in

@@ -59,10 +59,8 @@ device-mapper: $(TARGETS)
 LIBS += -ldevmapper
 LVMLIBS += -ldevmapper-event $(PTHREAD_LIBS)
 
-CFLAGS_dmeventd.o += $(EXTRA_EXEC_CFLAGS)
-
 dmeventd: $(LIB_SHARED) dmeventd.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -L. -o $@ dmeventd.o \
+	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -L. -o $@ dmeventd.o \
 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
 
 dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a

daemons/dmeventd/dmeventd.h

@@ -34,7 +34,6 @@ enum dm_event_command {
 	DM_EVENT_CMD_HELLO,
 	DM_EVENT_CMD_DIE,
 	DM_EVENT_CMD_GET_STATUS,
-	DM_EVENT_CMD_GET_PARAMETERS,
 };
 
 /* Message passed between client and daemon. */

daemons/dmeventd/libdevmapper-event.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
  *
  * This file is part of the device-mapper userspace tools.
  *
@@ -12,22 +12,24 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "dm-logging.h"
 #include "dmlib.h"
 #include "libdevmapper-event.h"
+//#include "libmultilog.h"
 #include "dmeventd.h"
 
+#include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>		/* for htonl, ntohl */
-#include <pthread.h>
-#include <syslog.h>
 
-static int _debug_level = 0;
-static int _use_syslog = 0;
 static int _sequence_nr = 0;
 
 struct dm_event_handler {
@@ -55,7 +57,7 @@ static void _dm_event_handler_clear_dev_info(struct dm_event_handler *dmevh)
 
 struct dm_event_handler *dm_event_handler_create(void)
 {
-	struct dm_event_handler *dmevh;
+	struct dm_event_handler *dmevh = NULL;
 
 	if (!(dmevh = dm_zalloc(sizeof(*dmevh)))) {
 		log_error("Failed to allocate event handler.");
@@ -80,7 +82,8 @@ int dm_event_handler_set_dmeventd_path(struct dm_event_handler *dmevh, const cha
 
 	dm_free(dmevh->dmeventd_path);
 
-	if (!(dmevh->dmeventd_path = dm_strdup(dmeventd_path)))
+	dmevh->dmeventd_path = dm_strdup(dmeventd_path);
+	if (!dmevh->dmeventd_path)
 		return -ENOMEM;
 
 	return 0;
@@ -90,10 +93,10 @@ int dm_event_handler_set_dso(struct dm_event_handler *dmevh, const char *path)
 {
 	if (!path) /* noop */
 		return 0;
-
 	dm_free(dmevh->dso);
 
-	if (!(dmevh->dso = dm_strdup(path)))
+	dmevh->dso = dm_strdup(path);
+	if (!dmevh->dso)
 		return -ENOMEM;
 
 	return 0;
@@ -106,9 +109,9 @@ int dm_event_handler_set_dev_name(struct dm_event_handler *dmevh, const char *de
 
 	_dm_event_handler_clear_dev_info(dmevh);
 
-	if (!(dmevh->dev_name = dm_strdup(dev_name)))
+	dmevh->dev_name = dm_strdup(dev_name);
+	if (!dmevh->dev_name)
 		return -ENOMEM;
-
 	return 0;
 }
 
@@ -119,9 +122,9 @@ int dm_event_handler_set_uuid(struct dm_event_handler *dmevh, const char *uuid)
 
 	_dm_event_handler_clear_dev_info(dmevh);
 
-	if (!(dmevh->uuid = dm_strdup(uuid)))
+	dmevh->uuid = dm_strdup(uuid);
+	if (!dmevh->uuid)
 		return -ENOMEM;
-
 	return 0;
 }
 
@@ -198,7 +201,7 @@ static int _check_message_id(struct dm_event_daemon_message *msg)
 	if ((sscanf(msg->data, "%d:%d", &pid, &seq_nr) != 2) ||
 	    (pid != getpid()) || (seq_nr != _sequence_nr)) {
 		log_error("Ignoring out-of-sequence reply from dmeventd. "
-			  "Expected %d:%d but received %s.", getpid(),
+			  "Expected %d:%d but received %s", getpid(),
 			  _sequence_nr, msg->data);
 		return 0;
 	}
@@ -221,6 +224,7 @@ static int _daemon_read(struct dm_event_fifos *fifos,
 	unsigned bytes = 0;
 	int ret, i;
 	fd_set fds;
+	struct timeval tval = { 0, 0 };
 	size_t size = 2 * sizeof(uint32_t);	/* status + size */
 	uint32_t *header = alloca(size);
 	char *buf = (char *)header;
@@ -228,12 +232,13 @@ static int _daemon_read(struct dm_event_fifos *fifos,
 	while (bytes < size) {
 		for (i = 0, ret = 0; (i < 20) && (ret < 1); i++) {
 			/* Watch daemon read FIFO for input. */
-			struct timeval tval = { .tv_sec = 1 };
 			FD_ZERO(&fds);
 			FD_SET(fifos->server, &fds);
-			ret = select(fifos->server + 1, &fds, NULL, NULL, &tval);
+			tval.tv_sec = 1;
+			ret = select(fifos->server + 1, &fds, NULL, NULL,
+				     &tval);
 			if (ret < 0 && errno != EINTR) {
-				log_error("Unable to read from event server.");
+				log_error("Unable to read from event server");
 				return 0;
 			}
 			if ((ret == 0) && (i > 4) && !bytes) {
@@ -278,13 +283,15 @@ static int _daemon_read(struct dm_event_fifos *fifos,
 static int _daemon_write(struct dm_event_fifos *fifos,
 			 struct dm_event_daemon_message *msg)
 {
-	int ret;
+	unsigned bytes = 0;
+	int ret = 0;
 	fd_set fds;
-	size_t bytes = 0;
+
 	size_t size = 2 * sizeof(uint32_t) + msg->size;
 	uint32_t *header = alloca(size);
 	char *buf = (char *)header;
 	char drainbuf[128];
+	struct timeval tval = { 0, 0 };
 
 	header[0] = htonl(msg->cmd);
 	header[1] = htonl(msg->size);
@@ -292,25 +299,17 @@ static int _daemon_write(struct dm_event_fifos *fifos,
 
 	/* drain the answer fifo */
 	while (1) {
-		struct timeval tval = { .tv_usec = 100 };
 		FD_ZERO(&fds);
 		FD_SET(fifos->server, &fds);
+		tval.tv_usec = 100;
 		ret = select(fifos->server + 1, &fds, NULL, NULL, &tval);
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
-			log_error("Unable to talk to event daemon.");
+		if ((ret < 0) && (errno != EINTR)) {
+			log_error("Unable to talk to event daemon");
 			return 0;
 		}
 		if (ret == 0)
 			break;
-		ret = read(fifos->server, drainbuf, sizeof(drainbuf));
-		if (ret < 0) {
-			if ((errno == EINTR) || (errno == EAGAIN))
-				continue;
-			log_error("Unable to talk to event daemon.");
-			return 0;
-		}
+		ret = read(fifos->server, drainbuf, 127);
 	}
 
 	while (bytes < size) {
@@ -320,7 +319,7 @@ static int _daemon_write(struct dm_event_fifos *fifos,
 			FD_SET(fifos->client, &fds);
 			ret = select(fifos->client + 1, NULL, &fds, NULL, NULL);
 			if ((ret < 0) && (errno != EINTR)) {
-				log_error("Unable to talk to event daemon.");
+				log_error("Unable to talk to event daemon");
 				return 0;
 			}
 		} while (ret < 1);
@@ -330,7 +329,7 @@ static int _daemon_write(struct dm_event_fifos *fifos,
 			if ((errno == EINTR) || (errno == EAGAIN))
 				continue;
 			else {
-				log_error("Unable to talk to event daemon.");
+				log_error("Unable to talk to event daemon");
 				return 0;
 			}
 		}
@@ -346,6 +345,9 @@ int daemon_talk(struct dm_event_fifos *fifos,
 		const char *dso_name, const char *dev_name,
 		enum dm_event_mask evmask, uint32_t timeout)
 {
+	const char *dso = dso_name ? dso_name : "-";
+	const char *dev = dev_name ? dev_name : "-";
+	const char *fmt = "%d:%d %s %s %u %" PRIu32;
 	int msg_size;
 	memset(msg, 0, sizeof(*msg));
 
@@ -353,17 +355,14 @@ int daemon_talk(struct dm_event_fifos *fifos,
 	 * Set command and pack the arguments
 	 * into ASCII message string.
 	 */
-	if ((msg_size =
-	     ((cmd == DM_EVENT_CMD_HELLO) ?
-	      dm_asprintf(&(msg->data), "%d:%d HELLO", getpid(), _sequence_nr) :
-	      dm_asprintf(&(msg->data), "%d:%d %s %s %u %" PRIu32,
-			  getpid(), _sequence_nr,
-			  dso_name ? : "-", dev_name ? : "-", evmask, timeout)))
-	    < 0) {
-		log_error("_daemon_talk: message allocation failed.");
+	msg->cmd = cmd;
+	if (cmd == DM_EVENT_CMD_HELLO)
+		fmt = "%d:%d HELLO";
+	if ((msg_size = dm_asprintf(&(msg->data), fmt, getpid(), _sequence_nr,
+				    dso, dev, evmask, timeout)) < 0) {
+		log_error("_daemon_talk: message allocation failed");
 		return -ENOMEM;
 	}
-	msg->cmd = cmd;
 	msg->size = msg_size;
 
 	/*
@@ -373,13 +372,14 @@ int daemon_talk(struct dm_event_fifos *fifos,
 	if (!_daemon_write(fifos, msg)) {
 		stack;
 		dm_free(msg->data);
-		msg->data = NULL;
+		msg->data = 0;
 		return -EIO;
 	}
 
 	do {
+
 		dm_free(msg->data);
-		msg->data = NULL;
+		msg->data = 0;
 
 		if (!_daemon_read(fifos, msg)) {
 			stack;
@@ -425,7 +425,7 @@ static int _start_daemon(char *dmeventd_path, struct dm_event_fifos *fifos)
 	if (fifos->client >= 0) {
 		/* server is running and listening */
 		if (close(fifos->client))
-			log_sys_debug("close", fifos->client_path);
+			log_sys_error("close", fifos->client_path);
 		return 1;
 	} else if (errno != ENXIO) {
 		/* problem */
@@ -448,11 +448,11 @@ static int _start_daemon(char *dmeventd_path, struct dm_event_fifos *fifos)
 
 	else if (!pid) {
 		execvp(args[0], args);
-		log_error("Unable to exec dmeventd: %s.", strerror(errno));
+		log_error("Unable to exec dmeventd: %s", strerror(errno));
 		_exit(EXIT_FAILURE);
 	} else {
 		if (waitpid(pid, &status, 0) < 0)
-			log_error("Unable to start dmeventd: %s.",
+			log_error("Unable to start dmeventd: %s",
 				  strerror(errno));
 		else if (WEXITSTATUS(status))
 			log_error("Unable to start dmeventd.");
@@ -468,6 +468,10 @@ int init_fifos(struct dm_event_fifos *fifos)
 	/* FIXME? Is fifo the most suitable method? Why not share
 	   comms/daemon code with something else e.g. multipath? */
 
+	/* FIXME Make these either configurable or depend directly on dmeventd_path */
+	fifos->client_path = DM_EVENT_FIFO_CLIENT;
+	fifos->server_path = DM_EVENT_FIFO_SERVER;
+
 	/* Open the fifo used to read from the daemon. */
 	if ((fifos->server = open(fifos->server_path, O_RDWR)) < 0) {
 		log_sys_error("open", fifos->server_path);
@@ -477,27 +481,32 @@ int init_fifos(struct dm_event_fifos *fifos)
 	/* Lock out anyone else trying to do communication with the daemon. */
 	if (flock(fifos->server, LOCK_EX) < 0) {
 		log_sys_error("flock", fifos->server_path);
-		goto bad;
+		if (close(fifos->server))
+			log_sys_error("close", fifos->server_path);
+		return 0;
 	}
 
 /*	if ((fifos->client = open(fifos->client_path, O_WRONLY | O_NONBLOCK)) < 0) {*/
 	if ((fifos->client = open(fifos->client_path, O_RDWR | O_NONBLOCK)) < 0) {
 		log_sys_error("open", fifos->client_path);
-		goto bad;
+		if (close(fifos->server))
+			log_sys_error("close", fifos->server_path);
+		return 0;
 	}
 
 	return 1;
-bad:
-	if (close(fifos->server))
-		log_sys_debug("close", fifos->server_path);
-	fifos->server = -1;
-
-	return 0;
 }
 
 /* Initialize client. */
 static int _init_client(char *dmeventd_path, struct dm_event_fifos *fifos)
 {
+	/* init fifos */
+	memset(fifos, 0, sizeof(*fifos));
+
+	/* FIXME Make these either configurable or depend directly on dmeventd_path */
+	fifos->client_path = DM_EVENT_FIFO_CLIENT;
+	fifos->server_path = DM_EVENT_FIFO_SERVER;
+
 	if (!_start_daemon(dmeventd_path, fifos))
 		return_0;
 
@@ -506,16 +515,13 @@ static int _init_client(char *dmeventd_path, struct dm_event_fifos *fifos)
 
 void fini_fifos(struct dm_event_fifos *fifos)
 {
-	if (fifos->client >= 0 && close(fifos->client))
-		log_sys_debug("close", fifos->client_path);
+	if (flock(fifos->server, LOCK_UN))
+		log_error("flock unlock %s", fifos->server_path);
 
-	if (fifos->server >= 0) {
-		if (flock(fifos->server, LOCK_UN))
-			log_sys_debug("flock unlock", fifos->server_path);
-
-		if (close(fifos->server))
-			log_sys_debug("close", fifos->server_path);
-	}
+	if (close(fifos->client))
+		log_sys_error("close", fifos->client_path);
+	if (close(fifos->server))
+		log_sys_error("close", fifos->server_path);
 }
 
 /* Get uuid of a device */
@@ -525,7 +531,7 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
 	struct dm_info info;
 
 	if (!(dmt = dm_task_create(DM_DEVICE_INFO))) {
-		log_error("_get_device_info: dm_task creation for info failed.");
+		log_error("_get_device_info: dm_task creation for info failed");
 		return NULL;
 	}
 
@@ -543,19 +549,19 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
 
 	/* FIXME Add name or uuid or devno to messages */
 	if (!dm_task_run(dmt)) {
-		log_error("_get_device_info: dm_task_run() failed.");
+		log_error("_get_device_info: dm_task_run() failed");
 		goto bad;
 	}
 
 	if (!dm_task_get_info(dmt, &info)) {
-		log_error("_get_device_info: failed to get info for device.");
+		log_error("_get_device_info: failed to get info for device");
 		goto bad;
 	}
 
 	if (!info.exists) {
-		log_error("_get_device_info: %s%s%s%.0d%s%.0d%s%s: device not found.",
-			  dmevh->uuid ? : "",
-			  (!dmevh->uuid && dmevh->dev_name) ? dmevh->dev_name : "",
+		log_error("_get_device_info: %s%s%s%.0d%s%.0d%s%s: device not found",
+			  dmevh->uuid ? : "", 
+			  (!dmevh->uuid && dmevh->dev_name) ? dmevh->dev_name : "", 
 			  (!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? "(" : "",
 			  (!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? dmevh->major : 0,
 			  (!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? ":" : "",
@@ -565,6 +571,7 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
 		goto bad;
 	}
 
+		  
 	return dmt;
 
       bad:
@@ -578,13 +585,7 @@ static int _do_event(int cmd, char *dmeventd_path, struct dm_event_daemon_messag
 		     enum dm_event_mask evmask, uint32_t timeout)
 {
 	int ret;
-	struct dm_event_fifos fifos = {
-		.server = -1,
-		.client = -1,
-		/* FIXME Make these either configurable or depend directly on dmeventd_path */
-		.client_path = DM_EVENT_FIFO_CLIENT,
-		.server_path = DM_EVENT_FIFO_SERVER
-	};
+	struct dm_event_fifos fifos;
 
 	if (!_init_client(dmeventd_path, &fifos)) {
 		stack;
@@ -611,23 +612,18 @@ int dm_event_register_handler(const struct dm_event_handler *dmevh)
 	int ret = 1, err;
 	const char *uuid;
 	struct dm_task *dmt;
-	struct dm_event_daemon_message msg = { 0 };
+	struct dm_event_daemon_message msg = { 0, 0, NULL };
 
-	if (!(dmt = _get_device_info(dmevh)))
-		return_0;
+	if (!(dmt = _get_device_info(dmevh))) {
+		stack;
+		return 0;
+	}
 
 	uuid = dm_task_get_uuid(dmt);
 
-	if (!strstr(dmevh->dso, "libdevmapper-event-lvm2thin.so") &&
-	    !strstr(dmevh->dso, "libdevmapper-event-lvm2snapshot.so") &&
-	    !strstr(dmevh->dso, "libdevmapper-event-lvm2mirror.so") &&
-	    !strstr(dmevh->dso, "libdevmapper-event-lvm2raid.so"))
-		log_warn("WARNING: %s: dmeventd plugins are deprecated.", dmevh->dso);
-
-
 	if ((err = _do_event(DM_EVENT_CMD_REGISTER_FOR_EVENT, dmevh->dmeventd_path, &msg,
 			     dmevh->dso, uuid, dmevh->mask, dmevh->timeout)) < 0) {
-		log_error("%s: event registration failed: %s.",
+		log_error("%s: event registration failed: %s",
 			  dm_task_get_name(dmt),
 			  msg.data ? msg.data : strerror(-err));
 		ret = 0;
@@ -645,16 +641,18 @@ int dm_event_unregister_handler(const struct dm_event_handler *dmevh)
 	int ret = 1, err;
 	const char *uuid;
 	struct dm_task *dmt;
-	struct dm_event_daemon_message msg = { 0 };
+	struct dm_event_daemon_message msg = { 0, 0, NULL };
 
-	if (!(dmt = _get_device_info(dmevh)))
-		return_0;
+	if (!(dmt = _get_device_info(dmevh))) {
+		stack;
+		return 0;
+	}
 
 	uuid = dm_task_get_uuid(dmt);
 
 	if ((err = _do_event(DM_EVENT_CMD_UNREGISTER_FOR_EVENT, dmevh->dmeventd_path, &msg,
 			    dmevh->dso, uuid, dmevh->mask, dmevh->timeout)) < 0) {
-		log_error("%s: event deregistration failed: %s.",
+		log_error("%s: event deregistration failed: %s",
 			  dm_task_get_name(dmt),
 			  msg.data ? msg.data : strerror(-err));
 		ret = 0;
@@ -689,18 +687,20 @@ static char *_fetch_string(char **src, const int delimiter)
 static int _parse_message(struct dm_event_daemon_message *msg, char **dso_name,
 			 char **uuid, enum dm_event_mask *evmask)
 {
-	char *id;
+	char *id = NULL;
 	char *p = msg->data;
 
 	if ((id = _fetch_string(&p, ' ')) &&
 	    (*dso_name = _fetch_string(&p, ' ')) &&
 	    (*uuid = _fetch_string(&p, ' '))) {
 		*evmask = atoi(p);
+
 		dm_free(id);
 		return 0;
 	}
 
-	dm_free(id);
+	if (id)
+		dm_free(id);
 	return -ENOMEM;
 }
 
@@ -750,8 +750,8 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
 		ret = -ENXIO; /* dmeventd probably gave us bogus uuid back */
 		goto fail;
 	}
-
-	if (!(dmevh->uuid = dm_strdup(reply_uuid))) {
+	dmevh->uuid = dm_strdup(reply_uuid);
+	if (!dmevh->uuid) {
 		ret = -ENOMEM;
 		goto fail;
 	}
@@ -770,7 +770,8 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
 	dm_free(reply_uuid);
 	reply_uuid = NULL;
 
-	if (!(dmevh->dev_name = dm_strdup(dm_task_get_name(dmt)))) {
+	dmevh->dev_name = dm_strdup(dm_task_get_name(dmt));
+	if (!dmevh->dev_name) {
 		ret = -ENOMEM;
 		goto fail;
 	}
@@ -810,7 +811,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
 
 int dm_event_get_version(struct dm_event_fifos *fifos, int *version) {
 	char *p;
-	struct dm_event_daemon_message msg = { 0 };
+	struct dm_event_daemon_message msg = { 0, 0, NULL };
 
 	if (daemon_talk(fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0))
 		return 0;
@@ -827,79 +828,6 @@ int dm_event_get_version(struct dm_event_fifos *fifos, int *version) {
 	return 1;
 }
 
-void dm_event_log_set(int debug_level, int use_syslog)
-{
-	_debug_level = debug_level;
-	_use_syslog = use_syslog;
-}
-
-void dm_event_log(const char *subsys, int level, const char *file,
-		  int line, int dm_errno_or_class,
-		  const char *format, va_list ap)
-{
-	static pthread_mutex_t _log_mutex = PTHREAD_MUTEX_INITIALIZER;
-	static time_t start = 0;
-	const char *indent = "";
-	FILE *stream = stdout;
-	int prio = -1;
-	time_t now;
-
-	switch (level & ~(_LOG_STDERR | _LOG_ONCE)) {
-	case _LOG_DEBUG:
-		if (_debug_level < 3)
-			return;
-		prio = LOG_DEBUG;
-		indent = "      ";
-		break;
-	case _LOG_INFO:
-		if (_debug_level < 2)
-			return;
-		prio = LOG_INFO;
-		indent = "    ";
-		break;
-	case _LOG_NOTICE:
-		if (_debug_level < 1)
-			return;
-		prio = LOG_NOTICE;
-		indent = "  ";
-		break;
-	case _LOG_WARN:
-		prio = LOG_WARNING;
-		break;
-	case _LOG_ERR:
-		prio = LOG_ERR;
-		stream = stderr;
-		break;
-	default:
-		prio = LOG_CRIT;
-	}
-
-	/* Serialize to keep lines readable */
-	pthread_mutex_lock(&_log_mutex);
-
-	if (_use_syslog) {
-		vsyslog(prio, format, ap);
-	} else {
-		now = time(NULL);
-		if (!start)
-			start = now;
-		now -= start;
-		fprintf(stream, "[%2d:%02d] %8x:%-6s%s",
-			(int)now / 60, (int)now % 60,
-			// TODO: Maybe use shorter ID
-			// ((int)(pthread_self()) >> 6) & 0xffff,
-			(int)pthread_self(), subsys,
-			(_debug_level > 3) ? "" : indent);
-		if (_debug_level > 3)
-			fprintf(stream, "%28s:%4d %s", file, line, indent);
-		vfprintf(stream, _(format), ap);
-		fputc('\n', stream);
-		fflush(stream);
-	}
-
-	pthread_mutex_unlock(&_log_mutex);
-}
-
 #if 0				/* left out for now */
 
 static char *_skip_string(char *src, const int delimiter)
@@ -912,7 +840,7 @@ static char *_skip_string(char *src, const int delimiter)
 
 int dm_event_set_timeout(const char *device_path, uint32_t timeout)
 {
-	struct dm_event_daemon_message msg = { 0 };
+	struct dm_event_daemon_message msg = { 0, 0, NULL };
 
 	if (!device_exists(device_path))
 		return -ENODEV;
@@ -924,24 +852,22 @@ int dm_event_set_timeout(const char *device_path, uint32_t timeout)
 int dm_event_get_timeout(const char *device_path, uint32_t *timeout)
 {
 	int ret;
-	struct dm_event_daemon_message msg = { 0 };
+	struct dm_event_daemon_message msg = { 0, 0, NULL };
 
 	if (!device_exists(device_path))
 		return -ENODEV;
-
 	if (!(ret = _do_event(DM_EVENT_CMD_GET_TIMEOUT, &msg, NULL, device_path,
 			     0, 0))) {
 		char *p = _skip_string(msg.data, ' ');
 		if (!p) {
-			log_error("Malformed reply from dmeventd '%s'.",
+			log_error("malformed reply from dmeventd '%s'\n",
 				  msg.data);
-			dm_free(msg.data);
 			return -EIO;
 		}
 		*timeout = atoi(p);
 	}
-	dm_free(msg.data);
-
+	if (msg.data)
+		dm_free(msg.data);
 	return ret;
 }
 #endif

daemons/dmeventd/libdevmapper-event.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
  *
  * This file is part of the device-mapper userspace tools.
  *
@@ -46,9 +46,8 @@ enum dm_event_mask {
 };
 
 #define DM_EVENT_ALL_ERRORS DM_EVENT_ERROR_MASK
-#define DM_EVENT_PROTOCOL_VERSION 2
+#define DM_EVENT_PROTOCOL_VERSION 1
 
-struct dm_task;
 struct dm_event_handler;
 
 struct dm_event_handler *dm_event_handler_create(void);
@@ -105,25 +104,6 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next);
 int dm_event_register_handler(const struct dm_event_handler *dmevh);
 int dm_event_unregister_handler(const struct dm_event_handler *dmevh);
 
-/* Set debug level for logging, and whether to log on stdout/stderr or syslog */
-void dm_event_log_set(int debug_level, int use_syslog);
-
-/* Log messages acroding to current debug level  */
-__attribute__((format(printf, 6, 0)))
-void dm_event_log(const char *subsys, int level, const char *file,
-		  int line, int dm_errno_or_class,
-		  const char *format, va_list ap);
-/* Macro to route print_log do dm_event_log() */
-#define DM_EVENT_LOG_FN(subsys) \
-void print_log(int level, const char *file, int line, int dm_errno_or_class,\
-	       const char *format, ...)\
-{\
-	va_list ap;\
-	va_start(ap, format);\
-	dm_event_log(subsys, level, file, line, dm_errno_or_class, format, ap);\
-	va_end(ap);\
-}
-
 /* Prototypes for DSO interface, see dmeventd.c, struct dso_data for
    detailed descriptions. */
 // FIXME  misuse of bitmask as enum

daemons/dmeventd/plugins/lvm2/Makefile.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2014 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS)
+LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) $(DAEMON_LIBS)
 
 install_lvm2: install_lib_shared
 

daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -13,11 +13,15 @@
  */
 
 #include "lib.h"
-#include "dmeventd_lvm.h"
-#include "libdevmapper-event.h"
+#include "log.h"
+
 #include "lvm2cmd.h"
+#include "dmeventd_lvm.h"
 
 #include <pthread.h>
+#include <syslog.h>
+
+extern int dmeventd_debug;
 
 /*
  * register_device() is called first and performs initialisation.
@@ -32,19 +36,48 @@ static int _register_count = 0;
 static struct dm_pool *_mem_pool = NULL;
 static void *_lvm_handle = NULL;
 
-DM_EVENT_LOG_FN("lvm")
-
-static void _lvm2_print_log(int level, const char *file, int line,
-			    int dm_errno_or_class, const char *msg)
-{
-	print_log(level, file, line, dm_errno_or_class, "%s", msg);
-}
-
 /*
  * Currently only one event can be processed at a time.
  */
 static pthread_mutex_t _event_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+/*
+ * FIXME Do not pass things directly to syslog, rather use the existing logging
+ * facilities to sort logging ... however that mechanism needs to be somehow
+ * configurable and we don't have that option yet
+ */
+static void _temporary_log_fn(int level,
+			      const char *file __attribute__((unused)),
+			      int line __attribute__((unused)),
+			      int dm_errno __attribute__((unused)),
+			      const char *message)
+{
+	level &= ~(_LOG_STDERR | _LOG_ONCE);
+
+	switch (level) {
+	case _LOG_DEBUG:
+		if (dmeventd_debug >= 3)
+			syslog(LOG_DEBUG, "%s", message);
+		break;
+	case _LOG_INFO:
+		if (dmeventd_debug >= 2)
+			syslog(LOG_INFO, "%s", message);
+		break;
+	case _LOG_NOTICE:
+		if (dmeventd_debug >= 1)
+			syslog(LOG_NOTICE, "%s", message);
+		break;
+	case _LOG_WARN:
+		syslog(LOG_WARNING, "%s", message);
+		break;
+	case _LOG_ERR:
+		syslog(LOG_ERR, "%s", message);
+		break;
+	default:
+		syslog(LOG_CRIT, "%s", message);
+	}
+}
+
 void dmeventd_lvm2_lock(void)
 {
 	pthread_mutex_lock(&_event_mutex);
@@ -61,26 +94,23 @@ int dmeventd_lvm2_init(void)
 
 	pthread_mutex_lock(&_register_mutex);
 
+	/*
+	 * Need some space for allocations.  1024 should be more
+	 * than enough for what we need (device mapper name splitting)
+	 */
+	if (!_mem_pool && !(_mem_pool = dm_pool_create("mirror_dso", 1024)))
+		goto out;
+
 	if (!_lvm_handle) {
-		lvm2_log_fn(_lvm2_print_log);
-
-		if (!(_lvm_handle = lvm2_init()))
-			goto out;
-
-		/*
-		 * Need some space for allocations.  1024 should be more
-		 * than enough for what we need (device mapper name splitting)
-		 */
-		if (!_mem_pool && !(_mem_pool = dm_pool_create("mirror_dso", 1024))) {
-			lvm2_exit(_lvm_handle);
-			_lvm_handle = NULL;
+		lvm2_log_fn(_temporary_log_fn);
+		if (!(_lvm_handle = lvm2_init())) {
+			dm_pool_destroy(_mem_pool);
+			_mem_pool = NULL;
 			goto out;
 		}
-
 		lvm2_disable_dmeventd_monitoring(_lvm_handle);
 		/* FIXME Temporary: move to dmeventd core */
 		lvm2_run(_lvm_handle, "_memlock_inc");
-		log_debug("lvm plugin initilized.");
 	}
 
 	_register_count++;
@@ -96,13 +126,11 @@ void dmeventd_lvm2_exit(void)
 	pthread_mutex_lock(&_register_mutex);
 
 	if (!--_register_count) {
-		log_debug("lvm plugin shuting down.");
 		lvm2_run(_lvm_handle, "_memlock_dec");
 		dm_pool_destroy(_mem_pool);
 		_mem_pool = NULL;
 		lvm2_exit(_lvm_handle);
 		_lvm_handle = NULL;
-		log_debug("lvm plugin exited.");
 	}
 
 	pthread_mutex_unlock(&_register_mutex);
@@ -115,7 +143,7 @@ struct dm_pool *dmeventd_lvm2_pool(void)
 
 int dmeventd_lvm2_run(const char *cmdline)
 {
-	return (lvm2_run(_lvm_handle, cmdline) == LVM2_COMMAND_SUCCEEDED);
+	return lvm2_run(_lvm_handle, cmdline);
 }
 
 int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
@@ -125,14 +153,14 @@ int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
 	int r;
 
 	if (!dm_split_lvm_name(mem, device, &vg, &lv, &layer)) {
-		log_error("Unable to determine VG name from %s.",
-			  device);
+		syslog(LOG_ERR, "Unable to determine VG name from %s.\n",
+		       device);
 		return 0;
 	}
 
 	/* strip off the mirror component designations */
-	if ((layer = strstr(lv, "_mimagetmp")) ||
-	    (layer = strstr(lv, "_mlog")))
+	layer = strstr(lv, "_mlog");
+	if (layer)
 		*layer = '\0';
 
 	r = dm_snprintf(buffer, size, "%s %s/%s", cmd, vg, lv);
@@ -140,7 +168,7 @@ int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
 	dm_pool_free(mem, vg);
 
 	if (r < 0) {
-		log_error("Unable to form LVM command. (too long).");
+		syslog(LOG_ERR, "Unable to form LVM command. (too long).\n");
 		return 0;
 	}
 

daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -22,11 +22,11 @@
  * liblvm2cmd thread-safe so this can go away.
  */
 
+#include "libdevmapper.h"
+
 #ifndef _DMEVENTD_LVMWRAP_H
 #define _DMEVENTD_LVMWRAP_H
 
-struct dm_pool;
-
 int dmeventd_lvm2_init(void);
 void dmeventd_lvm2_exit(void);
 int dmeventd_lvm2_run(const char *cmdline);
@@ -39,36 +39,4 @@ struct dm_pool *dmeventd_lvm2_pool(void);
 int dmeventd_lvm2_command(struct dm_pool *mem, char *buffer, size_t size,
 			  const char *cmd, const char *device);
 
-#define dmeventd_lvm2_run_with_lock(cmdline) \
-	({\
-		int rc;\
-		dmeventd_lvm2_lock();\
-		rc = dmeventd_lvm2_run(cmdline);\
-		dmeventd_lvm2_unlock();\
-		rc;\
-	})
-
-#define dmeventd_lvm2_init_with_pool(name, st) \
-	({\
-		struct dm_pool *mem;\
-		st = NULL;\
-		if (dmeventd_lvm2_init()) {\
-			if ((mem = dm_pool_create(name, 2048)) &&\
-			    (st = dm_pool_zalloc(mem, sizeof(*st))))\
-				st->mem = mem;\
-			else {\
-				if (mem)\
-					dm_pool_destroy(mem);\
-				dmeventd_lvm2_exit();\
-			}\
-		}\
-		st;\
-	})
-
-#define dmeventd_lvm2_exit_with_pool(pool) \
-	do {\
-		dm_pool_destroy(pool->mem);\
-		dmeventd_lvm2_exit();\
-	} while(0)
-
 #endif /* _DMEVENTD_LVMWRAP_H */

daemons/dmeventd/plugins/mirror/Makefile.in

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005, 2008-2014 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2005, 2008-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -16,8 +16,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
 
 SOURCES = dmeventd_mirror.c
 
@@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
 
 include $(top_builddir)/make.tmpl
 
-LIBS += -ldevmapper-event-lvm2 -ldevmapper
+LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
 
 install_lvm2: install_dm_plugin
 

daemons/dmeventd/plugins/mirror/dmeventd_mirror.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2012 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -13,24 +13,22 @@
  */
 
 #include "lib.h"
+
+#include "lvm2cmd.h"
+#include "errors.h"
 #include "libdevmapper-event.h"
 #include "dmeventd_lvm.h"
 #include "defaults.h"
 
+#include <syslog.h> /* FIXME Replace syslog with multilog */
+/* FIXME Missing openlog? */
+/* FIXME Replace most syslogs with log_error() style messages and add complete context. */
 /* FIXME Reformat to 80 char lines. */
 
 #define ME_IGNORE    0
 #define ME_INSYNC    1
 #define ME_FAILURE   2
 
-struct dso_state {
-	struct dm_pool *mem;
-	char cmd_lvscan[512];
-	char cmd_lvconvert[512];
-};
-
-DM_EVENT_LOG_FN("mirr")
-
 static int _process_status_code(const char status_code, const char *dev_name,
 				const char *dev_type, int r)
 {
@@ -43,15 +41,18 @@ static int _process_status_code(const char status_code, const char *dev_name,
 	 *    U => Unclassified failure (bug)
 	 */ 
 	if (status_code == 'F') {
-		log_error("%s device %s flush failed.", dev_type, dev_name);
+		syslog(LOG_ERR, "%s device %s flush failed.",
+		       dev_type, dev_name);
 		r = ME_FAILURE;
 	} else if (status_code == 'S')
-		log_error("%s device %s sync failed.", dev_type, dev_name);
+		syslog(LOG_ERR, "%s device %s sync failed.",
+		       dev_type, dev_name);
 	else if (status_code == 'R')
-		log_error("%s device %s read failed.", dev_type, dev_name);
+		syslog(LOG_ERR, "%s device %s read failed.",
+		       dev_type, dev_name);
 	else if (status_code != 'A') {
-		log_error("%s device %s has failed (%c).",
-			  dev_type, dev_name, status_code);
+		syslog(LOG_ERR, "%s device %s has failed (%c).",
+		       dev_type, dev_name, status_code);
 		r = ME_FAILURE;
 	}
 
@@ -126,49 +127,52 @@ out:
 
 out_parse:
 	dm_free(args);
-	log_error("Unable to parse mirror status string.");
-
+	syslog(LOG_ERR, "Unable to parse mirror status string.");
 	return ME_IGNORE;
 }
 
-static int _remove_failed_devices(const char *cmd_lvscan, const char *cmd_lvconvert)
+static int _remove_failed_devices(const char *device)
 {
 	int r;
+#define CMD_SIZE 256	/* FIXME Use system restriction */
+	char cmd_str[CMD_SIZE];
 
-	if (!dmeventd_lvm2_run_with_lock(cmd_lvscan))
-		log_info("Re-scan of mirrored device failed.");
+	if (!dmeventd_lvm2_command(dmeventd_lvm2_pool(), cmd_str, sizeof(cmd_str),
+				  "lvconvert --config devices{ignore_suspended_devices=1} "
+				  "--repair --use-policies", device))
+		return -ENAMETOOLONG; /* FIXME Replace with generic error return - reason for failure has already got logged */
 
-	/* if repair goes OK, report success even if lvscan has failed */
-	r = dmeventd_lvm2_run_with_lock(cmd_lvconvert);
+	r = dmeventd_lvm2_run(cmd_str);
 
-	log_info("Repair of mirrored device %s.",
-		 (r) ? "finished successfully" : "failed");
+	syslog(LOG_INFO, "Repair of mirrored device %s %s.", device,
+	       (r == ECMD_PROCESSED) ? "finished successfully" : "failed");
 
-	return r;
+	return (r == ECMD_PROCESSED) ? 0 : -1;
 }
 
 void process_event(struct dm_task *dmt,
 		   enum dm_event_mask event __attribute__((unused)),
-		   void **user)
+		   void **unused __attribute__((unused)))
 {
-	struct dso_state *state = *user;
 	void *next = NULL;
 	uint64_t start, length;
 	char *target_type = NULL;
 	char *params;
 	const char *device = dm_task_get_name(dmt);
 
+	dmeventd_lvm2_lock();
+
 	do {
 		next = dm_get_next_target(dmt, next, &start, &length,
 					  &target_type, &params);
 
 		if (!target_type) {
-			log_info("%s mapping lost.", device);
+			syslog(LOG_INFO, "%s mapping lost.", device);
 			continue;
 		}
 
 		if (strcmp(target_type, "mirror")) {
-			log_info("%s has unmirrored portion.", device);
+			syslog(LOG_INFO, "%s has unmirrored portion.", device);
 			continue;
 		}
 
@@ -178,75 +182,54 @@ void process_event(struct dm_task *dmt,
 			   _part_ of the device is in sync
 			   Also, this is not an error
 			*/
-			log_notice("%s is now in-sync.", device);
+			syslog(LOG_NOTICE, "%s is now in-sync.", device);
 			break;
 		case ME_FAILURE:
-			log_error("Device failure in %s.", device);
-			if (!_remove_failed_devices(state->cmd_lvscan,
-						    state->cmd_lvconvert))
+			syslog(LOG_ERR, "Device failure in %s.", device);
+			if (_remove_failed_devices(device))
 				/* FIXME Why are all the error return codes unused? Get rid of them? */
-				log_error("Failed to remove faulty devices in %s.",
-					  device);
+				syslog(LOG_ERR, "Failed to remove faulty devices in %s.",
+				       device);
 			/* Should check before warning user that device is now linear
 			else
-				log_notice("%s is now a linear device.",
-					   device);
+				syslog(LOG_NOTICE, "%s is now a linear device.\n",
+					device);
 			*/
 			break;
 		case ME_IGNORE:
 			break;
 		default:
 			/* FIXME Provide value then! */
-			log_info("Unknown event received.");
+			syslog(LOG_INFO, "Unknown event received.");
 		}
 	} while (next);
+
+	dmeventd_lvm2_unlock();
 }
 
 int register_device(const char *device,
 		    const char *uuid __attribute__((unused)),
 		    int major __attribute__((unused)),
 		    int minor __attribute__((unused)),
-		    void **user)
+		    void **unused __attribute__((unused)))
 {
-	struct dso_state *state;
+	if (!dmeventd_lvm2_init())
+		return 0;
 
-	if (!dmeventd_lvm2_init_with_pool("mirror_state", state))
-		goto_bad;
-
-	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvscan, sizeof(state->cmd_lvscan),
-				   "lvscan --cache", device)) {
-		dmeventd_lvm2_exit_with_pool(state);
-		goto_bad;
-	}
-
-	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
-				   "lvconvert --repair --use-policies", device)) {
-		dmeventd_lvm2_exit_with_pool(state);
-		goto_bad;
-	}
-
-	*user = state;
-
-	log_info("Monitoring mirror device %s for events.", device);
+	syslog(LOG_INFO, "Monitoring mirror device %s for events.", device);
 
 	return 1;
-bad:
-	log_error("Failed to monitor mirror %s.", device);
-
-	return 0;
 }
 
 int unregister_device(const char *device,
 		      const char *uuid __attribute__((unused)),
 		      int major __attribute__((unused)),
 		      int minor __attribute__((unused)),
-		      void **user)
+		      void **unused __attribute__((unused)))
 {
-	struct dso_state *state = *user;
-
-	dmeventd_lvm2_exit_with_pool(state);
-	log_info("No longer monitoring mirror device %s for events.",
-		 device);
+	syslog(LOG_INFO, "No longer monitoring mirror device %s for events.",
+	       device);
+	dmeventd_lvm2_exit();
 
 	return 1;
 }

daemons/dmeventd/plugins/raid/Makefile.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2014 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
 
 SOURCES = dmeventd_raid.c
 

daemons/dmeventd/plugins/raid/dmeventd_raid.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2011 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -13,133 +13,160 @@
  */
 
 #include "lib.h"
-#include "dmeventd_lvm.h"
+
+#include "lvm2cmd.h"
+#include "errors.h"
 #include "libdevmapper-event.h"
+#include "dmeventd_lvm.h"
 
-struct dso_state {
-	struct dm_pool *mem;
-	char cmd_lvscan[512];
-	char cmd_lvconvert[512];
-	int failed;
-};
-
-DM_EVENT_LOG_FN("raid")
-
+#include <syslog.h> /* FIXME Replace syslog with multilog */
+/* FIXME Missing openlog? */
+/* FIXME Replace most syslogs with log_error() style messages and add complete context. */
 /* FIXME Reformat to 80 char lines. */
 
-static int _process_raid_event(struct dso_state *state, char *params, const char *device)
+/*
+ * run_repair is a close copy to
+ * plugins/mirror/dmeventd_mirror.c:_remove_failed_devices()
+ */
+static int run_repair(const char *device)
 {
-	struct dm_status_raid *status;
-	const char *d;
+	int r;
+#define CMD_SIZE 256	/* FIXME Use system restriction */
+	char cmd_str[CMD_SIZE];
 
-	if (!dm_get_status_raid(state->mem, params, &status)) {
-		log_error("Failed to process status line for %s.", device);
-		return 0;
+	if (!dmeventd_lvm2_command(dmeventd_lvm2_pool(), cmd_str, sizeof(cmd_str),
+				  "lvconvert --config devices{ignore_suspended_devices=1} "
+				  "--repair --use-policies", device))
+		return -1;
+
+	r = dmeventd_lvm2_run(cmd_str);
+
+	if (r != ECMD_PROCESSED)
+		syslog(LOG_INFO, "Repair of RAID device %s failed.", device);
+
+	return (r == ECMD_PROCESSED) ? 0 : -1;
+}
+
+static int _process_raid_event(char *params, const char *device)
+{
+	int i, n, failure = 0;
+	char *p, *a[4];
+	char *raid_type;
+	char *num_devices;
+	char *health_chars;
+	char *resync_ratio;
+
+	/*
+	 * RAID parms:     <raid_type> <#raid_disks> \
+	 *                 <health chars> <resync ratio>
+	 */
+	if (!dm_split_words(params, 4, 0, a)) {
+		syslog(LOG_ERR, "Failed to process status line for %s\n",
+		       device);
+		return -EINVAL;
+	}
+	raid_type = a[0];
+	num_devices = a[1];
+	health_chars = a[2];
+	resync_ratio = a[3];
+
+	if (!(n = atoi(num_devices))) {
+		syslog(LOG_ERR, "Failed to parse number of devices for %s: %s",
+		       device, num_devices);
+		return -EINVAL;
 	}
 
-	if ((d = strchr(status->dev_health, 'D'))) {
-		if (state->failed)
-			goto out; /* already reported */
-
-		log_error("Device #%d of %s array, %s, has failed.",
-			  (int)(d - status->dev_health),
-			  status->raid_type, device);
-
-		state->failed = 1;
-		if (!dmeventd_lvm2_run_with_lock(state->cmd_lvscan))
-			log_warn("WARNING: Re-scan of RAID device %s failed.", device);
-
-		/* if repair goes OK, report success even if lvscan has failed */
-		if (!dmeventd_lvm2_run_with_lock(state->cmd_lvconvert)) {
-			log_info("Repair of RAID device %s failed.", device);
-			dm_pool_free(state->mem, status);
-			return 0;
+	for (i = 0; i < n; i++) {
+		switch (health_chars[i]) {
+		case 'A':
+			/* Device is 'A'live and well */
+		case 'a':
+			/* Device is 'a'live, but not yet in-sync */
+			break;
+		case 'D':
+			syslog(LOG_ERR,
+			       "Device #%d of %s array, %s, has failed.",
+			       i, raid_type, device);
+			failure++;
+			break;
+		default:
+			/* Unhandled character returned from kernel */
+			break;
 		}
-	} else {
-		state->failed = 0;
-		log_info("%s array, %s, is %s in-sync.",
-			 status->raid_type, device,
-			 (status->insync_regions == status->total_regions) ? "now" : "not");
+		if (failure)
+			return run_repair(device);
 	}
-out:
-	dm_pool_free(state->mem, status);
 
-	return 1;
+	p = strstr(resync_ratio, "/");
+	if (!p) {
+		syslog(LOG_ERR, "Failed to parse resync_ratio for %s: %s",
+		       device, resync_ratio);
+		return -EINVAL;
+	}
+	p[0] = '\0';
+	syslog(LOG_INFO, "%s array, %s, is %s in-sync.",
+	       raid_type, device, strcmp(resync_ratio, p+1) ? "not" : "now");
+
+	return 0;
 }
 
 void process_event(struct dm_task *dmt,
 		   enum dm_event_mask event __attribute__((unused)),
-		   void **user)
+		   void **unused __attribute__((unused)))
 {
-	struct dso_state *state = *user;
 	void *next = NULL;
 	uint64_t start, length;
 	char *target_type = NULL;
 	char *params;
 	const char *device = dm_task_get_name(dmt);
 
+	dmeventd_lvm2_lock();
+
 	do {
 		next = dm_get_next_target(dmt, next, &start, &length,
 					  &target_type, &params);
 
 		if (!target_type) {
-			log_info("%s mapping lost.", device);
+			syslog(LOG_INFO, "%s mapping lost.", device);
 			continue;
 		}
 
 		if (strcmp(target_type, "raid")) {
-			log_info("%s has non-raid portion.", device);
+			syslog(LOG_INFO, "%s has non-raid portion.", device);
 			continue;
 		}
 
-		if (!_process_raid_event(state, params, device))
-			log_error("Failed to process event for %s.",
-				  device);
+		if (_process_raid_event(params, device))
+			syslog(LOG_ERR, "Failed to process event for %s",
+			       device);
 	} while (next);
+
+	dmeventd_lvm2_unlock();
 }
 
 int register_device(const char *device,
 		    const char *uuid __attribute__((unused)),
 		    int major __attribute__((unused)),
 		    int minor __attribute__((unused)),
-		    void **user)
+		    void **unused __attribute__((unused)))
 {
-	struct dso_state *state;
+	if (!dmeventd_lvm2_init())
+		return 0;
 
-	if (!dmeventd_lvm2_init_with_pool("raid_state", state))
-		goto_bad;
-
-	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvscan, sizeof(state->cmd_lvscan),
-				   "lvscan --cache", device) ||
-	    !dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
-				   "lvconvert --config devices{ignore_suspended_devices=1} "
-				   "--repair --use-policies", device)) {
-		dmeventd_lvm2_exit_with_pool(state);
-		goto_bad;
-	}
-
-	*user = state;
-
-	log_info("Monitoring RAID device %s for events.", device);
+	syslog(LOG_INFO, "Monitoring RAID device %s for events.", device);
 
 	return 1;
-bad:
-	log_error("Failed to monitor RAID %s.", device);
-
-	return 0;
 }
 
 int unregister_device(const char *device,
 		      const char *uuid __attribute__((unused)),
 		      int major __attribute__((unused)),
 		      int minor __attribute__((unused)),
-		      void **user)
+		      void **unused __attribute__((unused)))
 {
-	struct dso_state *state = *user;
-
-	dmeventd_lvm2_exit_with_pool(state);
-	log_info("No longer monitoring RAID device %s for events.",
-		 device);
+	syslog(LOG_INFO, "No longer monitoring RAID device %s for events.",
+	       device);
+	dmeventd_lvm2_exit();
 
 	return 1;
 }

daemons/dmeventd/plugins/snapshot/Makefile.in

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of the LVM2.
 #
@@ -16,8 +16,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
 
 SOURCES = dmeventd_snapshot.c
 
@@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-LIBS += -ldevmapper-event-lvm2 -ldevmapper
+LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
 
 install_lvm2: install_dm_plugin
 

daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2007-2011 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -13,31 +13,32 @@
  */
 
 #include "lib.h"
-#include "dmeventd_lvm.h"
+
+#include "lvm2cmd.h"
+#include "errors.h"
 #include "libdevmapper-event.h"
+#include "dmeventd_lvm.h"
 
 #include <sys/wait.h>
-#include <stdarg.h>
-#include <pthread.h>
+#include <syslog.h> /* FIXME Replace syslog with multilog */
+/* FIXME Missing openlog? */
 
 /* First warning when snapshot is 80% full. */
-#define WARNING_THRESH	(DM_PERCENT_1 * 80)
+#define WARNING_THRESH 80
 /* Run a check every 5%. */
-#define CHECK_STEP	(DM_PERCENT_1 *  5)
+#define CHECK_STEP 5
 /* Do not bother checking snapshots less than 50% full. */
-#define CHECK_MINIMUM	(DM_PERCENT_1 * 50)
+#define CHECK_MINIMUM 50
 
 #define UMOUNT_COMMAND "/bin/umount"
 
 struct dso_state {
 	struct dm_pool *mem;
-	dm_percent_t percent_check;
+	int percent_check;
 	uint64_t known_size;
-	char cmd_lvextend[512];
+	char cmd_str[1024];
 };
 
-DM_EVENT_LOG_FN("snap")
-
 static int _run(const char *cmd, ...)
 {
         va_list ap;
@@ -62,7 +63,7 @@ static int _run(const char *cmd, ...)
                 va_end(ap);
 
                 execvp(cmd, (char **)argv);
-                log_sys_error("exec", cmd);
+                syslog(LOG_ERR, "Failed to execute %s: %s.\n", cmd, strerror(errno));
                 exit(127);
         }
 
@@ -81,56 +82,18 @@ static int _run(const char *cmd, ...)
 
 static int _extend(const char *cmd)
 {
-	log_debug("Extending snapshot via %s.", cmd);
-	return dmeventd_lvm2_run_with_lock(cmd);
+	return dmeventd_lvm2_run(cmd) == ECMD_PROCESSED;
 }
 
-#ifdef SNAPSHOT_REMOVE
-/* Remove invalid snapshot from dm-table */
-/* Experimental for now and not used by default */
-static int _remove(const char *uuid)
-{
-	int r = 1;
-	uint32_t cookie = 0;
-	struct dm_task *dmt;
-
-	if (!(dmt = dm_task_create(DM_DEVICE_REMOVE)))
-		return 0;
-
-	if (!dm_task_set_uuid(dmt, uuid)) {
-		r = 0;
-		goto_out;
-	}
-
-	dm_task_retry_remove(dmt);
-
-	if (!dm_task_set_cookie(dmt, &cookie, 0)) {
-		r = 0;
-		goto_out;
-	}
-
-	if (!dm_task_run(dmt)) {
-		r = 0;
-		goto_out;
-	}
-out:
-	dm_task_destroy(dmt);
-
-	return r;
-}
-#endif /* SNAPSHOT_REMOVE */
-
 static void _umount(const char *device, int major, int minor)
 {
 	FILE *mounts;
 	char buffer[4096];
 	char *words[3];
 	struct stat st;
-	const char procmounts[] = "/proc/mounts";
 
-	if (!(mounts = fopen(procmounts, "r"))) {
-		log_sys_error("fopen", procmounts);
-		log_error("Not umounting %s.", device);
+	if (!(mounts = fopen("/proc/mounts", "r"))) {
+		syslog(LOG_ERR, "Could not read /proc/mounts. Not umounting %s.\n", device);
 		return;
 	}
 
@@ -150,22 +113,21 @@ static void _umount(const char *device, int major, int minor)
 		if (S_ISBLK(st.st_mode) &&
 		    major(st.st_rdev) == major &&
 		    minor(st.st_rdev) == minor) {
-			log_error("Unmounting invalid snapshot %s from %s.", device, words[1]);
-			if (!_run(UMOUNT_COMMAND, "-fl", words[1], NULL))
-				log_error("Failed to umount snapshot %s from %s: %s.",
-					  device, words[1], strerror(errno));
+			syslog(LOG_ERR, "Unmounting invalid snapshot %s from %s.\n", device, words[1]);
+                        if (!_run(UMOUNT_COMMAND, "-fl", words[1], NULL))
+                                syslog(LOG_ERR, "Failed to umount snapshot %s from %s: %s.\n",
+                                       device, words[1], strerror(errno));
 		}
 	}
 
 	if (fclose(mounts))
-		log_sys_error("close", procmounts);
+		syslog(LOG_ERR, "Failed to close /proc/mounts.\n");
 }
 
 void process_event(struct dm_task *dmt,
 		   enum dm_event_mask event __attribute__((unused)),
-		   void **user)
+		   void **private)
 {
-	struct dso_state *state = *user;
 	void *next = NULL;
 	uint64_t start, length;
 	char *target_type = NULL;
@@ -173,47 +135,28 @@ void process_event(struct dm_task *dmt,
 	struct dm_status_snapshot *status = NULL;
 	const char *device = dm_task_get_name(dmt);
 	int percent;
-	struct dm_info info;
+	struct dso_state *state = *private;
 
 	/* No longer monitoring, waiting for remove */
 	if (!state->percent_check)
 		return;
 
+	dmeventd_lvm2_lock();
+
 	dm_get_next_target(dmt, next, &start, &length, &target_type, &params);
-	if (!target_type || strcmp(target_type, "snapshot")) {
-		log_error("Target %s is not snapshot.", target_type);
-		return;
-	}
+	if (!target_type)
+		goto out;
 
-	if (!dm_get_status_snapshot(state->mem, params, &status)) {
-		log_error("Cannot parse snapshot %s state: %s.", device, params);
-		return;
-	}
+	if (!dm_get_status_snapshot(state->mem, params, &status))
+		goto out;
 
-	/*
-	 * If the snapshot has been invalidated or we failed to parse
-	 * the status string. Report the full status string to syslog.
-	 */
-	if (status->invalid || status->overflow || !status->total_sectors) {
-		log_warn("WARNING: Snapshot %s changed state to: %s and should be removed.",
-			 device, params);
-		state->percent_check = 0;
-		if (dm_task_get_info(dmt, &info))
+	if (status->invalid) {
+		struct dm_info info;
+		if (dm_task_get_info(dmt, &info)) {
+			dmeventd_lvm2_unlock();
 			_umount(device, info.major, info.minor);
-#ifdef SNAPSHOT_REMOVE
-		/* Maybe configurable ? */
-		_remove(dm_task_get_uuid(dmt));
-#endif
-		pthread_kill(pthread_self(), SIGALRM);
-		goto out;
-	}
-
-	if (length <= (status->used_sectors - status->metadata_sectors)) {
-		/* TODO eventually recognize earlier when room is enough */
-		log_info("Dropping monitoring of fully provisioned snapshot %s.",
-			 device);
-		pthread_kill(pthread_self(), SIGALRM);
-		goto out;
+			return;
+		} /* else; too bad, but this is best-effort thing... */
 	}
 
 	/* Snapshot size had changed. Clear the threshold. */
@@ -222,50 +165,69 @@ void process_event(struct dm_task *dmt,
 		state->known_size = status->total_sectors;
 	}
 
-	percent = dm_make_percent(status->used_sectors, status->total_sectors);
+	/*
+	 * If the snapshot has been invalidated or we failed to parse
+	 * the status string. Report the full status string to syslog.
+	 */
+	if (status->invalid || !status->total_sectors) {
+		syslog(LOG_ERR, "Snapshot %s changed state to: %s\n", device, params);
+		state->percent_check = 0;
+		goto out;
+	}
+
+	percent = (int) (100 * status->used_sectors / status->total_sectors);
 	if (percent >= state->percent_check) {
 		/* Usage has raised more than CHECK_STEP since the last
 		   time. Run actions. */
 		state->percent_check = (percent / CHECK_STEP) * CHECK_STEP + CHECK_STEP;
 
 		if (percent >= WARNING_THRESH) /* Print a warning to syslog. */
-			log_warn("WARNING: Snapshot %s is now %.2f%% full.",
-				 device, dm_percent_to_float(percent));
-
+			syslog(LOG_WARNING, "Snapshot %s is now %i%% full.\n", device, percent);
 		/* Try to extend the snapshot, in accord with user-set policies */
-		if (!_extend(state->cmd_lvextend))
-			log_error("Failed to extend snapshot %s.", device);
+		if (!_extend(state->cmd_str))
+			syslog(LOG_ERR, "Failed to extend snapshot %s.\n", device);
 	}
+
 out:
-	dm_pool_free(state->mem, status);
+	if (status)
+		dm_pool_free(state->mem, status);
+	dmeventd_lvm2_unlock();
 }
 
 int register_device(const char *device,
 		    const char *uuid __attribute__((unused)),
 		    int major __attribute__((unused)),
 		    int minor __attribute__((unused)),
-		    void **user)
+		    void **private)
 {
+	struct dm_pool *statemem = NULL;
 	struct dso_state *state;
 
-	if (!dmeventd_lvm2_init_with_pool("snapshot_state", state))
-		goto_bad;
+	if (!dmeventd_lvm2_init())
+		goto out;
 
-	if (!dmeventd_lvm2_command(state->mem, state->cmd_lvextend,
-				   sizeof(state->cmd_lvextend),
-				   "lvextend --use-policies", device)) {
-		dmeventd_lvm2_exit_with_pool(state);
-		goto_bad;
-	}
+	if (!(statemem = dm_pool_create("snapshot_state", 512)) ||
+	    !(state = dm_pool_zalloc(statemem, sizeof(*state))))
+		goto bad;
 
+	if (!dmeventd_lvm2_command(statemem, state->cmd_str,
+				   sizeof(state->cmd_str),
+				   "lvextend --use-policies", device))
+		goto bad;
+
+	state->mem = statemem;
 	state->percent_check = CHECK_MINIMUM;
-	*user = state;
+	*private = state;
 
-	log_info("Monitoring snapshot %s.", device);
+	syslog(LOG_INFO, "Monitoring snapshot %s\n", device);
 
 	return 1;
 bad:
-	log_error("Failed to monitor snapshot %s.", device);
+	if (statemem)
+		dm_pool_destroy(statemem);
+	dmeventd_lvm2_exit();
+out:
+	syslog(LOG_ERR, "Failed to monitor snapshot %s.\n", device);
 
 	return 0;
 }
@@ -274,12 +236,13 @@ int unregister_device(const char *device,
 		      const char *uuid __attribute__((unused)),
 		      int major __attribute__((unused)),
 		      int minor __attribute__((unused)),
-		      void **user)
+		      void **private)
 {
-	struct dso_state *state = *user;
+	struct dso_state *state = *private;
 
-	dmeventd_lvm2_exit_with_pool(state);
-	log_info("No longer monitoring snapshot %s.", device);
+	syslog(LOG_INFO, "No longer monitoring snapshot %s\n", device);
+	dm_pool_destroy(state->mem);
+	dmeventd_lvm2_exit();
 
 	return 1;
 }

daemons/dmeventd/plugins/thin/Makefile.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2014 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
 
 SOURCES = dmeventd_thin.c
 

daemons/dmeventd/plugins/thin/dmeventd_thin.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2013 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -12,33 +12,26 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "lib.h"	/* using here lvm log */
-#include "dmeventd_lvm.h"
+#include "lib.h"
+
+#include "lvm2cmd.h"
+#include "errors.h"
 #include "libdevmapper-event.h"
+#include "dmeventd_lvm.h"
 
 #include <sys/wait.h>
-#include <stdarg.h>
-#include <pthread.h>
+#include <syslog.h> /* FIXME Replace syslog with multilog */
+/* FIXME Missing openlog? */
 
-/* TODO - move this mountinfo code into library to be reusable */
-#ifdef __linux__
-#  include "kdev_t.h"
-#else
-#  define MAJOR(x) major((x))
-#  define MINOR(x) minor((x))
-#endif
-
-/* First warning when thin data or metadata is 80% full. */
-#define WARNING_THRESH	(DM_PERCENT_1 * 80)
+/* First warning when thin is 80% full. */
+#define WARNING_THRESH 80
 /* Run a check every 5%. */
-#define CHECK_STEP	(DM_PERCENT_1 *  5)
-/* Do not bother checking thin data or metadata is less than 50% full. */
-#define CHECK_MINIMUM	(DM_PERCENT_1 * 50)
+#define CHECK_STEP 5
+/* Do not bother checking thins less than 50% full. */
+#define CHECK_MINIMUM 50
 
 #define UMOUNT_COMMAND "/bin/umount"
 
-#define MAX_FAILS	(10)
-
 #define THIN_DEBUG 0
 
 struct dso_state {
@@ -47,11 +40,18 @@ struct dso_state {
 	int data_percent_check;
 	uint64_t known_metadata_size;
 	uint64_t known_data_size;
-	unsigned fails;
 	char cmd_str[1024];
 };
 
-DM_EVENT_LOG_FN("thin")
+
+/* TODO - move this mountinfo code into library to be reusable */
+#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
 
 /* Get dependencies for device, and try to find matching device */
 static int _has_deps(const char *name, int tp_major, int tp_minor, int *dev_minor)
@@ -94,8 +94,8 @@ static int _has_deps(const char *name, int tp_major, int tp_minor, int *dev_mino
 	{
 		char dev_name[PATH_MAX];
 		if (dm_device_get_name(major, minor, 0, dev_name, sizeof(dev_name)))
-			log_debug("Found %s (%u:%u) depends on %s.",
-				  name, major, *dev_minor, dev_name);
+			syslog(LOG_DEBUG, "Found %s (%u:%u) depends on %s",
+			       name, major, *dev_minor, dev_name);
 	}
 #endif
 	r = 1;
@@ -142,6 +142,14 @@ out:
 	return r;
 }
 
+static int _extend(struct dso_state *state)
+{
+#if THIN_DEBUG
+	syslog(LOG_INFO, "dmeventd executes: %s.\n", state->cmd_str);
+#endif
+	return (dmeventd_lvm2_run(state->cmd_str) == ECMD_PROCESSED);
+}
+
 static int _run(const char *cmd, ...)
 {
 	va_list ap;
@@ -161,12 +169,12 @@ static int _run(const char *cmd, ...)
 		argv = alloca(sizeof(const char *) * (argc + 1));
 
 		argv[0] = cmd;
-		va_start(ap, cmd);
+                va_start(ap, cmd);
 		while ((argv[++i] = va_arg(ap, const char *)));
 		va_end(ap);
 
 		execvp(cmd, (char **)argv);
-		log_sys_error("exec", cmd);
+		syslog(LOG_ERR, "Failed to execute %s: %s.\n", cmd, strerror(errno));
 		exit(127);
 	}
 
@@ -184,9 +192,9 @@ static int _run(const char *cmd, ...)
 }
 
 struct mountinfo_s {
-	const char *device;
 	struct dm_info info;
 	dm_bitset_t minors; /* Bitset for active thin pool minors */
+	const char *device;
 };
 
 static int _umount_device(char *buffer, unsigned major, unsigned minor,
@@ -195,11 +203,11 @@ static int _umount_device(char *buffer, unsigned major, unsigned minor,
 	struct mountinfo_s *data = cb_data;
 
 	if ((major == data->info.major) && dm_bit(data->minors, minor)) {
-		log_info("Unmounting thin volume %s from %s.",
-			 data->device, target);
+		syslog(LOG_INFO, "Unmounting thin volume %s from %s.\n",
+		       data->device, target);
 		if (!_run(UMOUNT_COMMAND, "-fl", target, NULL))
-			log_error("Failed to umount thin %s from %s: %s.",
-				  data->device, target, strerror(errno));
+			syslog(LOG_ERR, "Failed to umount thin %s from %s: %s.\n",
+			       data->device, target, strerror(errno));
 	}
 
 	return 1;
@@ -209,94 +217,77 @@ static int _umount_device(char *buffer, unsigned major, unsigned minor,
  * Find all thin pool users and try to umount them.
  * TODO: work with read-only thin pool support
  */
-static void _umount(struct dm_task *dmt)
+static void _umount(struct dm_task *dmt, const char *device)
 {
-	/* TODO: Convert to use hash to reduce memory usage */
-	static const size_t MINORS = (1U << 20); /* 20 bit */
-	struct mountinfo_s data = { NULL };
+	static const size_t MINORS = 4096;
+	struct mountinfo_s data = {
+		.device = device,
+	};
 
 	if (!dm_task_get_info(dmt, &data.info))
 		return;
 
-	data.device = dm_task_get_name(dmt);
+	dmeventd_lvm2_unlock();
 
 	if (!(data.minors = dm_bitset_create(NULL, MINORS))) {
-		log_error("Failed to allocate bitset. Not unmounting %s.", data.device);
+		syslog(LOG_ERR, "Failed to allocate bitset. Not unmounting %s.\n", device);
 		goto out;
 	}
 
 	if (!_find_all_devs(data.minors, data.info.major, data.info.minor)) {
-		log_error("Failed to detect mounted volumes for %s.", data.device);
+		syslog(LOG_ERR, "Failed to detect mounted volumes for %s.\n", device);
 		goto out;
 	}
 
 	if (!dm_mountinfo_read(_umount_device, &data)) {
-		log_error("Could not parse mountinfo file.");
+		syslog(LOG_ERR, "Could not parse mountinfo file.\n");
 		goto out;
 	}
 
 out:
 	if (data.minors)
 		dm_bitset_destroy(data.minors);
-}
-
-static void _use_policy(struct dm_task *dmt, struct dso_state *state)
-{
-#if THIN_DEBUG
-	log_info("dmeventd executes: %s.", state->cmd_str);
-#endif
-	if (!dmeventd_lvm2_run_with_lock(state->cmd_str)) {
-		log_error("Failed to extend thin pool %s.",
-			  dm_task_get_name(dmt));
-		_umount(dmt);
-		state->fails++;
-	} else
-		state->fails = 0;
+	dmeventd_lvm2_lock();
 }
 
 void process_event(struct dm_task *dmt,
 		   enum dm_event_mask event __attribute__((unused)),
-		   void **user)
+		   void **private)
 {
 	const char *device = dm_task_get_name(dmt);
 	int percent;
-	struct dso_state *state = *user;
+	struct dso_state *state = *private;
 	struct dm_status_thin_pool *tps = NULL;
 	void *next = NULL;
 	uint64_t start, length;
 	char *target_type = NULL;
 	char *params;
-	int needs_policy = 0;
 
 #if 0
 	/* No longer monitoring, waiting for remove */
 	if (!state->meta_percent_check && !state->data_percent_check)
 		return;
 #endif
-	if (event & DM_EVENT_DEVICE_ERROR) {
-		/* Error -> no need to check and do instant resize */
-		_use_policy(dmt, state);
-		goto out;
-	}
+	dmeventd_lvm2_lock();
 
 	dm_get_next_target(dmt, next, &start, &length, &target_type, &params);
 
 	if (!target_type || (strcmp(target_type, "thin-pool") != 0)) {
-		log_error("Invalid target type.");
+		syslog(LOG_ERR, "Invalid target type.\n");
 		goto out;
 	}
 
 	if (!dm_get_status_thin_pool(state->mem, params, &tps)) {
-		log_error("Failed to parse status.");
-		_umount(dmt);
+		syslog(LOG_ERR, "Failed to parse status.\n");
+		_umount(dmt, device);
 		goto out;
 	}
 
 #if THIN_DEBUG
-	log_debug("Thin pool status " FMTu64 "/" FMTu64 "  "
-		  FMTu64 "/" FMTu64 ".",
-		  tps->used_metadata_blocks, tps->total_metadata_blocks,
-		  tps->used_data_blocks, tps->total_data_blocks);
+	syslog(LOG_INFO, "%p: Got status %" PRIu64 " / %" PRIu64
+	       " %" PRIu64  " / %" PRIu64 ".\n", state,
+	       tps->used_metadata_blocks, tps->total_metadata_blocks,
+	       tps->used_data_blocks, tps->total_data_blocks);
 #endif
 
 	/* Thin pool size had changed. Clear the threshold. */
@@ -310,7 +301,7 @@ void process_event(struct dm_task *dmt,
 		state->known_data_size = tps->total_data_blocks;
 	}
 
-	percent = dm_make_percent(tps->used_metadata_blocks, tps->total_metadata_blocks);
+	percent = 100 * tps->used_metadata_blocks / tps->total_metadata_blocks;
 	if (percent >= state->metadata_percent_check) {
 		/*
 		 * Usage has raised more than CHECK_STEP since the last
@@ -320,12 +311,18 @@ void process_event(struct dm_task *dmt,
 
 		/* FIXME: extension of metadata needs to be written! */
 		if (percent >= WARNING_THRESH) /* Print a warning to syslog. */
-			log_warn("WARNING: Thin pool %s metadata is now %.2f%% full.",
-				 device, dm_percent_to_float(percent));
-		needs_policy = 1;
+			syslog(LOG_WARNING, "Thin metadata %s is now %i%% full.\n",
+			       device, percent);
+		 /* Try to extend the metadata, in accord with user-set policies */
+		if (!_extend(state)) {
+			syslog(LOG_ERR, "Failed to extend thin metadata %s.\n",
+			       device);
+			_umount(dmt, device);
+		}
+		/* FIXME: hmm READ-ONLY switch should happen in error path */
 	}
 
-	percent = dm_make_percent(tps->used_data_blocks, tps->total_data_blocks);
+	percent = 100 * tps->used_data_blocks / tps->total_data_blocks;
 	if (percent >= state->data_percent_check) {
 		/*
 		 * Usage has raised more than CHECK_STEP since
@@ -334,53 +331,56 @@ void process_event(struct dm_task *dmt,
 		state->data_percent_check = (percent / CHECK_STEP) * CHECK_STEP + CHECK_STEP;
 
 		if (percent >= WARNING_THRESH) /* Print a warning to syslog. */
-			log_warn("WARNING: Thin pool %s data is now %.2f%% full.",
-				 device, dm_percent_to_float(percent));
-		needs_policy = 1;
+			syslog(LOG_WARNING, "Thin %s is now %i%% full.\n", device, percent);
+		/* Try to extend the thin data, in accord with user-set policies */
+		if (!_extend(state)) {
+			syslog(LOG_ERR, "Failed to extend thin %s.\n", device);
+			state->data_percent_check = 0;
+			_umount(dmt, device);
+		}
+		/* FIXME: hmm READ-ONLY switch should happen in error path */
 	}
-
-	if (needs_policy)
-		_use_policy(dmt, state);
 out:
 	if (tps)
 		dm_pool_free(state->mem, tps);
 
-	if (state->fails >= MAX_FAILS) {
-		log_warn("WARNING: Dropping monitoring of %s. "
-			 "lvm2 command fails too often (%u times in raw).",
-			 device, state->fails);
-		pthread_kill(pthread_self(), SIGALRM);
-	}
+	dmeventd_lvm2_unlock();
 }
 
 int register_device(const char *device,
 		    const char *uuid __attribute__((unused)),
 		    int major __attribute__((unused)),
 		    int minor __attribute__((unused)),
-		    void **user)
+		    void **private)
 {
+	struct dm_pool *statemem = NULL;
 	struct dso_state *state;
 
-	if (!dmeventd_lvm2_init_with_pool("thin_pool_state", state))
-		goto_bad;
+	if (!dmeventd_lvm2_init())
+		goto bad;
 
-	if (!dmeventd_lvm2_command(state->mem, state->cmd_str,
+	if (!(statemem = dm_pool_create("thin_pool_state", 2048)) ||
+	    !(state = dm_pool_zalloc(statemem, sizeof(*state))) ||
+	    !dmeventd_lvm2_command(statemem, state->cmd_str,
 				   sizeof(state->cmd_str),
 				   "lvextend --use-policies",
 				   device)) {
-		dmeventd_lvm2_exit_with_pool(state);
-		goto_bad;
+		if (statemem)
+			dm_pool_destroy(statemem);
+		dmeventd_lvm2_exit();
+		goto bad;
 	}
 
+	state->mem = statemem;
 	state->metadata_percent_check = CHECK_MINIMUM;
 	state->data_percent_check = CHECK_MINIMUM;
-	*user = state;
+	*private = state;
 
-	log_info("Monitoring thin %s.", device);
+	syslog(LOG_INFO, "Monitoring thin %s.\n", device);
 
 	return 1;
 bad:
-	log_error("Failed to monitor thin %s.", device);
+	syslog(LOG_ERR, "Failed to monitor thin %s.\n", device);
 
 	return 0;
 }
@@ -389,12 +389,13 @@ int unregister_device(const char *device,
 		      const char *uuid __attribute__((unused)),
 		      int major __attribute__((unused)),
 		      int minor __attribute__((unused)),
-		      void **user)
+		      void **private)
 {
-	struct dso_state *state = *user;
+	struct dso_state *state = *private;
 
-	dmeventd_lvm2_exit_with_pool(state);
-	log_info("No longer monitoring thin %s.", device);
+	syslog(LOG_INFO, "No longer monitoring thin %s.\n", device);
+	dm_pool_destroy(state->mem);
+	dmeventd_lvm2_exit();
 
 	return 1;
 }

daemons/lvmetad/.gitignore

@@ -1,2 +0,0 @@
-lvmetad
-lvmetactl

daemons/lvmetad/Makefile.in

@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
 SOURCES = lvmetad-core.c
 SOURCES2 = testclient.c
 
-TARGETS = lvmetad lvmetactl
+TARGETS = lvmetad lvmetad-testclient
 
 .PHONY: install_lvmetad
 
@@ -33,19 +33,13 @@ LVMLIBS = -ldaemonserver $(LVMINTERNAL_LIBS) -ldevmapper
 
 LIBS += $(PTHREAD_LIBS)
 
-LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS)
+LDFLAGS += -L$(top_builddir)/libdaemon/server
 CLDFLAGS += -L$(top_builddir)/libdaemon/server
-CFLAGS += $(EXTRA_EXEC_CFLAGS)
 
 lvmetad: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
 		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LVMLIBS) $(LIBS)
-
-lvmetactl: lvmetactl.o $(top_builddir)/libdaemon/client/libdaemonclient.a \
-	$(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmetactl.o $(LVMLIBS)
-
-CLEAN_TARGETS += lvmetactl.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
+	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
 
 # TODO: No idea. No idea how to test either.
 #ifneq ("$(CFLOW_CMD)", "")

daemons/lvmetad/lvmetactl.c

@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2014 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- */
-
-#include "tool.h"
-
-#include "lvmetad-client.h"
-
-daemon_handle h;
-
-static void print_reply(daemon_reply reply)
-{
-	const char *a = daemon_reply_str(reply, "response", NULL);
-	const char *b = daemon_reply_str(reply, "status", NULL);
-	const char *c = daemon_reply_str(reply, "reason", NULL);
-
-	printf("response \"%s\" status \"%s\" reason \"%s\"\n",
-	       a ? a : "", b ? b : "", c ? c : "");
-}
-
-int main(int argc, char **argv)
-{
-	daemon_reply reply;
-	char *cmd;
-	char *uuid;
-	char *name;
-	int val;
-	int ver;
-
-	if (argc < 2) {
-		printf("lvmetactl dump\n");
-		printf("lvmetactl pv_list\n");
-		printf("lvmetactl vg_list\n");
-		printf("lvmetactl vg_lookup_name <name>\n");
-		printf("lvmetactl vg_lookup_uuid <uuid>\n");
-		printf("lvmetactl pv_lookup_uuid <uuid>\n");
-		printf("lvmetactl set_global_invalid 0|1\n");
-		printf("lvmetactl get_global_invalid\n");
-		printf("lvmetactl set_vg_version <uuid> <name> <version>\n");
-		printf("lvmetactl vg_lock_type <uuid>\n");
-		return -1;
-	}
-
-	cmd = argv[1];
-
-	h = lvmetad_open(NULL);
-
-	if (!strcmp(cmd, "dump")) {
-		reply = daemon_send_simple(h, "dump",
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "pv_list")) {
-		reply = daemon_send_simple(h, "pv_list",
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "vg_list")) {
-		reply = daemon_send_simple(h, "vg_list",
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "set_global_invalid")) {
-		if (argc < 3) {
-			printf("set_global_invalid 0|1\n");
-			return -1;
-		}
-		val = atoi(argv[2]);
-
-		reply = daemon_send_simple(h, "set_global_info",
-					   "global_invalid = %d", val,
-					   "token = %s", "skip",
-					   NULL);
-		print_reply(reply);
-
-	} else if (!strcmp(cmd, "get_global_invalid")) {
-		reply = daemon_send_simple(h, "get_global_info",
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "set_vg_version")) {
-		if (argc < 5) {
-			printf("set_vg_version <uuid> <name> <ver>\n");
-			return -1;
-		}
-		uuid = argv[2];
-		name = argv[3];
-		ver = atoi(argv[4]);
-
-		if ((strlen(uuid) == 1) && (uuid[0] == '-'))
-			uuid = NULL;
-		if ((strlen(name) == 1) && (name[0] == '-'))
-			name = NULL;
-
-		if (uuid && name) {
-			reply = daemon_send_simple(h, "set_vg_info",
-						   "uuid = %s", uuid,
-						   "name = %s", name,
-						   "version = %d", ver,
-						    "token = %s", "skip",
-						    NULL);
-		} else if (uuid) {
-			reply = daemon_send_simple(h, "set_vg_info",
-						   "uuid = %s", uuid,
-						   "version = %d", ver,
-						    "token = %s", "skip",
-						    NULL);
-		} else if (name) {
-			reply = daemon_send_simple(h, "set_vg_info",
-						   "name = %s", name,
-						   "version = %d", ver,
-						    "token = %s", "skip",
-						    NULL);
-		} else {
-			printf("name or uuid required\n");
-			return -1;
-		}
-
-		print_reply(reply);
-
-	} else if (!strcmp(cmd, "vg_lookup_name")) {
-		if (argc < 3) {
-			printf("vg_lookup_name <name>\n");
-			return -1;
-		}
-		name = argv[2];
-
-		reply = daemon_send_simple(h, "vg_lookup",
-					   "name = %s", name,
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "vg_lookup_uuid")) {
-		if (argc < 3) {
-			printf("vg_lookup_uuid <uuid>\n");
-			return -1;
-		}
-		uuid = argv[2];
-
-		reply = daemon_send_simple(h, "vg_lookup",
-					   "uuid = %s", uuid,
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else if (!strcmp(cmd, "vg_lock_type")) {
-		struct dm_config_node *metadata;
-		const char *lock_type;
-
-		if (argc < 3) {
-			printf("vg_lock_type <uuid>\n");
-			return -1;
-		}
-		uuid = argv[2];
-
-		reply = daemon_send_simple(h, "vg_lookup",
-					   "uuid = %s", uuid,
-					   "token = %s", "skip",
-					   NULL);
-		/* printf("%s\n", reply.buffer.mem); */
-
-		metadata = dm_config_find_node(reply.cft->root, "metadata");
-		if (!metadata) {
-			printf("no metadata\n");
-			goto out;
-		}
-
-		lock_type = dm_config_find_str(metadata, "metadata/lock_type", NULL);
-		if (!lock_type) {
-			printf("no lock_type\n");
-			goto out;
-		}
-		printf("lock_type %s\n", lock_type);
-
-	} else if (!strcmp(cmd, "pv_lookup_uuid")) {
-		if (argc < 3) {
-			printf("pv_lookup_uuid <uuid>\n");
-			return -1;
-		}
-		uuid = argv[2];
-
-		reply = daemon_send_simple(h, "pv_lookup",
-					   "uuid = %s", uuid,
-					   "token = %s", "skip",
-					   NULL);
-		printf("%s\n", reply.buffer.mem);
-
-	} else {
-		printf("unknown command\n");
-		goto out_close;
-	}
-out:
-	daemon_reply_destroy(reply);
-out_close:
-	daemon_close(h);
-	return 0;
-}

daemons/lvmetad/lvmetad-client.h

@@ -17,8 +17,6 @@
 
 #include "daemon-client.h"
 
-#define LVMETAD_SOCKET DEFAULT_RUN_DIR "/lvmetad.socket"
-
 struct volume_group;
 
 /* Different types of replies we may get from lvmetad. */
@@ -66,7 +64,7 @@ static inline daemon_handle lvmetad_open(const char *socket)
 {
 	daemon_info lvmetad_info = {
 		.path = "lvmetad",
-		.socket = socket ?: LVMETAD_SOCKET,
+		.socket = socket ?: DEFAULT_RUN_DIR "/lvmetad.socket",
 		.protocol = "lvmetad",
 		.protocol_version = 1,
 		.autostart = 0

daemons/lvmetad/testclient.c

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2011-2014 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include "tool.h"
-
 #include "lvmetad-client.h"
 #include "label.h"
 #include "lvmcache.h"
@@ -120,17 +105,15 @@ void _dump_vg(daemon_handle h, const char *uuid)
 
 int main(int argc, char **argv) {
 	daemon_handle h = lvmetad_open();
-	/* FIXME Missing error path */
 
 	if (argc > 1) {
 		int i;
-		struct cmd_context *cmd = create_toolcontext(0, NULL, 0, 0, 1, 1);
+		struct cmd_context *cmd = create_toolcontext(0, NULL, 0, 0);
 		for (i = 1; i < argc; ++i) {
 			const char *uuid = NULL;
 			scan(h, argv[i]);
 		}
 		destroy_toolcontext(cmd);
-		/* FIXME Missing lvmetad_close() */
 		return 0;
 	}
 
@@ -139,6 +122,6 @@ int main(int argc, char **argv) {
 	_dump_vg(h, vgid);
 	_pv_add(h, uuid3, NULL);
 
-	daemon_close(h);	/* FIXME lvmetad_close? */
+	daemon_close(h);
 	return 0;
 }

daemons/lvmlockd/.gitignore

@@ -1,2 +0,0 @@
-lvmlockctl
-lvmlockd

daemons/lvmlockd/Makefile.in

@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2014-2015 Red Hat, Inc.
-#
-# This file is part of LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU Lesser General Public License v.2.1.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-
-SOURCES = lvmlockd-core.c
-
-ifeq ("@BUILD_LOCKDSANLOCK@", "yes")
-  SOURCES += lvmlockd-sanlock.c
-endif
-
-ifeq ("@BUILD_LOCKDDLM@", "yes")
-  SOURCES += lvmlockd-dlm.c
-endif
-
-TARGETS = lvmlockd lvmlockctl
-
-.PHONY: install_lvmlockd
-
-include $(top_builddir)/make.tmpl
-
-INCLUDES += -I$(top_srcdir)/libdaemon/server
-LVMLIBS = -ldaemonserver $(LVMINTERNAL_LIBS) -ldevmapper
-
-LIBS += $(PTHREAD_LIBS)
-
-ifeq ("@BUILD_LOCKDSANLOCK@", "yes")
-  LIBS += -lsanlock_client
-endif
-
-ifeq ("@BUILD_LOCKDDLM@", "yes")
-  LIBS += -ldlm_lt
-endif
-
-LDFLAGS += -L$(top_builddir)/libdaemon/server
-CLDFLAGS += -L$(top_builddir)/libdaemon/server
-
-lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
-		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LVMLIBS) $(LIBS)
-
-lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a \
-		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(LVMLIBS)
-
-install_lvmlockd: lvmlockd
-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
-
-install_lvmlockctl: lvmlockctl
-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
-
-install_lvm2: install_lvmlockd install_lvmlockctl
-
-install: install_lvm2

daemons/lvmlockd/lvmlockctl.c

@@ -1,753 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- */
-
-#include "tool.h"
-
-#include "lvmlockd-client.h"
-
-#include <stddef.h>
-#include <getopt.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <syslog.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-static int quit = 0;
-static int info = 0;
-static int dump = 0;
-static int wait_opt = 0;
-static int force_opt = 0;
-static int kill_vg = 0;
-static int drop_vg = 0;
-static int gl_enable = 0;
-static int gl_disable = 0;
-static int stop_lockspaces = 0;
-static char *arg_vg_name = NULL;
-
-#define DUMP_SOCKET_NAME "lvmlockd-dump.sock"
-#define DUMP_BUF_SIZE (1024 * 1024)
-static char dump_buf[DUMP_BUF_SIZE+1];
-static int dump_len;
-static struct sockaddr_un dump_addr;
-static socklen_t dump_addrlen;
-
-daemon_handle _lvmlockd;
-
-#define log_error(fmt, args...) \
-do { \
-	printf(fmt "\n", ##args); \
-} while (0)
-
-#define MAX_LINE 512
-
-/* copied from lvmlockd-internal.h */
-#define MAX_NAME 64
-#define MAX_ARGS 64
-
-/*
- * lvmlockd dumps the client info before the lockspaces,
- * so we can look up client info when printing lockspace info.
- */
-
-#define MAX_CLIENTS 100
-
-struct client_info {
-	uint32_t client_id;
-	int pid;
-	char name[MAX_NAME+1];
-};
-
-static struct client_info clients[MAX_CLIENTS];
-static int num_clients;
-
-static void save_client_info(char *line)
-{
-	uint32_t pid = 0;
-	int fd = 0;
-	int pi = 0;
-	uint32_t client_id = 0;
-	char name[MAX_NAME+1] = { 0 };
-
-	sscanf(line, "info=client pid=%u fd=%d pi=%d id=%u name=%s",
-	       &pid, &fd, &pi, &client_id, name);
-
-	clients[num_clients].client_id = client_id;
-	clients[num_clients].pid = pid;
-	strcpy(clients[num_clients].name, name);
-	num_clients++;
-}
-
-static void find_client_info(uint32_t client_id, uint32_t *pid, char *cl_name)
-{
-	int i;
-
-	for (i = 0; i < num_clients; i++) {
-		if (clients[i].client_id == client_id) {
-			*pid = clients[i].pid;
-			strcpy(cl_name, clients[i].name);
-			return;
-		}
-	}
-}
-
-static int first_ls = 1;
-
-static void format_info_ls(char *line)
-{
-	char ls_name[MAX_NAME+1] = { 0 };
-	char vg_name[MAX_NAME+1] = { 0 };
-	char vg_uuid[MAX_NAME+1] = { 0 };
-	char vg_sysid[MAX_NAME+1] = { 0 };
-	char lock_args[MAX_ARGS+1] = { 0 };
-	char lock_type[MAX_NAME+1] = { 0 };
-
-	sscanf(line, "info=ls ls_name=%s vg_name=%s vg_uuid=%s vg_sysid=%s vg_args=%s lm_type=%s",
-	       ls_name, vg_name, vg_uuid, vg_sysid, lock_args, lock_type);
-
-	if (!first_ls)
-		printf("\n");
-	first_ls = 0;
-
-	printf("VG %s lock_type=%s %s\n", vg_name, lock_type, vg_uuid);
-
-	printf("LS %s %s\n", lock_type, ls_name);
-}
-
-static void format_info_ls_action(char *line)
-{
-	uint32_t client_id = 0;
-	char flags[MAX_NAME+1] = { 0 };
-	char version[MAX_NAME+1] = { 0 };
-	char op[MAX_NAME+1] = { 0 };
-	uint32_t pid = 0;
-	char cl_name[MAX_NAME+1] = { 0 };
-
-	sscanf(line, "info=ls_action client_id=%u %s %s op=%s",
-	       &client_id, flags, version, op);
-
-	find_client_info(client_id, &pid, cl_name);
-
-	printf("OP %s pid %u (%s)\n", op, pid, cl_name);
-}
-
-static void format_info_r(char *line, char *r_name_out, char *r_type_out)
-{
-	char r_name[MAX_NAME+1] = { 0 };
-	char r_type[4] = { 0 };
-	char mode[4] = { 0 };
-	char sh_count[MAX_NAME+1] = { 0 };
-	uint32_t ver = 0;
-
-	sscanf(line, "info=r name=%s type=%s mode=%s %s version=%u",
-	       r_name, r_type, mode, sh_count, &ver);
-
-	strcpy(r_name_out, r_name);
-	strcpy(r_type_out, r_type);
-
-	/* when mode is not un, wait and print each lk line */
-	if (strcmp(mode, "un"))
-		return;
-
-	/* when mode is un, there will be no lk lines, so print now */
-
-	if (!strcmp(r_type, "gl")) {
-		printf("LK GL un ver %u\n", ver);
-
-	} else if (!strcmp(r_type, "vg")) {
-		printf("LK VG un ver %u\n", ver);
-
-	} else if (!strcmp(r_type, "lv")) {
-		printf("LK LV un %s\n", r_name);
-	}
-}
-
-static void format_info_lk(char *line, char *r_name, char *r_type)
-{
-	char mode[4] = { 0 };
-	uint32_t ver = 0;
-	char flags[MAX_NAME+1] = { 0 };
-	uint32_t client_id = 0;
-	uint32_t pid = 0;
-	char cl_name[MAX_NAME+1] = { 0 };
-
-	if (!r_name[0] || !r_type[0]) {
-		printf("format_info_lk error r_name %s r_type %s\n", r_name, r_type);
-		printf("%s\n", line);
-		return;
-	}
-
-	sscanf(line, "info=lk mode=%s version=%u %s client_id=%u",
-	       mode, &ver, flags, &client_id);
-
-	find_client_info(client_id, &pid, cl_name);
-
-	if (!strcmp(r_type, "gl")) {
-		printf("LK GL %s ver %u pid %u (%s)\n", mode, ver, pid, cl_name);
-
-	} else if (!strcmp(r_type, "vg")) {
-		printf("LK VG %s ver %u pid %u (%s)\n", mode, ver, pid, cl_name);
-
-	} else if (!strcmp(r_type, "lv")) {
-		printf("LK LV %s %s\n", mode, r_name);
-	}
-}
-
-static void format_info_r_action(char *line, char *r_name, char *r_type)
-{
-	uint32_t client_id = 0;
-	char flags[MAX_NAME+1] = { 0 };
-	char version[MAX_NAME+1] = { 0 };
-	char op[MAX_NAME+1] = { 0 };
-	char rt[4] = { 0 };
-	char mode[4] = { 0 };
-	char lm[MAX_NAME+1] = { 0 };
-	char result[MAX_NAME+1] = { 0 };
-	char lm_rv[MAX_NAME+1] = { 0 };
-	uint32_t pid = 0;
-	char cl_name[MAX_NAME+1] = { 0 };
-
-	if (!r_name[0] || !r_type[0]) {
-		printf("format_info_r_action error r_name %s r_type %s\n", r_name, r_type);
-		printf("%s\n", line);
-		return;
-	}
-
-	sscanf(line, "info=r_action client_id=%u %s %s op=%s rt=%s mode=%s %s %s %s",
-	       &client_id, flags, version, op, rt, mode, lm, result, lm_rv);
-
-	find_client_info(client_id, &pid, cl_name);
-
-	if (strcmp(op, "lock")) {
-		printf("OP %s pid %u (%s)\n", op, pid, cl_name);
-		return;
-	}
-
-	if (!strcmp(r_type, "gl")) {
-		printf("LW GL %s ver %u pid %u (%s)\n", mode, 0, pid, cl_name);
-
-	} else if (!strcmp(r_type, "vg")) {
-		printf("LW VG %s ver %u pid %u (%s)\n", mode, 0, pid, cl_name);
-
-	} else if (!strcmp(r_type, "lv")) {
-		printf("LW LV %s %s\n", mode, r_name);
-	}
-}
-
-static void format_info_line(char *line, char *r_name, char *r_type)
-{
-	if (!strncmp(line, "info=structs ", strlen("info=structs "))) {
-		/* only print this in the raw info dump */
-
-	} else if (!strncmp(line, "info=client ", strlen("info=client "))) {
-		save_client_info(line);
-
-	} else if (!strncmp(line, "info=ls ", strlen("info=ls "))) {
-		format_info_ls(line);
-
-	} else if (!strncmp(line, "info=ls_action ", strlen("info=ls_action "))) {
-		format_info_ls_action(line);
-
-	} else if (!strncmp(line, "info=r ", strlen("info=r "))) {
-		/*
-		 * r_name/r_type are reset when a new resource is found.
-		 * They are reused for the lock and action lines that
-		 * follow a resource line.
-		 */
-		memset(r_name, 0, MAX_NAME+1);
-		memset(r_type, 0, MAX_NAME+1);
-		format_info_r(line, r_name, r_type);
-
-	} else if (!strncmp(line, "info=lk ", strlen("info=lk "))) {
-		/* will use info from previous r */
-		format_info_lk(line, r_name, r_type);
-
-	} else if (!strncmp(line, "info=r_action ", strlen("info=r_action "))) {
-		/* will use info from previous r */
-		format_info_r_action(line, r_name, r_type);
-	} else {
-		printf("UN %s\n", line);
-	}
-}
-
-static void format_info(void)
-{
-	char line[MAX_LINE];
-	char r_name[MAX_NAME+1];
-	char r_type[MAX_NAME+1];
-	int i, j;
-
-	j = 0;
-	memset(line, 0, sizeof(line));
-
-	for (i = 0; i < dump_len; i++) {
-		line[j++] = dump_buf[i];
-
-		if ((line[j-1] == '\n') || (line[j-1] == '\0')) {
-			format_info_line(line, r_name, r_type);
-			j = 0;
-			memset(line, 0, sizeof(line));
-		}
-	}
-}
-
-
-static daemon_reply _lvmlockd_send(const char *req_name, ...)
-{
-	va_list ap;
-	daemon_reply repl;
-	daemon_request req;
-
-	req = daemon_request_make(req_name);
-
-	va_start(ap, req_name);
-	daemon_request_extend_v(req, ap);
-	va_end(ap);
-
-	repl = daemon_send(_lvmlockd, req);
-
-	daemon_request_destroy(req);
-
-	return repl;
-}
-
-/* See the same in lib/locking/lvmlockd.c */
-#define NO_LOCKD_RESULT -1000
-
-static int _lvmlockd_result(daemon_reply reply, int *result)
-{
-	int reply_result;
-
-	if (reply.error) {
-		log_error("lvmlockd_result reply error %d", reply.error);
-		return 0;
-	}
-
-	if (strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
-		log_error("lvmlockd_result bad response");
-		return 0;
-	}
-
-	reply_result = daemon_reply_int(reply, "op_result", NO_LOCKD_RESULT);
-	if (reply_result == -1000) {
-		log_error("lvmlockd_result no op_result");
-		return 0;
-	}
-
-	*result = reply_result;
-
-	return 1;
-}
-
-static int do_quit(void)
-{
-	daemon_reply reply;
-	int rv = 0;
-
-	reply = daemon_send_simple(_lvmlockd, "quit", NULL);
-
-	if (reply.error) {
-		log_error("reply error %d", reply.error);
-		rv = reply.error;
-	}
-
-	daemon_reply_destroy(reply);
-	return rv;
-}
-
-static int setup_dump_socket(void)
-{
-	int s, rv;
-
-	s = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	if (s < 0)
-		return s;
-
-	memset(&dump_addr, 0, sizeof(dump_addr));
-	dump_addr.sun_family = AF_LOCAL;
-	strcpy(&dump_addr.sun_path[1], DUMP_SOCKET_NAME);
-	dump_addrlen = sizeof(sa_family_t) + strlen(dump_addr.sun_path+1) + 1;
-
-	rv = bind(s, (struct sockaddr *) &dump_addr, dump_addrlen);
-	if (rv < 0) {
-		rv = -errno;
-		if (!close(s))
-			log_error("failed to close dump socket");
-		return rv;
-	}
-
-	return s;
-}
-
-static int do_dump(const char *req_name)
-{
-	daemon_reply reply;
-	int result;
-	int fd, rv = 0;
-	int count = 0;
-
-	fd = setup_dump_socket();
-	if (fd < 0) {
-		log_error("socket error %d", fd);
-		return fd;
-	}
-
-	reply = daemon_send_simple(_lvmlockd, req_name, NULL);
-
-	if (reply.error) {
-		log_error("reply error %d", reply.error);
-		rv = reply.error;
-		goto out;
-	}
-
-	result = daemon_reply_int(reply, "result", 0);
-	dump_len = daemon_reply_int(reply, "dump_len", 0);
-
-	daemon_reply_destroy(reply);
-
-	if (result < 0) {
-		rv = result;
-		log_error("result %d", result);
-	}
-
-	if (!dump_len)
-		goto out;
-
-	memset(dump_buf, 0, sizeof(dump_buf));
-
-retry:
-	rv = recvfrom(fd, dump_buf + count, dump_len - count, MSG_WAITALL,
-		      (struct sockaddr *)&dump_addr, &dump_addrlen);
-	if (rv < 0) {
-		log_error("recvfrom error %d %d", rv, errno);
-		rv = -errno;
-		goto out;
-	}
-	count += rv;
-
-	if (count < dump_len)
-		goto retry;
-
-	rv = 0;
-	if ((info && dump) || !strcmp(req_name, "dump"))
-		printf("%s\n", dump_buf);
-	else
-		format_info();
-out:
-	if (close(fd))
-		log_error("failed to close dump socket %d", fd);
-	return rv;
-}
-
-static int do_able(const char *req_name)
-{
-	daemon_reply reply;
-	int result;
-	int rv;
-
-	reply = _lvmlockd_send(req_name,
-				"cmd = %s", "lvmlockctl",
-				"pid = %d", getpid(),
-				"vg_name = %s", arg_vg_name,
-				NULL);
-
-	if (!_lvmlockd_result(reply, &result)) {
-		log_error("lvmlockd result %d", result);
-		rv = result;
-	} else {
-		rv = 0;
-	}
-
-	daemon_reply_destroy(reply);
-	return rv;
-}
-
-static int do_stop_lockspaces(void)
-{
-	daemon_reply reply;
-	char opts[32];
-	int result;
-	int rv;
-
-	memset(opts, 0, sizeof(opts));
-
-	if (wait_opt)
-		strcat(opts, "wait ");
-	if (force_opt)
-		strcat(opts, "force ");
-
-	reply = _lvmlockd_send("stop_all",
-				"cmd = %s", "lvmlockctl",
-				"pid = %d", getpid(),
-				"opts = %s", opts[0] ? opts : "none",
-				NULL);
-
-	if (!_lvmlockd_result(reply, &result)) {
-		log_error("lvmlockd result %d", result);
-		rv = result;
-	} else {
-		rv = 0;
-	}
-
-	daemon_reply_destroy(reply);
-	return rv;
-}
-
-static int do_kill(void)
-{
-	daemon_reply reply;
-	int result;
-	int rv;
-
-	syslog(LOG_EMERG, "Lost access to sanlock lease storage in VG %s.", arg_vg_name);
-	/* These two lines explain the manual alternative to the FIXME below. */
-	syslog(LOG_EMERG, "Immediately deactivate LVs in VG %s.", arg_vg_name);
-	syslog(LOG_EMERG, "Once VG is unused, run lvmlockctl --drop %s.", arg_vg_name);
-
-	/*
-	 * It may not be strictly necessary to notify lvmlockd of the kill, but
-	 * lvmlockd can use this information to avoid attempting any new lock
-	 * requests in the VG (which would fail anyway), and can return an
-	 * error indicating that the VG has been killed.
-	 */
-
-	reply = _lvmlockd_send("kill_vg",
-				"cmd = %s", "lvmlockctl",
-				"pid = %d", getpid(),
-				"vg_name = %s", arg_vg_name,
-				NULL);
-
-	if (!_lvmlockd_result(reply, &result)) {
-		log_error("lvmlockd result %d", result);
-		rv = result;
-	} else {
-		rv = 0;
-	}
-
-	daemon_reply_destroy(reply);
-
-	/*
-	 * FIXME: here is where we should implement a strong form of
-	 * blkdeactivate, and if it completes successfully, automatically call
-	 * do_drop() afterward.  (The drop step may not always be necessary
-	 * if the lvm commands run while shutting things down release all the
-	 * leases.)
-	 *
-	 * run_strong_blkdeactivate();
-	 * do_drop();
-	 */
-
-	return rv;
-}
-
-static int do_drop(void)
-{
-	daemon_reply reply;
-	int result;
-	int rv;
-
-	syslog(LOG_WARNING, "Dropping locks for VG %s.", arg_vg_name);
-
-	/*
-	 * Check for misuse by looking for any active LVs in the VG
-	 * and refusing this operation if found?  One possible way
-	 * to kill LVs (e.g. if fs cannot be unmounted) is to suspend
-	 * them, or replace them with the error target.  In that
-	 * case the LV will still appear to be active, but it is
-	 * safe to release the lock.
-	 */
-
-	reply = _lvmlockd_send("drop_vg",
-				"cmd = %s", "lvmlockctl",
-				"pid = %d", getpid(),
-				"vg_name = %s", arg_vg_name,
-				NULL);
-
-	if (!_lvmlockd_result(reply, &result)) {
-		log_error("lvmlockd result %d", result);
-		rv = result;
-	} else {
-		rv = 0;
-	}
-
-	daemon_reply_destroy(reply);
-	return rv;
-}
-
-static void print_usage(void)
-{
-	printf("lvmlockctl options\n");
-	printf("Options:\n");
-	printf("--help | -h\n");
-	printf("      Show this help information.\n");
-	printf("--quit | -q\n");
-	printf("      Tell lvmlockd to quit.\n");
-	printf("--info | -i\n");
-	printf("      Print lock state information from lvmlockd.\n");
-	printf("--dump | -d\n");
-	printf("      Print log buffer from lvmlockd.\n");
-	printf("--wait | -w 0|1\n");
-	printf("      Wait option for other commands.\n");
-	printf("--force | -f 0|1>\n");
-	printf("      Force option for other commands.\n");
-	printf("--kill | -k <vgname>\n");
-	printf("      Kill access to the VG when sanlock cannot renew lease.\n");
-	printf("--drop | -r <vgname>\n");
-	printf("      Clear locks for the VG when it is unused after kill (-k).\n");
-	printf("--gl-enable | -E <vgname>\n");
-	printf("      Tell lvmlockd to enable the global lock in a sanlock VG.\n");
-	printf("--gl-disable | -D <vgname>\n");
-	printf("      Tell lvmlockd to disable the global lock in a sanlock VG.\n");
-	printf("--stop-lockspaces | -S\n");
-	printf("      Stop all lockspaces.\n");
-}
-
-static int read_options(int argc, char *argv[])
-{
-	int option_index = 0;
-	int c;
-
-	static struct option long_options[] = {
-		{"help",            no_argument,       0,  'h' },
-		{"quit",            no_argument,       0,  'q' },
-		{"info",            no_argument,       0,  'i' },
-		{"dump",            no_argument,       0,  'd' },
-		{"wait",            required_argument, 0,  'w' },
-		{"force",           required_argument, 0,  'f' },
-		{"kill",            required_argument, 0,  'k' },
-		{"drop",            required_argument, 0,  'r' },
-		{"gl-enable",       required_argument, 0,  'E' },
-		{"gl-disable",      required_argument, 0,  'D' },
-		{"stop-lockspaces", no_argument,       0,  'S' },
-		{0, 0, 0, 0 }
-	};
-
-	if (argc == 1) {
-		print_usage();
-		exit(0);
-	}
-
-	while (1) {
-		c = getopt_long(argc, argv, "hqidE:D:w:k:r:S", long_options, &option_index);
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			/* --help */
-			print_usage();
-			exit(0);
-		case 'q':
-			/* --quit */
-			quit = 1;
-			break;
-		case 'i':
-			/* --info */
-			info = 1;
-			break;
-		case 'd':
-			/* --dump */
-			dump = 1;
-			break;
-		case 'w':
-			wait_opt = atoi(optarg);
-			break;
-		case 'k':
-			kill_vg = 1;
-			arg_vg_name = strdup(optarg);
-			break;
-		case 'r':
-			drop_vg = 1;
-			arg_vg_name = strdup(optarg);
-			break;
-		case 'E':
-			gl_enable = 1;
-			arg_vg_name = strdup(optarg);
-			break;
-		case 'D':
-			gl_disable = 1;
-			arg_vg_name = strdup(optarg);
-			break;
-		case 'S':
-			stop_lockspaces = 1;
-			break;
-		default:
-			print_usage();
-			exit(1);
-		}
-	}
-
-
-	return 0;
-}
-
-int main(int argc, char **argv)
-{
-	int rv = 0;
-
-	rv = read_options(argc, argv);
-	if (rv < 0)
-		return rv;
-
-	_lvmlockd = lvmlockd_open(NULL);
-
-	if (_lvmlockd.socket_fd < 0 || _lvmlockd.error) {
-		log_error("Cannot connect to lvmlockd.");
-		return -1;
-	}
-
-	if (quit) {
-		rv = do_quit();
-		goto out;
-	}
-
-	if (info) {
-		rv = do_dump("info");
-		goto out;
-	}
-
-	if (dump) {
-		rv = do_dump("dump");
-		goto out;
-	}
-
-	if (kill_vg) {
-		rv = do_kill();
-		goto out;
-	}
-
-	if (drop_vg) {
-		rv = do_drop();
-		goto out;
-	}
-
-	if (gl_enable) {
-		syslog(LOG_INFO, "Enabling global lock in VG %s.", arg_vg_name);
-		rv = do_able("enable_gl");
-		goto out;
-	}
-
-	if (gl_disable) {
-		syslog(LOG_INFO, "Disabling global lock in VG %s.", arg_vg_name);
-		rv = do_able("disable_gl");
-		goto out;
-	}
-
-	if (stop_lockspaces) {
-		rv = do_stop_lockspaces();
-		goto out;
-	}
-
-out:
-	lvmlockd_close(_lvmlockd);
-	return rv;
-}

daemons/lvmlockd/lvmlockd-client.h

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- */
-
-#ifndef _LVM_LVMLOCKD_CLIENT_H
-#define _LVM_LVMLOCKD_CLIENT_H
-
-#include "daemon-client.h"
-
-#define LVMLOCKD_SOCKET DEFAULT_RUN_DIR "/lvmlockd.socket"
-
-/* Wrappers to open/close connection */
-
-static inline daemon_handle lvmlockd_open(const char *sock)
-{
-	daemon_info lvmlockd_info = {
-		.path = "lvmlockd",
-		.socket = sock ?: LVMLOCKD_SOCKET,
-		.protocol = "lvmlockd",
-		.protocol_version = 1,
-		.autostart = 0
-	};
-
-	return daemon_open(lvmlockd_info);
-}
-
-static inline void lvmlockd_close(daemon_handle h)
-{
-	return daemon_close(h);
-}
-
-/*
- * Errors returned as the lvmlockd result value.
- */
-#define ENOLS     210 /* lockspace not found */
-#define ESTARTING 211 /* lockspace is starting */
-#define EARGS     212
-#define EHOSTID   213
-#define EMANAGER  214
-#define EPREPARE  215
-#define ELOCKD    216
-#define EVGKILLED 217 /* sanlock lost access to leases and VG is killed. */
-#define ELOCKIO   218 /* sanlock io errors during lock op, may be transient. */
-#define EREMOVED  219
-
-#endif	/* _LVM_LVMLOCKD_CLIENT_H */

daemons/lvmlockd/lvmlockd-dlm.c

@@ -1,767 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- */
-
-#define _XOPEN_SOURCE 500  /* pthread */
-#define _ISOC99_SOURCE
-
-#include "tool.h"
-
-#include "daemon-server.h"
-#include "daemon-log.h"
-#include "xlate.h"
-
-#include "lvmlockd-internal.h"
-#include "lvmlockd-client.h"
-
-/*
- * Using synchronous _wait dlm apis so do not define _REENTRANT and
- * link with non-threaded version of library, libdlm_lt.
- */
-#include "libdlm.h"
-
-#include <pthread.h>
-#include <stddef.h>
-#include <poll.h>
-#include <errno.h>
-#include <endian.h>
-#include <fcntl.h>
-#include <byteswap.h>
-#include <syslog.h>
-#include <dirent.h>
-#include <sys/socket.h>
-
-struct lm_dlm {
-	dlm_lshandle_t *dh;
-};
-
-struct rd_dlm {
-	struct dlm_lksb lksb;
-	struct val_blk *vb;
-};
-
-int lm_data_size_dlm(void)
-{
-	return sizeof(struct rd_dlm);
-}
-
-/*
- * lock_args format
- *
- * vg_lock_args format for dlm is
- * vg_version_string:undefined:cluster_name
- *
- * lv_lock_args are not used for dlm
- *
- * version_string is MAJOR.MINOR.PATCH
- * undefined may contain ":"
- */
-
-#define VG_LOCK_ARGS_MAJOR 1
-#define VG_LOCK_ARGS_MINOR 0
-#define VG_LOCK_ARGS_PATCH 0
-
-static int dlm_has_lvb_bug;
-
-static int cluster_name_from_args(char *vg_args, char *clustername)
-{
-	return last_string_from_args(vg_args, clustername);
-}
-
-static int check_args_version(char *vg_args)
-{
-	unsigned int major = 0;
-	int rv;
-
-	rv = version_from_args(vg_args, &major, NULL, NULL);
-	if (rv < 0) {
-		log_error("check_args_version %s error %d", vg_args, rv);
-		return rv;
-	}
-
-	if (major > VG_LOCK_ARGS_MAJOR) {
-		log_error("check_args_version %s major %d %d", vg_args, major, VG_LOCK_ARGS_MAJOR);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* This will be set after dlm_controld is started. */
-#define DLM_CLUSTER_NAME_PATH "/sys/kernel/config/dlm/cluster/cluster_name"
-
-static int read_cluster_name(char *clustername)
-{
-	static const char close_error_msg[] = "read_cluster_name: close_error %d";
-	char *n;
-	int fd;
-	int rv;
-
-	if (daemon_test) {
-		sprintf(clustername, "%s", "test");
-		return 0;
-	}
-
-	fd = open(DLM_CLUSTER_NAME_PATH, O_RDONLY);
-	if (fd < 0) {
-		log_debug("read_cluster_name: open error %d, check dlm_controld", fd);
-		return fd;
-	}
-
-	rv = read(fd, clustername, MAX_ARGS);
-	if (rv < 0) {
-		log_error("read_cluster_name: cluster name read error %d, check dlm_controld", fd);
-		if (close(fd))
-			log_error(close_error_msg, fd);
-		return rv;
-	}
-
-	n = strstr(clustername, "\n");
-	if (n)
-		*n = '\0';
-	if (close(fd))
-		log_error(close_error_msg, fd);
-	return 0;
-}
-
-int lm_init_vg_dlm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
-{
-	char clustername[MAX_ARGS+1];
-	char lock_args_version[MAX_ARGS+1];
-	int rv;
-
-	memset(clustername, 0, sizeof(clustername));
-	memset(lock_args_version, 0, sizeof(lock_args_version));
-
-	snprintf(lock_args_version, MAX_ARGS, "%u.%u.%u",
-		 VG_LOCK_ARGS_MAJOR, VG_LOCK_ARGS_MINOR, VG_LOCK_ARGS_PATCH);
-
-	rv = read_cluster_name(clustername);
-	if (rv < 0)
-		return -EMANAGER;
-
-	if (strlen(clustername) + strlen(lock_args_version) + 2 > MAX_ARGS) {
-		log_error("init_vg_dlm args too long");
-		return -EARGS;
-	}
-
-	snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, clustername);
-	rv = 0;
-
-	log_debug("init_vg_dlm done %s vg_args %s", ls_name, vg_args);
-	return rv;
-}
-
-int lm_prepare_lockspace_dlm(struct lockspace *ls)
-{
-	char sys_clustername[MAX_ARGS+1];
-	char arg_clustername[MAX_ARGS+1];
-	uint32_t major = 0, minor = 0, patch = 0;
-	struct lm_dlm *lmd;
-	int rv;
-
-	memset(sys_clustername, 0, sizeof(sys_clustername));
-	memset(arg_clustername, 0, sizeof(arg_clustername));
-
-	rv = read_cluster_name(sys_clustername);
-	if (rv < 0)
-		return -EMANAGER;
-
-	rv = dlm_kernel_version(&major, &minor, &patch);
-	if (rv < 0) {
-		log_error("prepare_lockspace_dlm kernel_version not detected %d", rv);
-		dlm_has_lvb_bug = 1;
-	}
-
-	if ((major == 6) && (minor == 0) && (patch == 1)) {
-		log_debug("dlm kernel version %u.%u.%u has lvb bug", major, minor, patch);
-		dlm_has_lvb_bug = 1;
-	}
-
-	if (!ls->vg_args[0]) {
-		/* global lockspace has no vg args */
-		goto skip_args;
-	}
-
-	rv = check_args_version(ls->vg_args);
-	if (rv < 0)
-		return -EARGS;
-
-	rv = cluster_name_from_args(ls->vg_args, arg_clustername);
-	if (rv < 0) {
-		log_error("prepare_lockspace_dlm %s no cluster name from args %s", ls->name, ls->vg_args);
-		return -EARGS;
-	}
-
-	if (strcmp(sys_clustername, arg_clustername)) {
-		log_error("prepare_lockspace_dlm %s mismatching cluster names sys %s arg %s",
-			  ls->name, sys_clustername, arg_clustername);
-		return -EARGS;
-	}
-
- skip_args:
-	lmd = malloc(sizeof(struct lm_dlm));
-	if (!lmd)
-		return -ENOMEM;
-
-	ls->lm_data = lmd;
-	return 0;
-}
-
-int lm_add_lockspace_dlm(struct lockspace *ls, int adopt)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-
-	if (daemon_test)
-		return 0;
-
-	if (adopt)
-		lmd->dh = dlm_open_lockspace(ls->name);
-	else
-		lmd->dh = dlm_new_lockspace(ls->name, 0600, DLM_LSFL_NEWEXCL);
-
-	if (!lmd->dh) {
-		log_error("add_lockspace_dlm %s adopt %d error", ls->name, adopt);
-		free(lmd);
-		ls->lm_data = NULL;
-		return -1;
-	}
-
-	return 0;
-}
-
-int lm_rem_lockspace_dlm(struct lockspace *ls, int free_vg)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	int rv;
-
-	if (daemon_test)
-		goto out;
-
-	/*
-	 * If free_vg is set, it means we are doing vgremove, and we may want
-	 * to tell any other nodes to leave the lockspace.  This is not really
-	 * necessary since there should be no harm in having an unused
-	 * lockspace sitting around.  A new "notification lock" would need to
-	 * be added with a callback to signal this. 
-	 */
-
-	rv = dlm_release_lockspace(ls->name, lmd->dh, 1);
-	if (rv < 0) {
-		log_error("rem_lockspace_dlm error %d", rv);
-		return rv;
-	}
- out:
-	free(lmd);
-	ls->lm_data = NULL;
-	return 0;
-}
-
-static int lm_add_resource_dlm(struct lockspace *ls, struct resource *r, int with_lock_nl)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	uint32_t flags = 0;
-	char *buf;
-	int rv;
-
-	if (r->type == LD_RT_GL || r->type == LD_RT_VG) {
-		buf = malloc(sizeof(struct val_blk) + DLM_LVB_LEN);
-		if (!buf)
-			return -ENOMEM;
-		memset(buf, 0, sizeof(struct val_blk) + DLM_LVB_LEN);
-
-		rdd->vb = (struct val_blk *)buf;
-		rdd->lksb.sb_lvbptr = buf + sizeof(struct val_blk);
-
-		flags |= LKF_VALBLK;
-	}
-
-	if (!with_lock_nl)
-		goto out;
-
-	/* because this is a new NL lock request */
-	flags |= LKF_EXPEDITE;
-
-	if (daemon_test)
-		goto out;
-
-	rv = dlm_ls_lock_wait(lmd->dh, LKM_NLMODE, &rdd->lksb, flags,
-			      r->name, strlen(r->name),
-			      0, NULL, NULL, NULL);
-	if (rv < 0) {
-		log_error("S %s R %s add_resource_dlm lock error %d", ls->name, r->name, rv);
-		return rv;
-	}
- out:
-	return 0;
-}
-
-int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	struct dlm_lksb *lksb;
-	int rv = 0;
-
-	if (daemon_test)
-		goto out;
-
-	lksb = &rdd->lksb;
-
-	if (!lksb->sb_lkid)
-		goto out;
-
-	rv = dlm_ls_unlock_wait(lmd->dh, lksb->sb_lkid, 0, lksb);
-	if (rv < 0) {
-		log_error("S %s R %s rem_resource_dlm unlock error %d", ls->name, r->name, rv);
-	}
- out:
-	if (rdd->vb)
-		free(rdd->vb);
-
-	memset(rdd, 0, sizeof(struct rd_dlm));
-	r->lm_init = 0;
-	return rv;
-}
-
-static int to_dlm_mode(int ld_mode)
-{
-	switch (ld_mode) {
-	case LD_LK_EX:
-		return LKM_EXMODE;
-	case LD_LK_SH:
-		return LKM_PRMODE;
-	};
-	return -1;
-}
-
-static int lm_adopt_dlm(struct lockspace *ls, struct resource *r, int ld_mode,
-			struct val_blk *vb_out)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	struct dlm_lksb *lksb;
-	uint32_t flags = 0;
-	int mode;
-	int rv;
-
-	memset(vb_out, 0, sizeof(struct val_blk));
-
-	if (!r->lm_init) {
-		rv = lm_add_resource_dlm(ls, r, 0);
-		if (rv < 0)
-			return rv;
-		r->lm_init = 1;
-	}
-
-	lksb = &rdd->lksb;
-
-	flags |= LKF_PERSISTENT;
-	flags |= LKF_ORPHAN;
-
-	if (rdd->vb)
-		flags |= LKF_VALBLK;
-
-	mode = to_dlm_mode(ld_mode);
-	if (mode < 0) {
-		log_error("adopt_dlm invalid mode %d", ld_mode);
-		rv = -EINVAL;
-		goto fail;
-	}
-
-	log_debug("S %s R %s adopt_dlm", ls->name, r->name);
-
-	if (daemon_test)
-		return 0;
-
-	/*
-	 * dlm returns 0 for success, -EAGAIN if an orphan is
-	 * found with another mode, and -ENOENT if no orphan.
-	 *
-	 * cast/bast/param are (void *)1 because the kernel
-	 * returns errors if some are null.
-	 */
-
-	rv = dlm_ls_lockx(lmd->dh, mode, lksb, flags,
-			  r->name, strlen(r->name), 0,
-			  (void *)1, (void *)1, (void *)1,
-			  NULL, NULL);
-
-	if (rv == -1 && errno == -EAGAIN) {
-		log_debug("S %s R %s adopt_dlm adopt mode %d try other mode",
-			  ls->name, r->name, ld_mode);
-		rv = -EUCLEAN;
-		goto fail;
-	}
-	if (rv < 0) {
-		log_debug("S %s R %s adopt_dlm mode %d flags %x error %d errno %d",
-			  ls->name, r->name, mode, flags, rv, errno);
-		goto fail;
-	}
-
-	/*
-	 * FIXME: For GL/VG locks we probably want to read the lvb,
-	 * especially if adopting an ex lock, because when we
-	 * release this adopted ex lock we may want to write new
-	 * lvb values based on the current lvb values (at lease
-	 * in the GL case where we increment the current values.)
-	 *
-	 * It should be possible to read the lvb by requesting
-	 * this lock in the same mode it's already in.
-	 */
-
-	return rv;
-
- fail:
-	lm_rem_resource_dlm(ls, r);
-	return rv;
-}
-
-/*
- * Use PERSISTENT so that if lvmlockd exits while holding locks,
- * the locks will remain orphaned in the dlm, still protecting what
- * they were acquired to protect.
- */
-
-int lm_lock_dlm(struct lockspace *ls, struct resource *r, int ld_mode,
-		struct val_blk *vb_out, int adopt)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	struct dlm_lksb *lksb;
-	struct val_blk vb;
-	uint32_t flags = 0;
-	int mode;
-	int rv;
-
-	if (adopt) {
-		/* When adopting, we don't follow the normal method
-		   of acquiring a NL lock then converting it to the
-		   desired mode. */
-		return lm_adopt_dlm(ls, r, ld_mode, vb_out);
-	}
-
-	if (!r->lm_init) {
-		rv = lm_add_resource_dlm(ls, r, 1);
-		if (rv < 0)
-			return rv;
-		r->lm_init = 1;
-	}
-
-	lksb = &rdd->lksb;
-
-	flags |= LKF_CONVERT;
-	flags |= LKF_NOQUEUE;
-	flags |= LKF_PERSISTENT;
-
-	if (rdd->vb)
-		flags |= LKF_VALBLK;
-
-	mode = to_dlm_mode(ld_mode);
-	if (mode < 0) {
-		log_error("lock_dlm invalid mode %d", ld_mode);
-		return -EINVAL;
-	}
-
-	log_debug("S %s R %s lock_dlm", ls->name, r->name);
-
-	if (daemon_test) {
-		memset(vb_out, 0, sizeof(struct val_blk));
-		return 0;
-	}
-
-	/*
-	 * The dlm lvb bug means that converting NL->EX will not return 
-	 * the latest lvb, so we have to convert NL->PR->EX to reread it.
-	 */
-	if (dlm_has_lvb_bug && (ld_mode == LD_LK_EX)) {
-		rv = dlm_ls_lock_wait(lmd->dh, LKM_PRMODE, lksb, flags,
-				      r->name, strlen(r->name),
-				      0, NULL, NULL, NULL);
-		if (rv == -1) {
-			log_debug("S %s R %s lock_dlm acquire mode PR for %d rv %d",
-				  ls->name, r->name, mode, rv);
-			goto lockrv;
-		}
-
-		/* Fall through to request EX. */
-	}
-
-	rv = dlm_ls_lock_wait(lmd->dh, mode, lksb, flags,
-			      r->name, strlen(r->name),
-			      0, NULL, NULL, NULL);
-lockrv:
-	if (rv == -1 && errno == EAGAIN) {
-		log_debug("S %s R %s lock_dlm acquire mode %d rv EAGAIN", ls->name, r->name, mode);
-		return -EAGAIN;
-	}
-	if (rv < 0) {
-		log_error("S %s R %s lock_dlm acquire error %d errno %d", ls->name, r->name, rv, errno);
-		return rv;
-	}
-
-	if (rdd->vb) {
-		if (lksb->sb_flags & DLM_SBF_VALNOTVALID) {
-			log_debug("S %s R %s lock_dlm VALNOTVALID", ls->name, r->name);
-			memset(rdd->vb, 0, sizeof(struct val_blk));
-			memset(vb_out, 0, sizeof(struct val_blk));
-			goto out;
-		}
-
-		/*
-		 * 'vb' contains disk endian values, not host endian.
-		 * It is copied directly to rdd->vb which is also kept
-		 * in disk endian form.
-		 * vb_out is returned to the caller in host endian form.
-		 */
-		memcpy(&vb, lksb->sb_lvbptr, sizeof(struct val_blk));
-		memcpy(rdd->vb, &vb, sizeof(vb));
-
-		vb_out->version = le16_to_cpu(vb.version);
-		vb_out->flags = le16_to_cpu(vb.flags);
-		vb_out->r_version = le32_to_cpu(vb.r_version);
-	}
-out:
-	return 0;
-}
-
-int lm_convert_dlm(struct lockspace *ls, struct resource *r,
-		   int ld_mode, uint32_t r_version)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	struct dlm_lksb *lksb = &rdd->lksb;
-	uint32_t mode;
-	uint32_t flags = 0;
-	int rv;
-
-	log_debug("S %s R %s convert_dlm", ls->name, r->name);
-
-	flags |= LKF_CONVERT;
-	flags |= LKF_NOQUEUE;
-	flags |= LKF_PERSISTENT;
-
-	if (rdd->vb && r_version && (r->mode == LD_LK_EX)) {
-		if (!rdd->vb->version) {
-			/* first time vb has been written */
-			rdd->vb->version = cpu_to_le16(VAL_BLK_VERSION);
-		}
-		rdd->vb->r_version = cpu_to_le32(r_version);
-		memcpy(lksb->sb_lvbptr, rdd->vb, sizeof(struct val_blk));
-
-		log_debug("S %s R %s convert_dlm set r_version %u",
-			  ls->name, r->name, r_version);
-
-		flags |= LKF_VALBLK;
-	}
-
-	mode = to_dlm_mode(ld_mode);
-
-	if (daemon_test)
-		return 0;
-
-	rv = dlm_ls_lock_wait(lmd->dh, mode, lksb, flags,
-			      r->name, strlen(r->name),
-			      0, NULL, NULL, NULL);
-	if (rv == -1 && errno == EAGAIN) {
-		/* FIXME: When does this happen?  Should something different be done? */
-		log_error("S %s R %s convert_dlm mode %d rv EAGAIN", ls->name, r->name, mode);
-		return -EAGAIN;
-	}
-	if (rv < 0) {
-		log_error("S %s R %s convert_dlm error %d", ls->name, r->name, rv);
-	}
-	return rv;
-}
-
-int lm_unlock_dlm(struct lockspace *ls, struct resource *r,
-		  uint32_t r_version, uint32_t lmu_flags)
-{
-	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
-	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
-	struct dlm_lksb *lksb = &rdd->lksb;
-	struct val_blk vb_prev;
-	struct val_blk vb_next;
-	uint32_t flags = 0;
-	int new_vb = 0;
-	int rv;
-
-	/*
-	 * Do not set PERSISTENT, because we don't need an orphan
-	 * NL lock to protect anything.
-	 */
-
-	flags |= LKF_CONVERT;
-
-	if (rdd->vb && (r->mode == LD_LK_EX)) {
-
-		/* vb_prev and vb_next are in disk endian form */
-		memcpy(&vb_prev, rdd->vb, sizeof(struct val_blk));
-		memcpy(&vb_next, rdd->vb, sizeof(struct val_blk));
-
-		if (!vb_prev.version) {
-			vb_next.version = cpu_to_le16(VAL_BLK_VERSION);
-			new_vb = 1;
-		}
-
-		if ((lmu_flags & LMUF_FREE_VG) && (r->type == LD_RT_VG)) {
-			vb_next.flags = cpu_to_le16(VBF_REMOVED);
-			new_vb = 1;
-		}
-
-		if (r_version) {
-			vb_next.r_version = cpu_to_le32(r_version);
-			new_vb = 1;
-		}
-
-		if (new_vb) {
-			memcpy(rdd->vb, &vb_next, sizeof(struct val_blk));
-			memcpy(lksb->sb_lvbptr, &vb_next, sizeof(struct val_blk));
-
-			log_debug("S %s R %s unlock_dlm vb old %x %x %u new %x %x %u",
-				  ls->name, r->name,
-				  le16_to_cpu(vb_prev.version),
-				  le16_to_cpu(vb_prev.flags),
-				  le32_to_cpu(vb_prev.r_version),
-				  le16_to_cpu(vb_next.version),
-				  le16_to_cpu(vb_next.flags),
-				  le32_to_cpu(vb_next.r_version));
-		} else {
-			log_debug("S %s R %s unlock_dlm vb unchanged", ls->name, r->name);
-		}
-
-		flags |= LKF_VALBLK;
-	} else {
-		log_debug("S %s R %s unlock_dlm", ls->name, r->name);
-	}
-
-	if (daemon_test)
-		return 0;
-
-	rv = dlm_ls_lock_wait(lmd->dh, LKM_NLMODE, lksb, flags,
-			      r->name, strlen(r->name),
-			      0, NULL, NULL, NULL);
-	if (rv < 0) {
-		log_error("S %s R %s unlock_dlm error %d", ls->name, r->name, rv);
-	}
-
-	return rv;
-}
-
-/*
- * This list could be read from dlm_controld via libdlmcontrol,
- * but it's simpler to get it from sysfs.
- */
-
-#define DLM_LOCKSPACES_PATH "/sys/kernel/config/dlm/cluster/spaces"
-
-/*
- * FIXME: this should be implemented differently.
- * It's not nice to use an aspect of the dlm clustering
- * implementation, which could change.  It would be
- * better to do something like use a special lock in the
- * lockspace that was held PR by all nodes, and then an
- * EX request on it could check if it's started (and
- * possibly also notify others to stop it automatically).
- * Or, possibly an enhancement to libdlm that would give
- * info about lockspace members.
- *
- * (We could let the VG be removed while others still
- * have the lockspace running, which largely works, but
- * introduces problems if another VG with the same name is
- * recreated while others still have the lockspace running
- * for the previous VG.  We'd also want a way to clean up
- * the stale lockspaces on the others eventually.)
- */
-
-int lm_hosts_dlm(struct lockspace *ls, int notify)
-{
-	static const char closedir_err_msg[] = "lm_hosts_dlm: closedir failed";
-	char ls_nodes_path[PATH_MAX];
-	struct dirent *de;
-	DIR *ls_dir;
-	int count = 0;
-
-	memset(ls_nodes_path, 0, sizeof(ls_nodes_path));
-	snprintf(ls_nodes_path, PATH_MAX-1, "%s/%s/nodes",
-		 DLM_LOCKSPACES_PATH, ls->name);
-
-	if (!(ls_dir = opendir(ls_nodes_path)))
-		return -ECONNREFUSED;
-
-	while ((de = readdir(ls_dir))) {
-		if (de->d_name[0] == '.')
-			continue;
-		count++;
-	}
-
-	if (closedir(ls_dir))
-		log_error(closedir_err_msg);
-
-	if (!count) {
-		log_error("lm_hosts_dlm found no nodes in %s", ls_nodes_path);
-		return 0;
-	}
-
-	/*
-	 * Assume that a count of one node represents ourself,
-	 * and any value over one represents other nodes.
-	 */
-
-	return count - 1;
-}
-
-int lm_get_lockspaces_dlm(struct list_head *ls_rejoin)
-{
-	static const char closedir_err_msg[] = "lm_get_lockspace_dlm: closedir failed";
-	struct lockspace *ls;
-	struct dirent *de;
-	DIR *ls_dir;
-
-	if (!(ls_dir = opendir(DLM_LOCKSPACES_PATH)))
-		return -ECONNREFUSED;
-
-	while ((de = readdir(ls_dir))) {
-		if (de->d_name[0] == '.')
-			continue;
-
-		if (strncmp(de->d_name, LVM_LS_PREFIX, strlen(LVM_LS_PREFIX)))
-			continue;
-
-		if (!(ls = alloc_lockspace())) {
-			if (closedir(ls_dir))
-				log_error(closedir_err_msg);
-			return -ENOMEM;
-		}
-
-		ls->lm_type = LD_LM_DLM;
-		strncpy(ls->name, de->d_name, MAX_NAME);
-		strncpy(ls->vg_name, ls->name + strlen(LVM_LS_PREFIX), MAX_NAME);
-		list_add_tail(&ls->list, ls_rejoin);
-	}
-
-	if (closedir(ls_dir))
-		log_error(closedir_err_msg);
-	return 0;
-}
-
-int lm_is_running_dlm(void)
-{
-	char sys_clustername[MAX_ARGS+1];
-	int rv;
-
-	memset(sys_clustername, 0, sizeof(sys_clustername));
-
-	rv = read_cluster_name(sys_clustername);
-	if (rv < 0)
-		return 0;
-	return 1;
-}
-

daemons/lvmlockd/lvmlockd-internal.h

@@ -1,587 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- */
-
-#ifndef _LVM_LVMLOCKD_INTERNAL_H
-#define _LVM_LVMLOCKD_INTERNAL_H
-
-#define MAX_NAME 64
-#define MAX_ARGS 64
-
-#define R_NAME_GL_DISABLED "_GLLK_disabled"
-#define R_NAME_GL          "GLLK"
-#define R_NAME_VG          "VGLK"
-#define S_NAME_GL_DLM      "lvm_global"
-#define LVM_LS_PREFIX      "lvm_"           /* ls name is prefix + vg_name */
-/* global lockspace name for sanlock is a vg name */
-
-/* lock manager types */
-enum {
-	LD_LM_NONE = 0,
-	LD_LM_UNUSED = 1, /* place holder so values match lib/locking/lvmlockd.h */
-	LD_LM_DLM = 2,
-	LD_LM_SANLOCK = 3,
-};
-
-/* operation types */
-enum {
-	LD_OP_HELLO = 1,
-	LD_OP_QUIT,
-	LD_OP_INIT,
-	LD_OP_FREE,
-	LD_OP_START,
-	LD_OP_STOP,
-	LD_OP_LOCK,
-	LD_OP_UPDATE,
-	LD_OP_CLOSE,
-	LD_OP_ENABLE,
-	LD_OP_DISABLE,
-	LD_OP_START_WAIT,
-	LD_OP_STOP_ALL,
-	LD_OP_DUMP_INFO,
-	LD_OP_DUMP_LOG,
-	LD_OP_RENAME_BEFORE,
-	LD_OP_RENAME_FINAL,
-	LD_OP_RUNNING_LM,
-	LD_OP_FIND_FREE_LOCK,
-	LD_OP_KILL_VG,
-	LD_OP_DROP_VG,
-	LD_OP_BUSY,
-};
-
-/* resource types */
-enum {
-	LD_RT_GL = 1,
-	LD_RT_VG,
-	LD_RT_LV,
-};
-
-/* lock modes, more restrictive must be larger value */
-enum {
-	LD_LK_IV = -1,
-	LD_LK_UN = 0,
-	LD_LK_NL = 1,
-	LD_LK_SH = 2,
-	LD_LK_EX = 3,
-};
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-struct client {
-	struct list_head list;
-	pthread_mutex_t mutex;
-	int pid;
-	int fd;
-	int pi;
-	uint32_t id;
-	unsigned int recv : 1;
-	unsigned int dead : 1;
-	unsigned int poll_ignore : 1;
-	unsigned int lock_ops : 1;
-	char name[MAX_NAME+1];
-};
-
-#define LD_AF_PERSISTENT           0x00000001
-#define LD_AF_NO_CLIENT            0x00000002
-#define LD_AF_UNLOCK_CANCEL        0x00000004
-#define LD_AF_NEXT_VERSION         0x00000008
-#define LD_AF_WAIT                 0x00000010
-#define LD_AF_FORCE                0x00000020
-#define LD_AF_EX_DISABLE           0x00000040
-#define LD_AF_ENABLE               0x00000080
-#define LD_AF_DISABLE              0x00000100
-#define LD_AF_SEARCH_LS            0x00000200
-#define LD_AF_WAIT_STARTING        0x00001000
-#define LD_AF_DUP_GL_LS            0x00002000
-#define LD_AF_ADOPT                0x00010000
-#define LD_AF_WARN_GL_REMOVED	   0x00020000
-#define LD_AF_LV_LOCK              0x00040000
-#define LD_AF_LV_UNLOCK            0x00080000
-
-/*
- * Number of times to repeat a lock request after
- * a lock conflict (-EAGAIN) if unspecified in the
- * request.
- */
-#define DEFAULT_MAX_RETRIES 4
-
-struct action {
-	struct list_head list;
-	uint32_t client_id;
-	uint32_t flags;			/* LD_AF_ */
-	uint32_t version;
-	uint64_t host_id;
-	int8_t op;			/* operation type LD_OP_ */
-	int8_t rt;			/* resource type LD_RT_ */
-	int8_t mode;			/* lock mode LD_LK_ */
-	int8_t lm_type;			/* lock manager: LM_DLM, LM_SANLOCK */
-	int retries;
-	int max_retries;
-	int result;
-	int lm_rv;			/* return value from lm_ function */
-	char vg_uuid[64];
-	char vg_name[MAX_NAME+1];
-	char lv_name[MAX_NAME+1];
-	char lv_uuid[MAX_NAME+1];
-	char vg_args[MAX_ARGS+1];
-	char lv_args[MAX_ARGS+1];
-	char vg_sysid[MAX_NAME+1];
-};
-
-struct resource {
-	struct list_head list;		/* lockspace.resources */
-	char name[MAX_NAME+1];		/* vg name or lv name */
-	int8_t type;			/* resource type LD_RT_ */
-	int8_t mode;
-	unsigned int sh_count;		/* number of sh locks on locks list */
-	uint32_t version;
-	uint32_t last_client_id;	/* last client_id to lock or unlock resource */
-	unsigned int lm_init : 1;	/* lm_data is initialized */
-	unsigned int adopt : 1;		/* temp flag in remove_inactive_lvs */
-	unsigned int version_zero_valid : 1;
-	unsigned int use_vb : 1;
-	struct list_head locks;
-	struct list_head actions;
-	char lv_args[MAX_ARGS+1];
-	char lm_data[0];		/* lock manager specific data */
-};
-
-#define LD_LF_PERSISTENT 0x00000001
-
-struct lock {
-	struct list_head list;		/* resource.locks */
-	int8_t mode;			/* lock mode LD_LK_ */
-	uint32_t version;
-	uint32_t flags;			/* LD_LF_ */
-	uint32_t client_id; /* may be 0 for persistent or internal locks */
-};
-
-struct lockspace {
-	struct list_head list;		/* lockspaces */
-	char name[MAX_NAME+1];
-	char vg_name[MAX_NAME+1];
-	char vg_uuid[64];
-	char vg_args[MAX_ARGS+1];	/* lock manager specific args */
-	char vg_sysid[MAX_NAME+1];
-	int8_t lm_type;			/* lock manager: LM_DLM, LM_SANLOCK */
-	void *lm_data;
-	uint64_t host_id;
-	uint64_t free_lock_offset;	/* start search for free lock here */
-
-	uint32_t start_client_id;	/* client_id that started the lockspace */
-	pthread_t thread;		/* makes synchronous lock requests */
-	pthread_cond_t cond;
-	pthread_mutex_t mutex;
-	unsigned int create_fail : 1;
-	unsigned int create_done : 1;
-	unsigned int thread_work : 1;
-	unsigned int thread_stop : 1;
-	unsigned int thread_done : 1;
-	unsigned int sanlock_gl_enabled: 1;
-	unsigned int sanlock_gl_dup: 1;
-	unsigned int free_vg: 1;
-	unsigned int kill_vg: 1;
-	unsigned int drop_vg: 1;
-
-	struct list_head actions;	/* new client actions */
-	struct list_head resources;	/* resource/lock state for gl/vg/lv */
-};
-
-/* val_blk version */
-#define VAL_BLK_VERSION 0x0101
-
-/* val_blk flags */
-#define VBF_REMOVED 0x0001
-
-struct val_blk {
-	uint16_t version;
-	uint16_t flags;
-	uint32_t r_version;
-};
-
-/* lm_unlock flags */
-#define LMUF_FREE_VG 0x00000001
-
-#define container_of(ptr, type, member) ({                      \
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-	(type *)( (char *)__mptr - offsetof(type,member) );})
-
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
-	list->next = list;
-	list->prev = list;
-}
-
-static inline void __list_add(struct list_head *new,
-                              struct list_head *prev,
-                              struct list_head *next)
-{
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
-}
-
-static inline void __list_del(struct list_head *prev, struct list_head *next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head, head->next);
-}
-
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head->prev, head);
-}
-
-static inline void list_del(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-}
-
-static inline int list_empty(const struct list_head *head)
-{
-	return head->next == head;
-}
-
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-
-#define list_first_entry(ptr, type, member) \
-	list_entry((ptr)->next, type, member)
-
-#define list_for_each_entry(pos, head, member)                          \
-	for (pos = list_entry((head)->next, typeof(*pos), member);      \
-	     &pos->member != (head);    \
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-#define list_for_each_entry_safe(pos, n, head, member)                  \
-	for (pos = list_entry((head)->next, typeof(*pos), member),      \
-	     n = list_entry(pos->member.next, typeof(*pos), member); \
-	     &pos->member != (head);                                    \
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-
-/* to improve readability */
-#define WAIT     1
-#define NO_WAIT  0
-#define FORCE    1
-#define NO_FORCE 0
-
-/*
- * global variables
- */
-
-#ifndef EXTERN
-#define EXTERN extern
-#define INIT(X)
-#else
-#undef EXTERN
-#define EXTERN
-#define INIT(X) =X
-#endif
-
-/*
- * gl_type_static and gl_use_ are set by command line or config file
- * to specify whether the global lock comes from dlm or sanlock.
- * Without a static setting, lvmlockd will figure out where the
- * global lock should be (but it could get mixed up in cases where
- * both sanlock and dlm vgs exist.)
- *
- * gl_use_dlm means that the gl should come from lockspace gl_lsname_dlm
- * gl_use_sanlock means that the gl should come from lockspace gl_lsname_sanlock
- *
- * gl_use_dlm has precedence over gl_use_sanlock, so if a node sees both
- * dlm and sanlock vgs, it will use the dlm gl.
- *
- * gl_use_ is set when the first evidence of that lm_type is seen
- * in any command.
- *
- * gl_lsname_sanlock is set when the first vg is seen in which an
- * enabled gl is exists, or when init_vg creates a vg with gl enabled,
- * or when enable_gl is used.
- *
- * gl_lsname_sanlock is cleared when free_vg deletes a vg with gl enabled
- * or when disable_gl matches.
- */
-
-EXTERN int gl_type_static;
-EXTERN int gl_use_dlm;
-EXTERN int gl_use_sanlock;
-EXTERN char gl_lsname_dlm[MAX_NAME+1];
-EXTERN char gl_lsname_sanlock[MAX_NAME+1];
-EXTERN int global_dlm_lockspace_exists;
-
-EXTERN int daemon_test; /* run as much as possible without a live lock manager */
-EXTERN int daemon_debug;
-EXTERN int daemon_host_id;
-EXTERN const char *daemon_host_id_file;
-EXTERN int sanlock_io_timeout;
-
-/*
- * This flag is set to 1 if we see multiple vgs with the global
- * lock enabled.  While this is set, we return a special flag
- * with the vg lock result indicating to the lvm command that
- * there is a duplicate gl in the vg which should be resolved.
- * While this is set, find_lockspace_name has the side job of
- * counting the number of lockspaces with enabled gl's so that
- * this can be set back to zero when the duplicates are disabled.
- */
-EXTERN int sanlock_gl_dup;
-
-void log_level(int level, const char *fmt, ...)  __attribute__((format(printf, 2, 3)));
-#define log_debug(fmt, args...) log_level(LOG_DEBUG, fmt, ##args)
-#define log_error(fmt, args...) log_level(LOG_ERR, fmt, ##args)
-#define log_warn(fmt, args...) log_level(LOG_WARNING, fmt, ##args)
-
-struct lockspace *alloc_lockspace(void);
-int lockspaces_empty(void);
-int last_string_from_args(char *args_in, char *last);
-int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsigned int *patch);
-
-
-#ifdef LOCKDDLM_SUPPORT
-
-int lm_init_vg_dlm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
-int lm_prepare_lockspace_dlm(struct lockspace *ls);
-int lm_add_lockspace_dlm(struct lockspace *ls, int adopt);
-int lm_rem_lockspace_dlm(struct lockspace *ls, int free_vg);
-int lm_lock_dlm(struct lockspace *ls, struct resource *r, int ld_mode,
-		struct val_blk *vb_out, int adopt);
-int lm_convert_dlm(struct lockspace *ls, struct resource *r,
-		   int ld_mode, uint32_t r_version);
-int lm_unlock_dlm(struct lockspace *ls, struct resource *r,
-		  uint32_t r_version, uint32_t lmu_flags);
-int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r);
-int lm_get_lockspaces_dlm(struct list_head *ls_rejoin);
-int lm_data_size_dlm(void);
-int lm_is_running_dlm(void);
-int lm_hosts_dlm(struct lockspace *ls, int notify);
-
-static inline int lm_support_dlm(void)
-{
-	return 1;
-}
-
-#else
-
-static inline int lm_init_vg_dlm(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
-{
-	return -1;
-}
-
-static inline int lm_prepare_lockspace_dlm(struct lockspace *ls)
-{
-	return -1;
-}
-
-static inline int lm_add_lockspace_dlm(struct lockspace *ls, int adopt)
-{
-	return -1;
-}
-
-static inline int lm_rem_lockspace_dlm(struct lockspace *ls, int free_vg)
-{
-	return -1;
-}
-
-static inline int lm_lock_dlm(struct lockspace *ls, struct resource *r, int ld_mode,
-		struct val_blk *vb_out, int adopt)
-{
-	return -1;
-}
-
-static inline int lm_convert_dlm(struct lockspace *ls, struct resource *r,
-		   int ld_mode, uint32_t r_version)
-{
-	return -1;
-}
-
-static inline int lm_unlock_dlm(struct lockspace *ls, struct resource *r,
-		  uint32_t r_version, uint32_t lmu_flags)
-{
-	return -1;
-}
-
-static inline int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r)
-{
-	return -1;
-}
-
-static inline int lm_get_lockspaces_dlm(struct list_head *ls_rejoin)
-{
-	return -1;
-}
-
-static inline int lm_data_size_dlm(void)
-{
-	return -1;
-}
-
-static inline int lm_is_running_dlm(void)
-{
-	return 0;
-}
-
-static inline int lm_support_dlm(void)
-{
-	return 0;
-}
-
-static inline int lm_hosts_dlm(struct lockspace *ls, int notify)
-{
-	return 0;
-}
-
-#endif /* dlm support */
-
-#ifdef LOCKDSANLOCK_SUPPORT
-
-int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
-int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, uint64_t free_offset);
-int lm_free_lv_sanlock(struct lockspace *ls, struct resource *r);
-int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args);
-int lm_prepare_lockspace_sanlock(struct lockspace *ls);
-int lm_add_lockspace_sanlock(struct lockspace *ls, int adopt);
-int lm_rem_lockspace_sanlock(struct lockspace *ls, int free_vg);
-int lm_lock_sanlock(struct lockspace *ls, struct resource *r, int ld_mode,
-		    struct val_blk *vb_out, int *retry, int adopt);
-int lm_convert_sanlock(struct lockspace *ls, struct resource *r,
-		       int ld_mode, uint32_t r_version);
-int lm_unlock_sanlock(struct lockspace *ls, struct resource *r,
-		      uint32_t r_version, uint32_t lmu_flags);
-int lm_able_gl_sanlock(struct lockspace *ls, int enable);
-int lm_ex_disable_gl_sanlock(struct lockspace *ls);
-int lm_hosts_sanlock(struct lockspace *ls, int notify);
-int lm_rem_resource_sanlock(struct lockspace *ls, struct resource *r);
-int lm_gl_is_enabled(struct lockspace *ls);
-int lm_get_lockspaces_sanlock(struct list_head *ls_rejoin);
-int lm_data_size_sanlock(void);
-int lm_is_running_sanlock(void);
-int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset);
-
-static inline int lm_support_sanlock(void)
-{
-	return 1;
-}
-
-#else
-
-static inline int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
-{
-	return -1;
-}
-
-static inline int lm_init_lv_sanlock(char *ls_name, char *vg_name, char *lv_name, char *vg_args, char *lv_args, uint64_t free_offset)
-{
-	return -1;
-}
-
-static inline int lm_free_lv_sanlock(struct lockspace *ls, struct resource *r)
-{
-	return -1;
-}
-
-static inline int lm_rename_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_args)
-{
-	return -1;
-}
-
-static inline int lm_prepare_lockspace_sanlock(struct lockspace *ls)
-{
-	return -1;
-}
-
-static inline int lm_add_lockspace_sanlock(struct lockspace *ls, int adopt)
-{
-	return -1;
-}
-
-static inline int lm_rem_lockspace_sanlock(struct lockspace *ls, int free_vg)
-{
-	return -1;
-}
-
-static inline int lm_lock_sanlock(struct lockspace *ls, struct resource *r, int ld_mode,
-		    struct val_blk *vb_out, int *retry, int adopt)
-{
-	return -1;
-}
-
-static inline int lm_convert_sanlock(struct lockspace *ls, struct resource *r,
-		       int ld_mode, uint32_t r_version)
-{
-	return -1;
-}
-
-static inline int lm_unlock_sanlock(struct lockspace *ls, struct resource *r,
-		      uint32_t r_version, uint32_t lmu_flags)
-{
-	return -1;
-}
-
-static inline int lm_able_gl_sanlock(struct lockspace *ls, int enable)
-{
-	return -1;
-}
-
-static inline int lm_ex_disable_gl_sanlock(struct lockspace *ls)
-{
-	return -1;
-}
-
-static inline int lm_hosts_sanlock(struct lockspace *ls, int notify)
-{
-	return -1;
-}
-
-static inline int lm_rem_resource_sanlock(struct lockspace *ls, struct resource *r)
-{
-	return -1;
-}
-
-static inline int lm_gl_is_enabled(struct lockspace *ls)
-{
-	return -1;
-}
-
-static inline int lm_get_lockspaces_sanlock(struct list_head *ls_rejoin)
-{
-	return -1;
-}
-
-static inline int lm_data_size_sanlock(void)
-{
-	return -1;
-}
-
-static inline int lm_is_running_sanlock(void)
-{
-	return 0;
-}
-
-static inline int lm_find_free_lock_sanlock(struct lockspace *ls, uint64_t *free_offset)
-{
-	return -1;
-}
-
-static inline int lm_support_sanlock(void)
-{
-	return 0;
-}
-
-#endif /* sanlock support */
-
-#endif	/* _LVM_LVMLOCKD_INTERNAL_H */

daemons/lvmpolld/.gitignore

@@ -1 +0,0 @@
-lvmpolld

daemons/lvmpolld/Makefile.in

@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2014-2015 Red Hat, Inc.
-#
-# This file is part of LVM2.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU Lesser General Public License v.2.1.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-
-SOURCES = lvmpolld-core.c lvmpolld-data-utils.c lvmpolld-cmd-utils.c
-
-TARGETS = lvmpolld
-
-.PHONY: install_lvmpolld
-
-CFLOW_LIST = $(SOURCES)
-CFLOW_LIST_TARGET = $(LIB_NAME).cflow
-CFLOW_TARGET = lvmpolld
-
-include $(top_builddir)/make.tmpl
-
-INCLUDES += -I$(top_srcdir)/libdaemon/server
-LVMLIBS = -ldaemonserver $(LVMINTERNAL_LIBS) -ldevmapper
-
-LIBS += $(PTHREAD_LIBS)
-
-LDFLAGS += -L$(top_builddir)/libdaemon/server $(DAEMON_LDFLAGS)
-CLDFLAGS += -L$(top_builddir)/libdaemon/server
-CFLAGS += $(DAEMON_CFLAGS)
-
-lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
-		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LVMLIBS) $(LIBS)
-
-install_lvmpolld: lvmpolld
-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
-
-install_lvm2: install_lvmpolld
-
-install: install_lvm2

daemons/lvmpolld/lvmpolld-cmd-utils.c

@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "lvmpolld-common.h"
-
-/* extract this info from autoconf/automake files */
-#define LVPOLL_CMD "lvpoll"
-
-#define MIN_ARGV_SIZE  8
-
-static const char *const const polling_ops[] = { [PVMOVE] = LVMPD_REQ_PVMOVE,
-						 [CONVERT] = LVMPD_REQ_CONVERT,
-						 [MERGE] = LVMPD_REQ_MERGE,
-						 [MERGE_THIN] = LVMPD_REQ_MERGE_THIN };
-
-const char *polling_op(enum poll_type type)
-{
-	return type < POLL_TYPE_MAX ? polling_ops[type] : "<undefined>";
-}
-
-static int add_to_cmd_arr(const char ***cmdargv, const char *str, unsigned *ind)
-{
-	const char **newargv = *cmdargv;
-
-	if (*ind && !(*ind % MIN_ARGV_SIZE)) {
-		newargv = dm_realloc(*cmdargv, (*ind / MIN_ARGV_SIZE + 1) * MIN_ARGV_SIZE * sizeof(char *));
-		if (!newargv)
-			return 0;
-		*cmdargv = newargv;
-	}
-
-	*(*cmdargv + (*ind)++) = str;
-
-	return 1;
-}
-
-const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary, unsigned abort_polling, unsigned handle_missing_pvs)
-{
-	unsigned i = 0;
-	const char **cmd_argv = dm_malloc(MIN_ARGV_SIZE * sizeof(char *));
-
-	if (!cmd_argv)
-		return NULL;
-
-	/* path to lvm2 binary */
-	if (!add_to_cmd_arr(&cmd_argv, lvm_binary, &i))
-		goto err;
-
-	/* cmd to execute */
-	if (!add_to_cmd_arr(&cmd_argv, LVPOLL_CMD, &i))
-		goto err;
-
-	/* transfer internal polling interval */
-	if (pdlv->sinterval &&
-	    (!add_to_cmd_arr(&cmd_argv, "--interval", &i) ||
-	     !add_to_cmd_arr(&cmd_argv, pdlv->sinterval, &i)))
-		goto err;
-
-	/* pass abort param */
-	if (abort_polling &&
-	    !add_to_cmd_arr(&cmd_argv, "--abort", &i))
-		goto err;
-
-	/* pass handle-missing-pvs. used by mirror polling operation */
-	if (handle_missing_pvs &&
-	    !add_to_cmd_arr(&cmd_argv, "--handlemissingpvs", &i))
-		goto err;
-
-	/* one of: "convert", "pvmove", "merge", "merge_thin" */
-	if (!add_to_cmd_arr(&cmd_argv, "--polloperation", &i) ||
-	    !add_to_cmd_arr(&cmd_argv, polling_ops[pdlv->type], &i))
-		goto err;
-
-	/* vg/lv name */
-	if (!add_to_cmd_arr(&cmd_argv, pdlv->lvname, &i))
-		goto err;
-
-	/* disable metadata backup */
-	if (!add_to_cmd_arr(&cmd_argv, "-An", &i))
-		goto err;
-
-	/* terminating NULL */
-	if (!add_to_cmd_arr(&cmd_argv, NULL, &i))
-		goto err;
-
-	return cmd_argv;
-err:
-	dm_free(cmd_argv);
-	return NULL;
-}
-
-/* FIXME: in fact exclude should be va list */
-static int copy_env(const char ***cmd_envp, unsigned *i, const char *exclude)
-{
-	const char * const* tmp = (const char * const*) environ;
-
-	if (!tmp)
-		return 0;
-
-	while (*tmp) {
-		if (strncmp(*tmp, exclude, strlen(exclude)) && !add_to_cmd_arr(cmd_envp, *tmp, i))
-			return 0;
-		tmp++;
-	}
-
-	return 1;
-}
-
-const char **cmdenvp_ctr(const struct lvmpolld_lv *pdlv)
-{
-	unsigned i = 0;
-	const char **cmd_envp = dm_malloc(MIN_ARGV_SIZE * sizeof(char *));
-
-	if (!cmd_envp)
-		return NULL;
-
-	/* copy whole environment from lvmpolld, exclude LVM_SYSTEM_DIR if set */
-	if (!copy_env(&cmd_envp, &i, "LVM_SYSTEM_DIR="))
-		goto err;
-
-	/* Add per client LVM_SYSTEM_DIR variable if set */
-	if (*pdlv->lvm_system_dir_env && !add_to_cmd_arr(&cmd_envp, pdlv->lvm_system_dir_env, &i))
-		goto err;
-
-	/* terminating NULL */
-	if (!add_to_cmd_arr(&cmd_envp, NULL, &i))
-		goto err;
-
-	return cmd_envp;
-err:
-	dm_free(cmd_envp);
-	return NULL;
-}

daemons/lvmpolld/lvmpolld-cmd-utils.h

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LVM_LVMPOLLD_CMD_UTILS_H
-#define _LVM_LVMPOLLD_CMD_UTILS_H
-
-#include "lvmpolld-data-utils.h"
-
-const char **cmdargv_ctr(const struct lvmpolld_lv *pdlv, const char *lvm_binary, unsigned abort, unsigned handle_missing_pvs);
-const char **cmdenvp_ctr(const struct lvmpolld_lv *pdlv);
-
-const char *polling_op(enum poll_type);
-
-#endif /* _LVM_LVMPOLLD_CMD_UTILS_H */

daemons/lvmpolld/lvmpolld-core.c

@@ -1,999 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "lvmpolld-common.h"
-
-#include "lvm-version.h"
-#include "daemon-server.h"
-#include "daemon-log.h"
-
-#include <getopt.h>
-#include <poll.h>
-#include <wait.h>
-
-#define LVMPOLLD_SOCKET DEFAULT_RUN_DIR "/lvmpolld.socket"
-
-#define PD_LOG_PREFIX "LVMPOLLD"
-#define LVM2_LOG_PREFIX "\tLVPOLL"
-
-/* predefined reason for response = "failed" case */
-#define REASON_REQ_NOT_IMPLEMENTED "request not implemented"
-#define REASON_MISSING_LVID "request requires lvid set"
-#define REASON_MISSING_LVNAME "request requires lvname set"
-#define REASON_MISSING_VGNAME "request requires vgname set"
-#define REASON_POLLING_FAILED "polling of lvm command failed"
-#define REASON_ILLEGAL_ABORT_REQUEST "abort only supported with PVMOVE polling operation"
-#define REASON_DIFFERENT_OPERATION_IN_PROGRESS "Different operation on LV already in progress"
-#define REASON_INVALID_INTERVAL "request requires interval set"
-#define REASON_ENOMEM "not enough memory"
-
-struct lvmpolld_state {
-	daemon_idle *idle;
-	log_state *log;
-	const char *log_config;
-	const char *lvm_binary;
-
-	struct lvmpolld_store *id_to_pdlv_abort;
-	struct lvmpolld_store *id_to_pdlv_poll;
-};
-
-static pthread_key_t key;
-
-static const char *_strerror_r(int errnum, struct lvmpolld_thread_data *data)
-{
-#ifdef _GNU_SOURCE
-	return strerror_r(errnum, data->buf, sizeof(data->buf)); /* never returns NULL */
-#elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
-	return strerror_r(errnum, data->buf, sizeof(data->buf)) ? "" : data->buf;
-#else
-#	warning "Can't decide proper strerror_r implementation. lvmpolld will not issue specific system error messages"
-	return "";
-#endif
-}
-
-static void _usage(const char *prog, FILE *file)
-{
-	fprintf(file, "Usage:\n"
-		"%s [-V] [-h] [-f] [-l {all|wire|debug}] [-s path] [-B path] [-p path] [-t secs]\n"
-		"%s --dump [-s path]\n"
-		"   -V|--version     Show version info\n"
-		"   -h|--help        Show this help information\n"
-		"   -f|--foreground  Don't fork, run in the foreground\n"
-		"   --dump           Dump full lvmpolld state\n"
-		"   -l|--log         Logging message level (-l {all|wire|debug})\n"
-		"   -p|--pidfile     Set path to the pidfile\n"
-		"   -s|--socket      Set path to the communication socket\n"
-		"   -B|--binary      Path to lvm2 binary\n"
-		"   -t|--timeout     Time to wait in seconds before shutdown on idle (missing or 0 = inifinite)\n\n", prog, prog);
-}
-
-static int _init(struct daemon_state *s)
-{
-	struct lvmpolld_state *ls = s->private;
-	ls->log = s->log;
-
-	/*
-	 * log warnings to stderr by default. Otherwise we would miss any lvpoll
-	 * error messages in default configuration
-	 */
-	daemon_log_enable(ls->log, DAEMON_LOG_OUTLET_STDERR, DAEMON_LOG_WARN,  1);
-
-	if (!daemon_log_parse(ls->log, DAEMON_LOG_OUTLET_STDERR, ls->log_config, 1))
-		return 0;
-
-	if (pthread_key_create(&key, lvmpolld_thread_data_destroy)) {
-		FATAL(ls, "%s: %s", PD_LOG_PREFIX, "Failed to create pthread key");
-		return 0;
-	}
-
-	ls->id_to_pdlv_poll = pdst_init("polling");
-	ls->id_to_pdlv_abort = pdst_init("abort");
-
-	if (!ls->id_to_pdlv_poll || !ls->id_to_pdlv_abort) {
-		FATAL(ls, "%s: %s", PD_LOG_PREFIX, "Failed to allocate internal data structures");
-		return 0;
-	}
-
-	ls->lvm_binary = ls->lvm_binary ?: LVM_PATH;
-
-	if (access(ls->lvm_binary, X_OK)) {
-		FATAL(ls, "%s: %s %s", PD_LOG_PREFIX, "Execute access rights denied on", ls->lvm_binary);
-		return 0;
-	}
-
-	if (ls->idle)
-		ls->idle->is_idle = 1;
-
-	return 1;
-}
-
-static void _lvmpolld_stores_lock(struct lvmpolld_state *ls)
-{
-	pdst_lock(ls->id_to_pdlv_poll);
-	pdst_lock(ls->id_to_pdlv_abort);
-}
-
-static void _lvmpolld_stores_unlock(struct lvmpolld_state *ls)
-{
-	pdst_unlock(ls->id_to_pdlv_abort);
-	pdst_unlock(ls->id_to_pdlv_poll);
-}
-
-static void _lvmpolld_global_lock(struct lvmpolld_state *ls)
-{
-	_lvmpolld_stores_lock(ls);
-
-	pdst_locked_lock_all_pdlvs(ls->id_to_pdlv_poll);
-	pdst_locked_lock_all_pdlvs(ls->id_to_pdlv_abort);
-}
-
-static void _lvmpolld_global_unlock(struct lvmpolld_state *ls)
-{
-	pdst_locked_unlock_all_pdlvs(ls->id_to_pdlv_abort);
-	pdst_locked_unlock_all_pdlvs(ls->id_to_pdlv_poll);
-
-	_lvmpolld_stores_unlock(ls);
-}
-
-static int _fini(struct daemon_state *s)
-{
-	int done;
-	const struct timespec t = { .tv_nsec = 250000000 }; /* .25 sec */
-	struct lvmpolld_state *ls = s->private;
-
-	DEBUGLOG(s, "fini");
-
-	DEBUGLOG(s, "sending cancel requests");
-
-	_lvmpolld_global_lock(ls);
-	pdst_locked_send_cancel(ls->id_to_pdlv_poll);
-	pdst_locked_send_cancel(ls->id_to_pdlv_abort);
-	_lvmpolld_global_unlock(ls);
-
-	DEBUGLOG(s, "waiting for background threads to finish");
-
-	while(1) {
-		_lvmpolld_stores_lock(ls);
-		done = !pdst_locked_get_active_count(ls->id_to_pdlv_poll) &&
-		       !pdst_locked_get_active_count(ls->id_to_pdlv_abort);
-		_lvmpolld_stores_unlock(ls);
-		if (done)
-			break;
-		nanosleep(&t, NULL);
-	}
-
-	DEBUGLOG(s, "destroying internal data structures");
-
-	_lvmpolld_stores_lock(ls);
-	pdst_locked_destroy_all_pdlvs(ls->id_to_pdlv_poll);
-	pdst_locked_destroy_all_pdlvs(ls->id_to_pdlv_abort);
-	_lvmpolld_stores_unlock(ls);
-
-	pdst_destroy(ls->id_to_pdlv_poll);
-	pdst_destroy(ls->id_to_pdlv_abort);
-
-	pthread_key_delete(key);
-
-	return 1;
-}
-
-static response reply(const char *res, const char *reason)
-{
-	return daemon_reply_simple(res, "reason = %s", reason, NULL);
-}
-
-static int read_single_line(struct lvmpolld_thread_data *data, int err)
-{
-	ssize_t r = getline(&data->line, &data->line_size, err ? data->ferr : data->fout);
-
-	if (r > 0 && *(data->line + r - 1) == '\n')
-		*(data->line + r - 1) = '\0';
-
-	return (r > 0);
-}
-
-static void update_idle_state(struct lvmpolld_state *ls)
-{
-	if (!ls->idle)
-		return;
-
-	_lvmpolld_stores_lock(ls);
-
-	ls->idle->is_idle = !pdst_locked_get_active_count(ls->id_to_pdlv_poll) &&
-			    !pdst_locked_get_active_count(ls->id_to_pdlv_abort);
-
-	_lvmpolld_stores_unlock(ls);
-
-	DEBUGLOG(ls, "%s: %s %s%s", PD_LOG_PREFIX, "daemon is", ls->idle->is_idle ? "" : "not ", "idle");
-}
-
-/* make this configurable */
-#define MAX_TIMEOUT 2
-
-static int poll_for_output(struct lvmpolld_lv *pdlv, struct lvmpolld_thread_data *data)
-{
-	int ch_stat, r, err = 1, fds_count = 2, timeout = 0;
-	pid_t pid;
-	struct lvmpolld_cmd_stat cmd_state = { .retcode = -1, .signal = 0 };
-	struct pollfd fds[] = { { .fd = data->outpipe[0], .events = POLLIN },
-				{ .fd = data->errpipe[0], .events = POLLIN } };
-
-	if (!(data->fout = fdopen(data->outpipe[0], "r")) || !(data->ferr = fdopen(data->errpipe[0], "r"))) {
-		ERROR(pdlv->ls, "%s: %s: (%d) %s", PD_LOG_PREFIX, "failed to open file stream",
-		      errno, _strerror_r(errno, data));
-		goto out;
-	}
-
-	while (1) {
-		do {
-			r = poll(fds, 2, pdlv_get_timeout(pdlv) * 1000);
-		} while (r < 0 && errno == EINTR);
-
-		DEBUGLOG(pdlv->ls, "%s: %s %d", PD_LOG_PREFIX, "poll() returned", r);
-		if (r < 0) {
-			ERROR(pdlv->ls, "%s: %s (PID %d) failed: (%d) %s",
-			      PD_LOG_PREFIX, "poll() for LVM2 cmd", pdlv->cmd_pid,
-			      errno, _strerror_r(errno, data));
-			goto out;
-		} else if (!r) {
-			timeout++;
-
-			WARN(pdlv->ls, "%s: %s (PID %d) %s", PD_LOG_PREFIX,
-			     "polling for output of the lvm cmd", pdlv->cmd_pid,
-			     "has timed out");
-
-			if (timeout > MAX_TIMEOUT) {
-				ERROR(pdlv->ls, "%s: %s (PID %d) (no output for %d seconds)",
-				      PD_LOG_PREFIX,
-				      "LVM2 cmd is unresponsive too long",
-				      pdlv->cmd_pid,
-				      timeout * pdlv_get_timeout(pdlv));
-				goto out;
-			}
-
-			continue; /* while(1) */
-		}
-
-		timeout = 0;
-
-		/* handle the command's STDOUT */
-		if (fds[0].revents & POLLIN) {
-			DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "caught input data in STDOUT");
-
-			assert(read_single_line(data, 0)); /* may block indef. anyway */
-			INFO(pdlv->ls, "%s: PID %d: %s: '%s'", LVM2_LOG_PREFIX,
-			     pdlv->cmd_pid, "STDOUT", data->line);
-		} else if (fds[0].revents) {
-			if (fds[0].revents & POLLHUP)
-				DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "caught POLLHUP");
-			else
-				WARN(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "poll for command's STDOUT failed");
-
-			fds[0].fd = -1;
-			fds_count--;
-		}
-
-		/* handle the command's STDERR */
-		if (fds[1].revents & POLLIN) {
-			DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX,
-				 "caught input data in STDERR");
-
-			assert(read_single_line(data, 1)); /* may block indef. anyway */
-			WARN(pdlv->ls, "%s: PID %d: %s: '%s'", LVM2_LOG_PREFIX,
-			     pdlv->cmd_pid, "STDERR", data->line);
-		} else if (fds[1].revents) {
-			if (fds[1].revents & POLLHUP)
-				DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "caught err POLLHUP");
-			else
-				WARN(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "poll for command's STDOUT failed");
-
-			fds[1].fd = -1;
-			fds_count--;
-		}
-
-		do {
-			/*
-			 * fds_count == 0 means polling reached EOF
-			 * or received error on both descriptors.
-			 * In such case, just wait for command to finish
-			 */
-			pid = waitpid(pdlv->cmd_pid, &ch_stat, fds_count ? WNOHANG : 0);
-		} while (pid < 0 && errno == EINTR);
-
-		if (pid) {
-			if (pid < 0) {
-				ERROR(pdlv->ls, "%s: %s (PID %d) failed: (%d) %s",
-				      PD_LOG_PREFIX, "waitpid() for lvm2 cmd",
-				      pdlv->cmd_pid, errno,
-				      _strerror_r(errno, data));
-				goto out;
-			}
-			DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "child exited");
-			break;
-		}
-	} /* while(1) */
-
-	DEBUGLOG(pdlv->ls, "%s: %s", PD_LOG_PREFIX, "about to collect remaining lines");
-	if (fds[0].fd >= 0)
-		while (read_single_line(data, 0)) {
-			assert(r > 0);
-			INFO(pdlv->ls, "%s: PID %d: %s: %s", LVM2_LOG_PREFIX, pdlv->cmd_pid, "STDOUT", data->line);
-		}
-	if (fds[1].fd >= 0)
-		while (read_single_line(data, 1)) {
-			assert(r > 0);
-			WARN(pdlv->ls, "%s: PID %d: %s: %s", LVM2_LOG_PREFIX, pdlv->cmd_pid, "STDERR", data->line);
-		}
-
-	if (WIFEXITED(ch_stat)) {
-		cmd_state.retcode = WEXITSTATUS(ch_stat);
-		if (cmd_state.retcode)
-			ERROR(pdlv->ls, "%s: %s (PID %d) %s (retcode: %d)", PD_LOG_PREFIX,
-			     "lvm2 cmd", pdlv->cmd_pid, "failed", cmd_state.retcode);
-		else
-			INFO(pdlv->ls, "%s: %s (PID %d) %s", PD_LOG_PREFIX,
-			     "lvm2 cmd", pdlv->cmd_pid, "finished successfully");
-	} else if (WIFSIGNALED(ch_stat)) {
-		ERROR(pdlv->ls, "%s: %s (PID %d) %s (%d)", PD_LOG_PREFIX,
-		     "lvm2 cmd", pdlv->cmd_pid, "got terminated by signal",
-		     WTERMSIG(ch_stat));
-		cmd_state.signal = WTERMSIG(ch_stat);
-	}
-
-	err = 0;
-out:
-	if (!err)
-		pdlv_set_cmd_state(pdlv, &cmd_state);
-
-	return err;
-}
-
-static void debug_print(struct lvmpolld_state *ls, const char * const* ptr)
-{
-	const char * const* tmp = ptr;
-
-	if (!tmp)
-		return;
-
-	while (*tmp) {
-		DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, *tmp);
-		tmp++;
-	}
-}
-
-static void *fork_and_poll(void *args)
-{
-	int outfd, errfd, state;
-	struct lvmpolld_thread_data *data;
-	pid_t r;
-
-	int error = 1;
-	struct lvmpolld_lv *pdlv = (struct lvmpolld_lv *) args;
-	struct lvmpolld_state *ls = pdlv->ls;
-
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
-	data = lvmpolld_thread_data_constructor(pdlv);
-	pthread_setspecific(key, data);
-	pthread_setcancelstate(state, &state);
-
-	if (!data) {
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "Failed to initialize per-thread data");
-		goto err;
-	}
-
-	DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, "cmd line arguments:");
-	debug_print(ls, pdlv->cmdargv);
-	DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, "---end---");
-
-	DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, "cmd environment variables:");
-	debug_print(ls, pdlv->cmdenvp);
-	DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, "---end---");
-
-	outfd = data->outpipe[1];
-	errfd = data->errpipe[1];
-
-	r = fork();
-	if (!r) {
-		/* child */
-		/* !!! Do not touch any posix thread primitives !!! */
-
-		if ((dup2(outfd, STDOUT_FILENO ) != STDOUT_FILENO) ||
-		    (dup2(errfd, STDERR_FILENO ) != STDERR_FILENO))
-			_exit(LVMPD_RET_DUP_FAILED);
-
-		execve(*(pdlv->cmdargv), (char *const *)pdlv->cmdargv, (char *const *)pdlv->cmdenvp);
-
-		_exit(LVMPD_RET_EXC_FAILED);
-	} else {
-		/* parent */
-		if (r == -1) {
-			ERROR(ls, "%s: %s: (%d) %s", PD_LOG_PREFIX, "fork failed",
-			      errno, _strerror_r(errno, data));
-			goto err;
-		}
-
-		INFO(ls, "%s: LVM2 cmd \"%s\" (PID: %d)", PD_LOG_PREFIX, *(pdlv->cmdargv), r);
-
-		pdlv->cmd_pid = r;
-
-		/* failure to close write end of any pipe will result in broken polling */
-		if (close(data->outpipe[1])) {
-			ERROR(ls, "%s: %s: (%d) %s", PD_LOG_PREFIX, "failed to close write end of pipe",
-			      errno, _strerror_r(errno, data));
-			goto err;
-		}
-		data->outpipe[1] = -1;
-
-		if (close(data->errpipe[1])) {
-			ERROR(ls, "%s: %s: (%d) %s", PD_LOG_PREFIX, "failed to close write end of err pipe",
-			      errno, _strerror_r(errno, data));
-			goto err;
-		}
-		data->errpipe[1] = -1;
-
-		error = poll_for_output(pdlv, data);
-		DEBUGLOG(ls, "%s: %s", PD_LOG_PREFIX, "polling for lvpoll output has finished");
-	}
-
-err:
-	r = 0;
-
-	pdst_lock(pdlv->pdst);
-
-	if (error) {
-		/* last reader is responsible for pdlv cleanup */
-		r = pdlv->cmd_pid;
-		pdlv_set_error(pdlv, 1);
-	}
-
-	pdlv_set_polling_finished(pdlv, 1);
-	if (data)
-		data->pdlv = NULL;
-
-	pdst_locked_dec(pdlv->pdst);
-
-	pdst_unlock(pdlv->pdst);
-
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state);
-	lvmpolld_thread_data_destroy(data);
-	pthread_setspecific(key, NULL);
-	pthread_setcancelstate(state, &state);
-
-	update_idle_state(ls);
-
-	/*
-	 * This is unfortunate case where we
-	 * know nothing about state of lvm cmd and
-	 * (eventually) ongoing progress.
-	 *
-	 * harvest zombies
-	 */
-	if (r)
-		while(waitpid(r, NULL, 0) < 0 && errno == EINTR);
-
-	return NULL;
-}
-
-static response progress_info(client_handle h, struct lvmpolld_state *ls, request req)
-{
-	char *id;
-	struct lvmpolld_lv *pdlv;
-	struct lvmpolld_store *pdst;
-	struct lvmpolld_lv_state st;
-	response r;
-	const char *lvid = daemon_request_str(req, LVMPD_PARM_LVID, NULL);
-	const char *sysdir = daemon_request_str(req, LVMPD_PARM_SYSDIR, NULL);
-	unsigned abort_polling = daemon_request_int(req, LVMPD_PARM_ABORT, 0);
-
-	if (!lvid)
-		return reply(LVMPD_RESP_FAILED, REASON_MISSING_LVID);
-
-	id = construct_id(sysdir, lvid);
-	if (!id) {
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "progress_info request failed to construct ID.");
-		return reply(LVMPD_RESP_FAILED, REASON_ENOMEM);
-	}
-
-	DEBUGLOG(ls, "%s: %s: %s", PD_LOG_PREFIX, "ID", id);
-
-	pdst = abort_polling ? ls->id_to_pdlv_abort : ls->id_to_pdlv_poll;
-
-	pdst_lock(pdst);
-
-	pdlv = pdst_locked_lookup(pdst, id);
-	if (pdlv) {
-		/*
-		 * with store lock held, I'm the only reader accessing the pdlv
-		 */
-		st = pdlv_get_status(pdlv);
-
-		if (st.error || st.polling_finished) {
-			INFO(ls, "%s: %s %s", PD_LOG_PREFIX,
-			     "Polling finished. Removing related data structure for LV",
-			     lvid);
-			pdst_locked_remove(pdst, id);
-			pdlv_destroy(pdlv);
-		}
-	}
-	/* pdlv must not be dereferenced from now on */
-
-	pdst_unlock(pdst);
-
-	dm_free(id);
-
-	if (pdlv) {
-		if (st.error)
-			return reply(LVMPD_RESP_FAILED, REASON_POLLING_FAILED);
-
-		if (st.polling_finished)
-			r = daemon_reply_simple(LVMPD_RESP_FINISHED,
-						"reason = %s", st.cmd_state.signal ? LVMPD_REAS_SIGNAL : LVMPD_REAS_RETCODE,
-						LVMPD_PARM_VALUE " = %d", (int64_t)(st.cmd_state.signal ?: st.cmd_state.retcode),
-						NULL);
-		else
-			r = daemon_reply_simple(LVMPD_RESP_IN_PROGRESS, NULL);
-	}
-	else
-		r = daemon_reply_simple(LVMPD_RESP_NOT_FOUND, NULL);
-
-	return r;
-}
-
-static struct lvmpolld_lv *construct_pdlv(request req, struct lvmpolld_state *ls,
-				     struct lvmpolld_store *pdst,
-				     const char *interval, const char *id,
-				     const char *vgname, const char *lvname,
-				     const char *sysdir, enum poll_type type,
-				     unsigned abort_polling, unsigned uinterval)
-{
-	const char **cmdargv, **cmdenvp;
-	struct lvmpolld_lv *pdlv;
-	unsigned handle_missing_pvs = daemon_request_int(req, LVMPD_PARM_HANDLE_MISSING_PVS, 0);
-
-	pdlv = pdlv_create(ls, id, vgname, lvname, sysdir, type,
-			   interval, uinterval, pdst);
-
-	if (!pdlv) {
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "failed to create internal LV data structure.");
-		return NULL;
-	}
-
-	cmdargv = cmdargv_ctr(pdlv, pdlv->ls->lvm_binary, abort_polling, handle_missing_pvs);
-	if (!cmdargv) {
-		pdlv_destroy(pdlv);
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "failed to construct cmd arguments for lvpoll command");
-		return NULL;
-	}
-
-	pdlv->cmdargv = cmdargv;
-
-	cmdenvp = cmdenvp_ctr(pdlv);
-	if (!cmdenvp) {
-		pdlv_destroy(pdlv);
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "failed to construct cmd environment for lvpoll command");
-		return NULL;
-	}
-
-	pdlv->cmdenvp = cmdenvp;
-
-	return pdlv;
-}
-
-static int spawn_detached_thread(struct lvmpolld_lv *pdlv)
-{
-	int r;
-	pthread_attr_t attr;
-
-	if (pthread_attr_init(&attr) != 0)
-		return 0;
-
-	if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0)
-		return 0;
-
-	r = pthread_create(&pdlv->tid, &attr, fork_and_poll, (void *)pdlv);
-
-	if (pthread_attr_destroy(&attr) != 0)
-		return 0;
-
-	return !r;
-}
-
-static response poll_init(client_handle h, struct lvmpolld_state *ls, request req, enum poll_type type)
-{
-	char *id;
-	struct lvmpolld_lv *pdlv;
-	struct lvmpolld_store *pdst;
-	unsigned uinterval;
-
-	const char *interval = daemon_request_str(req, LVMPD_PARM_INTERVAL, NULL);
-	const char *lvid = daemon_request_str(req, LVMPD_PARM_LVID, NULL);
-	const char *lvname = daemon_request_str(req, LVMPD_PARM_LVNAME, NULL);
-	const char *vgname = daemon_request_str(req, LVMPD_PARM_VGNAME, NULL);
-	const char *sysdir = daemon_request_str(req, LVMPD_PARM_SYSDIR, NULL);
-	unsigned abort_polling = daemon_request_int(req, LVMPD_PARM_ABORT, 0);
-
-	assert(type < POLL_TYPE_MAX);
-
-	if (abort_polling && type != PVMOVE)
-		return reply(LVMPD_RESP_EINVAL, REASON_ILLEGAL_ABORT_REQUEST);
-
-	if (!interval || strpbrk(interval, "-") || sscanf(interval, "%u", &uinterval) != 1)
-		return reply(LVMPD_RESP_EINVAL, REASON_INVALID_INTERVAL);
-
-	if (!lvname)
-		return reply(LVMPD_RESP_FAILED, REASON_MISSING_LVNAME);
-
-	if (!lvid)
-		return reply(LVMPD_RESP_FAILED, REASON_MISSING_LVID);
-
-	if (!vgname)
-		return reply(LVMPD_RESP_FAILED, REASON_MISSING_VGNAME);
-
-	id = construct_id(sysdir, lvid);
-	if (!id) {
-		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "poll_init request failed to construct ID.");
-		return reply(LVMPD_RESP_FAILED, REASON_ENOMEM);
-	}
-
-	DEBUGLOG(ls, "%s: %s=%s", PD_LOG_PREFIX, "ID", id);
-
-	pdst = abort_polling ? ls->id_to_pdlv_abort : ls->id_to_pdlv_poll;
-
-	pdst_lock(pdst);
-
-	pdlv = pdst_locked_lookup(pdst, id);
-	if (pdlv && pdlv_get_polling_finished(pdlv)) {
-		WARN(ls, "%s: %s %s", PD_LOG_PREFIX, "Force removal of uncollected info for LV",
-			 lvid);
-		/* 
-		 * lvmpolld has to remove uncollected results in this case.
-		 * otherwise it would have to refuse request for new polling
-		 * lv with same id.
-		 */
-		pdst_locked_remove(pdst, id);
-		pdlv_destroy(pdlv);
-		pdlv = NULL;
-	}
-
-	if (pdlv) {
-		if (!pdlv_is_type(pdlv, type)) {
-			pdst_unlock(pdst);
-			ERROR(ls, "%s: %s '%s': expected: %s, requested: %s",
-			      PD_LOG_PREFIX, "poll operation type mismatch on LV identified by",
-			      id,
-			      polling_op(pdlv_get_type(pdlv)), polling_op(type));
-			dm_free(id);
-			return reply(LVMPD_RESP_EINVAL,
-				     REASON_DIFFERENT_OPERATION_IN_PROGRESS);
-		}
-		pdlv->init_rq_count++; /* safe. protected by store lock */
-	} else {
-		pdlv = construct_pdlv(req, ls, pdst, interval, id, vgname,
-				      lvname, sysdir, type, abort_polling, 2 * uinterval);
-		if (!pdlv) {
-			pdst_unlock(pdst);
-			dm_free(id);
-			return reply(LVMPD_RESP_FAILED, REASON_ENOMEM);
-		}
-		if (!pdst_locked_insert(pdst, id, pdlv)) {
-			pdlv_destroy(pdlv);
-			pdst_unlock(pdst);
-			ERROR(ls, "%s: %s", PD_LOG_PREFIX, "couldn't store internal LV data structure");
-			dm_free(id);
-			return reply(LVMPD_RESP_FAILED, REASON_ENOMEM);
-		}
-		if (!spawn_detached_thread(pdlv)) {
-			ERROR(ls, "%s: %s", PD_LOG_PREFIX, "failed to spawn detached monitoring thread");
-			pdst_locked_remove(pdst, id);
-			pdlv_destroy(pdlv);
-			pdst_unlock(pdst);
-			dm_free(id);
-			return reply(LVMPD_RESP_FAILED, REASON_ENOMEM);
-		}
-
-		pdst_locked_inc(pdst);
-		if (ls->idle)
-			ls->idle->is_idle = 0;
-	}
-
-	pdst_unlock(pdst);
-
-	dm_free(id);
-
-	return daemon_reply_simple(LVMPD_RESP_OK, NULL);
-}
-
-static response dump_state(client_handle h, struct lvmpolld_state *ls, request r)
-{
-	response res = { 0 };
-	struct buffer *b = &res.buffer;
-
-	buffer_init(b);
-
-	_lvmpolld_global_lock(ls);
-
-	buffer_append(b, "# Registered polling operations\n\n");
-	buffer_append(b, "poll {\n");
-	pdst_locked_dump(ls->id_to_pdlv_poll, b);
-	buffer_append(b, "}\n\n");
-
-	buffer_append(b, "# Registered abort operations\n\n");
-	buffer_append(b, "abort {\n");
-	pdst_locked_dump(ls->id_to_pdlv_abort, b);
-	buffer_append(b, "}");
-
-	_lvmpolld_global_unlock(ls);
-
-	return res;
-}
-
-static response _handler(struct daemon_state s, client_handle h, request r)
-{
-	struct lvmpolld_state *ls = s.private;
-	const char *rq = daemon_request_str(r, "request", "NONE");
-
-	if (!strcmp(rq, LVMPD_REQ_PVMOVE))
-		return poll_init(h, ls, r, PVMOVE);
-	else if (!strcmp(rq, LVMPD_REQ_CONVERT))
-		return poll_init(h, ls, r, CONVERT);
-	else if (!strcmp(rq, LVMPD_REQ_MERGE))
-		return poll_init(h, ls, r, MERGE);
-	else if (!strcmp(rq, LVMPD_REQ_MERGE_THIN))
-		return poll_init(h, ls, r, MERGE_THIN);
-	else if (!strcmp(rq, LVMPD_REQ_PROGRESS))
-		return progress_info(h, ls, r);
-	else if (!strcmp(rq, LVMPD_REQ_DUMP))
-		return dump_state(h, ls, r);
-	else
-		return reply(LVMPD_RESP_EINVAL, REASON_REQ_NOT_IMPLEMENTED);
-}
-
-static int process_timeout_arg(const char *str, unsigned *max_timeouts)
-{
-	char *endptr;
-	unsigned long l;
-
-	errno = 0;
-	l = strtoul(str, &endptr, 10);
-	if (errno || *endptr || l >= UINT_MAX)
-		return 0;
-
-	*max_timeouts = (unsigned) l;
-
-	return 1;
-}
-
-/* Client functionality */
-typedef int (*action_fn_t) (void *args);
-
-struct log_line_baton {
-	const char *prefix;
-};
-
-daemon_handle _lvmpolld = { .error = 0 };
-
-static daemon_handle _lvmpolld_open(const char *socket)
-{
-	daemon_info lvmpolld_info = {
-		.path = "lvmpolld",
-		.socket = socket ?: DEFAULT_RUN_DIR "/lvmpolld.socket",
-		.protocol = LVMPOLLD_PROTOCOL,
-		.protocol_version = LVMPOLLD_PROTOCOL_VERSION
-	};
-
-	return daemon_open(lvmpolld_info);
-}
-
-static void _log_line(const char *line, void *baton) {
-	struct log_line_baton *b = baton;
-	fprintf(stdout, "%s%s\n", b->prefix, line);
-}
-
-static int printout_raw_response(const char *prefix, const char *msg)
-{
-	struct log_line_baton b = { .prefix = prefix };
-	char *buf;
-	char *pos;
-
-	buf = dm_strdup(msg);
-	pos = buf;
-
-	if (!buf)
-		return 0;
-
-	while (pos) {
-		char *next = strchr(pos, '\n');
-		if (next)
-			*next = 0;
-		_log_line(pos, &b);
-		pos = next ? next + 1 : 0;
-	}
-	dm_free(buf);
-
-	return 1;
-}
-
-/* place all action implementations below */
-
-static int action_dump(void *args __attribute__((unused)))
-{
-	daemon_request req;
-	daemon_reply repl;
-	int r = 0;
-
-	req = daemon_request_make(LVMPD_REQ_DUMP);
-	if (!req.cft) {
-		fprintf(stderr, "Failed to create lvmpolld " LVMPD_REQ_DUMP " request.\n");
-		goto out_req;
-	}
-
-	repl = daemon_send(_lvmpolld, req);
-	if (repl.error) {
-		fprintf(stderr, "Failed to send a request or receive response.\n");
-		goto  out_rep;
-	}
-
-	/*
-	 * This is dumb copy & paste from libdaemon log routines.
-	 */
-	if (!printout_raw_response("  ", repl.buffer.mem)) {
-		fprintf(stderr, "Failed to print out the response.\n");
-		goto  out_rep;
-	}
-
-	r = 1;
-
-out_rep:
-	daemon_reply_destroy(repl);
-out_req:
-	daemon_request_destroy(req);
-
-	return r;
-}
-
-enum action_index {
-	ACTION_DUMP = 0,
-	ACTION_MAX /* keep at the end */
-};
-
-static const action_fn_t actions[ACTION_MAX] = { [ACTION_DUMP] = action_dump };
-
-static int _make_action(enum action_index idx, void *args)
-{
-	return idx < ACTION_MAX ? actions[idx](args) : 0;
-}
-
-static int _lvmpolld_client(const char *socket, unsigned action)
-{
-	int r;
-
-	_lvmpolld = _lvmpolld_open(socket);
-
-	if (_lvmpolld.error || _lvmpolld.socket_fd < 0) {
-		fprintf(stderr, "Failed to establish connection with lvmpolld.\n");
-		return 0;
-	}
-
-	r = _make_action(action, NULL);
-
-	daemon_close(_lvmpolld);
-
-	return r ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-static int action_idx = ACTION_MAX;
-static struct option long_options[] = {
-	/* Have actions always at the beginning of the array. */
-	{"dump",	no_argument,		&action_idx,	ACTION_DUMP }, /* or an option_index ? */
-
-	/* other options */
-	{"binary",	required_argument,	0,		'B' },
-	{"foreground",	no_argument,		0,		'f' },
-	{"help",	no_argument,		0,		'h' },
-	{"log",		required_argument,	0,		'l' },
-	{"pidfile",	required_argument,	0,		'p' },
-	{"socket",	required_argument,	0,		's' },
-	{"timeout",	required_argument,	0,		't' },
-	{"version",	no_argument,		0,		'V' },
-	{0,		0,			0,		0 }
-};
-
-int main(int argc, char *argv[])
-{
-	int opt;
-	int option_index = 0;
-	int client = 0, server = 0;
-	unsigned action = ACTION_MAX;
-	struct timeval timeout;
-	daemon_idle di = { .ptimeout = &timeout };
-	struct lvmpolld_state ls = { .log_config = "" };
-	daemon_state s = {
-		.daemon_fini = _fini,
-		.daemon_init = _init,
-		.handler = _handler,
-		.name = "lvmpolld",
-		.pidfile = getenv("LVM_LVMPOLLD_PIDFILE") ?: LVMPOLLD_PIDFILE,
-		.private = &ls,
-		.protocol = LVMPOLLD_PROTOCOL,
-		.protocol_version = LVMPOLLD_PROTOCOL_VERSION,
-		.socket_path = getenv("LVM_LVMPOLLD_SOCKET") ?: LVMPOLLD_SOCKET,
-	};
-
-	while ((opt = getopt_long(argc, argv, "fhVl:p:s:B:t:", long_options, &option_index)) != -1) {
-		switch (opt) {
-		case 0 :
-			if (action < ACTION_MAX) {
-				fprintf(stderr, "Can't perform more actions. Action already requested: %s\n",
-					long_options[action].name);
-				_usage(argv[0], stderr);
-				exit(EXIT_FAILURE);
-			}
-			action = action_idx;
-			client = 1;
-			break;
-		case '?':
-			_usage(argv[0], stderr);
-			exit(EXIT_FAILURE);
-		case 'B': /* --binary */
-			ls.lvm_binary = optarg;
-			server = 1;
-			break;
-		case 'V': /* --version */
-			printf("lvmpolld version: " LVM_VERSION "\n");
-			exit(EXIT_SUCCESS);
-		case 'f': /* --foreground */
-			s.foreground = 1;
-			server = 1;
-			break;
-		case 'h': /* --help */
-			_usage(argv[0], stdout);
-			exit(EXIT_SUCCESS);
-		case 'l': /* --log */
-			ls.log_config = optarg;
-			server = 1;
-			break;
-		case 'p': /* --pidfile */
-			s.pidfile = optarg;
-			server = 1;
-			break;
-		case 's': /* --socket */
-			s.socket_path = optarg;
-			break;
-		case 't': /* --timeout in seconds */
-			if (!process_timeout_arg(optarg, &di.max_timeouts)) {
-				fprintf(stderr, "Invalid value of timeout parameter.\n");
-				exit(EXIT_FAILURE);
-			}
-			/* 0 equals to wait indefinitely */
-			if (di.max_timeouts)
-				s.idle = ls.idle = &di;
-			server = 1;
-			break;
-		}
-	}
-
-	if (client && server) {
-		fprintf(stderr, "Invalid combination of client and server parameters.\n\n");
-		_usage(argv[0], stdout);
-		exit(EXIT_FAILURE);
-	}
-
-	if (client)
-		return _lvmpolld_client(s.socket_path, action);
-
-	/* Server */
-	daemon_start(s);
-
-	return EXIT_SUCCESS;
-}

daemons/lvmpolld/lvmpolld-data-utils.c

@@ -1,391 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "lvmpolld-common.h"
-
-#include "config-util.h"
-
-#include <fcntl.h>
-#include <signal.h>
-
-static char *_construct_full_lvname(const char *vgname, const char *lvname)
-{
-	char *name;
-	size_t l;
-
-	l = strlen(vgname) + strlen(lvname) + 2; /* vg/lv and \0 */
-	name = (char *) dm_malloc(l * sizeof(char));
-	if (!name)
-		return NULL;
-
-	if (dm_snprintf(name, l, "%s/%s", vgname, lvname) < 0) {
-		dm_free(name);
-		name = NULL;
-	}
-
-	return name;
-}
-
-static char *_construct_lvm_system_dir_env(const char *sysdir)
-{
-	/*
-	 *  Store either "LVM_SYSTEM_DIR=/path/to..."
-	 *		    - or -
-	 *  just single char to store NULL byte
-	 */
-	size_t l = sysdir ? strlen(sysdir) + 16 : 1;
-	char *env = (char *) dm_malloc(l * sizeof(char));
-
-	if (!env)
-		return NULL;
-
-	*env = '\0';
-
-	if (sysdir && dm_snprintf(env, l, "LVM_SYSTEM_DIR=%s", sysdir) < 0) {
-		dm_free(env);
-		env = NULL;
-	}
-
-	return env;
-}
-
-static const char *_get_lvid(const char *lvmpolld_id, const char *sysdir)
-{
-	return lvmpolld_id ? (lvmpolld_id + (sysdir ? strlen(sysdir) : 0)) : NULL;
-}
-
-char *construct_id(const char *sysdir, const char *uuid)
-{
-	char *id;
-	int r;
-	size_t l;
-
-	l = strlen(uuid) + (sysdir ? strlen(sysdir) : 0) + 1;
-	id = (char *) dm_malloc(l * sizeof(char));
-	if (!id)
-		return NULL;
-
-	r = sysdir ? dm_snprintf(id, l, "%s%s", sysdir, uuid) :
-		     dm_snprintf(id, l, "%s", uuid);
-
-	if (r < 0) {
-		dm_free(id);
-		id = NULL;
-	}
-
-	return id;
-}
-
-struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
-			   const char *vgname, const char *lvname,
-			   const char *sysdir, enum poll_type type,
-			   const char *sinterval, unsigned pdtimeout,
-			   struct lvmpolld_store *pdst)
-{
-	char *lvmpolld_id = dm_strdup(id), /* copy */
-	     *full_lvname = _construct_full_lvname(vgname, lvname), /* copy */
-	     *lvm_system_dir_env = _construct_lvm_system_dir_env(sysdir); /* copy */
-
-	struct lvmpolld_lv tmp = {
-		.ls = ls,
-		.type = type,
-		.lvmpolld_id = lvmpolld_id,
-		.lvid = _get_lvid(lvmpolld_id, sysdir),
-		.lvname = full_lvname,
-		.lvm_system_dir_env = lvm_system_dir_env,
-		.sinterval = dm_strdup(sinterval), /* copy */
-		.pdtimeout = pdtimeout < MIN_POLLING_TIMEOUT ? MIN_POLLING_TIMEOUT : pdtimeout,
-		.cmd_state = { .retcode = -1, .signal = 0 },
-		.pdst = pdst,
-		.init_rq_count = 1
-	}, *pdlv = (struct lvmpolld_lv *) dm_malloc(sizeof(struct lvmpolld_lv));
-
-	if (!pdlv || !tmp.lvid || !tmp.lvname || !tmp.lvm_system_dir_env || !tmp.sinterval)
-		goto err;
-
-	memcpy(pdlv, &tmp, sizeof(*pdlv));
-
-	if (pthread_mutex_init(&pdlv->lock, NULL))
-		goto err;
-
-	return pdlv;
-
-err:
-	dm_free((void *)full_lvname);
-	dm_free((void *)lvmpolld_id);
-	dm_free((void *)lvm_system_dir_env);
-	dm_free((void *)tmp.sinterval);
-	dm_free((void *)pdlv);
-
-	return NULL;
-}
-
-void pdlv_destroy(struct lvmpolld_lv *pdlv)
-{
-	dm_free((void *)pdlv->lvmpolld_id);
-	dm_free((void *)pdlv->lvname);
-	dm_free((void *)pdlv->sinterval);
-	dm_free((void *)pdlv->lvm_system_dir_env);
-	dm_free((void *)pdlv->cmdargv);
-	dm_free((void *)pdlv->cmdenvp);
-
-	pthread_mutex_destroy(&pdlv->lock);
-
-	dm_free((void *)pdlv);
-}
-
-unsigned pdlv_get_polling_finished(struct lvmpolld_lv *pdlv)
-{
-	unsigned ret;
-
-	pdlv_lock(pdlv);
-	ret = pdlv->polling_finished;
-	pdlv_unlock(pdlv);
-
-	return ret;
-}
-
-struct lvmpolld_lv_state pdlv_get_status(struct lvmpolld_lv *pdlv)
-{
-	struct lvmpolld_lv_state r;
-
-	pdlv_lock(pdlv);
-	r.error = pdlv_locked_error(pdlv);
-	r.polling_finished = pdlv_locked_polling_finished(pdlv);
-	r.cmd_state = pdlv_locked_cmd_state(pdlv);
-	pdlv_unlock(pdlv);
-
-	return r;
-}
-
-void pdlv_set_cmd_state(struct lvmpolld_lv *pdlv, const struct lvmpolld_cmd_stat *cmd_state)
-{
-	pdlv_lock(pdlv);
-	pdlv->cmd_state = *cmd_state;
-	pdlv_unlock(pdlv);
-}
-
-void pdlv_set_error(struct lvmpolld_lv *pdlv, unsigned error)
-{
-	pdlv_lock(pdlv);
-	pdlv->error = error;
-	pdlv_unlock(pdlv);
-}
-
-void pdlv_set_polling_finished(struct lvmpolld_lv *pdlv, unsigned finished)
-{
-	pdlv_lock(pdlv);
-	pdlv->polling_finished = finished;
-	pdlv_unlock(pdlv);
-}
-
-struct lvmpolld_store *pdst_init(const char *name)
-{
-	struct lvmpolld_store *pdst = (struct lvmpolld_store *) dm_malloc(sizeof(struct lvmpolld_store));
-	if (!pdst)
-		return NULL;
-
-	pdst->store = dm_hash_create(32);
-	if (!pdst->store)
-		goto err_hash;
-	if (pthread_mutex_init(&pdst->lock, NULL))
-		goto err_mutex;
-
-	pdst->name = name;
-	pdst->active_polling_count = 0;
-
-	return pdst;
-
-err_mutex:
-	dm_hash_destroy(pdst->store);
-err_hash:
-	dm_free(pdst);
-	return NULL;
-}
-
-void pdst_destroy(struct lvmpolld_store *pdst)
-{
-	if (!pdst)
-		return;
-
-	dm_hash_destroy(pdst->store);
-	pthread_mutex_destroy(&pdst->lock);
-	dm_free(pdst);
-}
-
-void pdst_locked_lock_all_pdlvs(const struct lvmpolld_store *pdst)
-{
-	struct dm_hash_node *n;
-
-	dm_hash_iterate(n, pdst->store)
-		pdlv_lock(dm_hash_get_data(pdst->store, n));
-}
-
-void pdst_locked_unlock_all_pdlvs(const struct lvmpolld_store *pdst)
-{
-	struct dm_hash_node *n;
-
-	dm_hash_iterate(n, pdst->store)
-		pdlv_unlock(dm_hash_get_data(pdst->store, n));
-}
-
-static void _pdlv_locked_dump(struct buffer *buff, const struct lvmpolld_lv *pdlv)
-{
-	char tmp[1024];
-	const struct lvmpolld_cmd_stat *cmd_state = &pdlv->cmd_state;
-
-	/* pdlv-section { */
-	if (dm_snprintf(tmp, sizeof(tmp), "\t%s {\n", pdlv->lvmpolld_id) > 0)
-		buffer_append(buff, tmp);
-
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tlvid=\"%s\"\n", pdlv->lvid) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\ttype=\"%s\"\n", polling_op(pdlv->type)) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tlvname=\"%s\"\n", pdlv->lvname) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tlvmpolld_internal_timeout=%d\n", pdlv->pdtimeout) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tlvm_command_interval=\"%s\"\n", pdlv->sinterval ?: "<undefined>") > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tLVM_SYSTEM_DIR=\"%s\"\n",
-			(*pdlv->lvm_system_dir_env ? (pdlv->lvm_system_dir_env + strlen("LVM_SYSTEM_DIR=")) : "<undefined>")) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tlvm_command_pid=%d\n", pdlv->cmd_pid) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tpolling_finished=%d\n", pdlv->polling_finished) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\terror_occured=%d\n", pdlv->error) > 0)
-		buffer_append(buff, tmp);
-	if (dm_snprintf(tmp, sizeof(tmp), "\t\tinit_requests_count=%d\n", pdlv->init_rq_count) > 0)
-		buffer_append(buff, tmp);
-
-	/* lvm_commmand-section { */
-	buffer_append(buff, "\t\tlvm_command {\n");
-	if (cmd_state->retcode == -1 && !cmd_state->signal)
-		buffer_append(buff, "\t\t\tstate=\"" LVMPD_RESP_IN_PROGRESS "\"\n");
-	else {
-		buffer_append(buff, "\t\t\tstate=\"" LVMPD_RESP_FINISHED "\"\n");
-		if (dm_snprintf(tmp, sizeof(tmp), "\t\t\treason=\"%s\"\n\t\t\tvalue=%d\n",
-				(cmd_state->signal ? LVMPD_REAS_SIGNAL : LVMPD_REAS_RETCODE),
-				(cmd_state->signal ?: cmd_state->retcode)) > 0)
-			buffer_append(buff, tmp);
-	}
-	buffer_append(buff, "\t\t}\n");
-	/* } lvm_commmand-section */
-
-	buffer_append(buff, "\t}\n");
-	/* } pdlv-section */
-}
-
-void pdst_locked_dump(const struct lvmpolld_store *pdst, struct buffer *buff)
-{
-	struct dm_hash_node *n;
-
-	dm_hash_iterate(n, pdst->store)
-		_pdlv_locked_dump(buff, dm_hash_get_data(pdst->store, n));
-}
-
-void pdst_locked_send_cancel(const struct lvmpolld_store *pdst)
-{
-	struct lvmpolld_lv *pdlv;
-	struct dm_hash_node *n;
-
-	dm_hash_iterate(n, pdst->store) {
-		pdlv = dm_hash_get_data(pdst->store, n);
-		if (!pdlv_locked_polling_finished(pdlv))
-			pthread_cancel(pdlv->tid);
-	}
-}
-
-void pdst_locked_destroy_all_pdlvs(const struct lvmpolld_store *pdst)
-{
-	struct dm_hash_node *n;
-
-	dm_hash_iterate(n, pdst->store)
-		pdlv_destroy(dm_hash_get_data(pdst->store, n));
-}
-
-struct lvmpolld_thread_data *lvmpolld_thread_data_constructor(struct lvmpolld_lv *pdlv)
-{
-	struct lvmpolld_thread_data *data = (struct lvmpolld_thread_data *) dm_malloc(sizeof(struct lvmpolld_thread_data));
-	if (!data)
-		return NULL;
-
-	data->pdlv = NULL;
-	data->line = NULL;
-	data->line_size = 0;
-	data->fout = data->ferr = NULL;
-	data->outpipe[0] = data->outpipe[1] = data->errpipe[0] = data->errpipe[1] = -1;
-
-	if (pipe(data->outpipe) || pipe(data->errpipe)) {
-		lvmpolld_thread_data_destroy(data);
-		return NULL;
-	}
-
-	if (fcntl(data->outpipe[0], F_SETFD, FD_CLOEXEC) ||
-	    fcntl(data->outpipe[1], F_SETFD, FD_CLOEXEC) ||
-	    fcntl(data->errpipe[0], F_SETFD, FD_CLOEXEC) ||
-	    fcntl(data->errpipe[1], F_SETFD, FD_CLOEXEC)) {
-		lvmpolld_thread_data_destroy(data);
-		return NULL;
-	}
-
-	data->pdlv = pdlv;
-
-	return data;
-}
-
-void lvmpolld_thread_data_destroy(void *thread_private)
-{
-	struct lvmpolld_thread_data *data = (struct lvmpolld_thread_data *) thread_private;
-	if (!data)
-		return;
-
-	if (data->pdlv) {
-		pdst_lock(data->pdlv->pdst);
-		/*
-		 * FIXME: skip this step if lvmpolld is activated
-		 * 	  by systemd.
-		 */
-		if (!pdlv_get_polling_finished(data->pdlv))
-			kill(data->pdlv->cmd_pid, SIGTERM);
-		pdlv_set_polling_finished(data->pdlv, 1);
-		pdst_locked_dec(data->pdlv->pdst);
-		pdst_unlock(data->pdlv->pdst);
-	}
-
-	/* may get reallocated in getline(). dm_free must not be used */
-	free(data->line);
-
-	if (data->fout && !fclose(data->fout))
-		data->outpipe[0] = -1;
-
-	if (data->ferr && !fclose(data->ferr))
-		data->errpipe[0] = -1;
-
-	if (data->outpipe[0] >= 0)
-		(void) close(data->outpipe[0]);
-
-	if (data->outpipe[1] >= 0)
-		(void) close(data->outpipe[1]);
-
-	if (data->errpipe[0] >= 0)
-		(void) close(data->errpipe[0]);
-
-	if (data->errpipe[1] >= 0)
-		(void) close(data->errpipe[1]);
-
-	dm_free(data);
-}

daemons/lvmpolld/lvmpolld-data-utils.h

@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LVM_LVMPOLLD_DATA_UTILS_H
-#define _LVM_LVMPOLLD_DATA_UTILS_H
-
-#include <pthread.h>
-
-struct buffer;
-struct lvmpolld_state;
-
-enum poll_type {
-	PVMOVE = 0,
-	CONVERT,
-	MERGE,
-	MERGE_THIN,
-	POLL_TYPE_MAX
-};
-
-struct lvmpolld_cmd_stat {
-	int retcode;
-	int signal;
-};
-
-struct lvmpolld_store {
-	pthread_mutex_t lock;
-	void *store;
-	const char *name;
-	unsigned active_polling_count;
-};
-
-struct lvmpolld_lv {
-	/*
-	 * accessing following vars doesn't
-	 * require struct lvmpolld_lv lock
-	 */
-	struct lvmpolld_state *const ls;
-	const enum poll_type type;
-	const char *const lvid;
-	const char *const lvmpolld_id;
-	const char *const lvname; /* full vg/lv name */
-	const unsigned pdtimeout; /* in seconds */
-	const char *const sinterval;
-	const char *const lvm_system_dir_env;
-	struct lvmpolld_store *const pdst;
-	const char *const *cmdargv;
-	const char *const *cmdenvp;
-
-	/* only used by write */
-	pid_t cmd_pid;
-	pthread_t tid;
-
-	pthread_mutex_t lock;
-
-	/* block of shared variables protected by lock */
-	struct lvmpolld_cmd_stat cmd_state;
-	unsigned init_rq_count; /* for debuging purposes only */
-	unsigned polling_finished:1; /* no more updates */
-	unsigned error:1; /* unrecoverable error occured in lvmpolld */
-};
-
-typedef void (*lvmpolld_parse_output_fn_t) (struct lvmpolld_lv *pdlv, const char *line);
-
-/* TODO: replace with configuration option */
-#define MIN_POLLING_TIMEOUT 60
-
-struct lvmpolld_lv_state {
-	unsigned error:1;
-	unsigned polling_finished:1;
-	struct lvmpolld_cmd_stat cmd_state;
-};
-
-struct lvmpolld_thread_data {
-	char *line;
-	size_t line_size;
-	int outpipe[2];
-	int errpipe[2];
-	FILE *fout;
-	FILE *ferr;
-	char buf[1024];
-	struct lvmpolld_lv *pdlv;
-};
-
-char *construct_id(const char *sysdir, const char *lvid);
-
-/* LVMPOLLD_LV_T section */
-
-/* only call with appropriate struct lvmpolld_store lock held */
-struct lvmpolld_lv *pdlv_create(struct lvmpolld_state *ls, const char *id,
-			   const char *vgname, const char *lvname,
-			   const char *sysdir, enum poll_type type,
-			   const char *sinterval, unsigned pdtimeout,
-			   struct lvmpolld_store *pdst);
-
-/* only call with appropriate struct lvmpolld_store lock held */
-void pdlv_destroy(struct lvmpolld_lv *pdlv);
-
-static inline void pdlv_lock(struct lvmpolld_lv *pdlv)
-{
-	pthread_mutex_lock(&pdlv->lock);
-}
-
-static inline void pdlv_unlock(struct lvmpolld_lv *pdlv)
-{
-	pthread_mutex_unlock(&pdlv->lock);
-}
-
-/*
- * no struct lvmpolld_lv lock required section
- */
-static inline int pdlv_is_type(const struct lvmpolld_lv *pdlv, enum poll_type type)
-{
-	return pdlv->type == type;
-}
-
-static inline unsigned pdlv_get_timeout(const struct lvmpolld_lv *pdlv)
-{
-	return pdlv->pdtimeout;
-}
-
-static inline enum poll_type pdlv_get_type(const struct lvmpolld_lv *pdlv)
-{
-	return pdlv->type;
-}
-
-unsigned pdlv_get_polling_finished(struct lvmpolld_lv *pdlv);
-struct lvmpolld_lv_state pdlv_get_status(struct lvmpolld_lv *pdlv);
-void pdlv_set_cmd_state(struct lvmpolld_lv *pdlv, const struct lvmpolld_cmd_stat *cmd_state);
-void pdlv_set_error(struct lvmpolld_lv *pdlv, unsigned error);
-void pdlv_set_polling_finished(struct lvmpolld_lv *pdlv, unsigned finished);
-
-/*
- * struct lvmpolld_lv lock required section
- */
-static inline struct lvmpolld_cmd_stat pdlv_locked_cmd_state(const struct lvmpolld_lv *pdlv)
-{
-	return pdlv->cmd_state;
-}
-
-static inline int pdlv_locked_polling_finished(const struct lvmpolld_lv *pdlv)
-{
-	return pdlv->polling_finished;
-}
-
-static inline unsigned pdlv_locked_error(const struct lvmpolld_lv *pdlv)
-{
-	return pdlv->error;
-}
-
-/* struct lvmpolld_store manipulation routines */
-
-struct lvmpolld_store *pdst_init(const char *name);
-void pdst_destroy(struct lvmpolld_store *pdst);
-
-void pdst_locked_dump(const struct lvmpolld_store *pdst, struct buffer *buff);
-void pdst_locked_lock_all_pdlvs(const struct lvmpolld_store *pdst);
-void pdst_locked_unlock_all_pdlvs(const struct lvmpolld_store *pdst);
-void pdst_locked_destroy_all_pdlvs(const struct lvmpolld_store *pdst);
-void pdst_locked_send_cancel(const struct lvmpolld_store *pdst);
-
-static inline void pdst_lock(struct lvmpolld_store *pdst)
-{
-	pthread_mutex_lock(&pdst->lock);
-}
-
-static inline void pdst_unlock(struct lvmpolld_store *pdst)
-{
-	pthread_mutex_unlock(&pdst->lock);
-}
-
-static inline void pdst_locked_inc(struct lvmpolld_store *pdst)
-{
-	pdst->active_polling_count++;
-}
-
-static inline void pdst_locked_dec(struct lvmpolld_store *pdst)
-{
-	pdst->active_polling_count--;
-}
-
-static inline unsigned pdst_locked_get_active_count(const struct lvmpolld_store *pdst)
-{
-	return pdst->active_polling_count;
-}
-
-static inline int pdst_locked_insert(struct lvmpolld_store *pdst, const char *key, struct lvmpolld_lv *pdlv)
-{
-	return dm_hash_insert(pdst->store, key, pdlv);
-}
-
-static inline struct lvmpolld_lv *pdst_locked_lookup(struct lvmpolld_store *pdst, const char *key)
-{
-	return dm_hash_lookup(pdst->store, key);
-}
-
-static inline void pdst_locked_remove(struct lvmpolld_store *pdst, const char *key)
-{
-	dm_hash_remove(pdst->store, key);
-}
-
-struct lvmpolld_thread_data *lvmpolld_thread_data_constructor(struct lvmpolld_lv *pdlv);
-void lvmpolld_thread_data_destroy(void *thread_private);
-
-#endif /* _LVM_LVMPOLLD_DATA_UTILS_H */

daemons/lvmpolld/lvmpolld-protocol.h

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LVM_LVMPOLLD_PROTOCOL_H
-#define _LVM_LVMPOLLD_PROTOCOL_H
-
-#include "polling_ops.h"
-
-#define LVMPOLLD_PROTOCOL "lvmpolld"
-#define LVMPOLLD_PROTOCOL_VERSION 1
-
-#define LVMPD_REQ_CONVERT	CONVERT_POLL
-#define LVMPD_REQ_DUMP		"dump"
-#define LVMPD_REQ_MERGE		MERGE_POLL
-#define LVMPD_REQ_MERGE_THIN	MERGE_THIN_POLL
-#define LVMPD_REQ_PROGRESS	"progress_info"
-#define LVMPD_REQ_PVMOVE	PVMOVE_POLL
-
-#define LVMPD_PARM_ABORT		"abort"
-#define LVMPD_PARM_HANDLE_MISSING_PVS	"handle_missing_pvs"
-#define LVMPD_PARM_INTERVAL		"interval"
-#define LVMPD_PARM_LVID			"lvid"
-#define LVMPD_PARM_LVNAME		"lvname"
-#define LVMPD_PARM_SYSDIR		"sysdir"
-#define LVMPD_PARM_VALUE		"value" /* either retcode or signal value */
-#define LVMPD_PARM_VGNAME		"vgname"
-
-#define LVMPD_RESP_FAILED	"failed"
-#define LVMPD_RESP_FINISHED	"finished"
-#define LVMPD_RESP_IN_PROGRESS	"in_progress"
-#define LVMPD_RESP_EINVAL	"invalid"
-#define LVMPD_RESP_NOT_FOUND	"not_found"
-#define LVMPD_RESP_OK		"OK"
-
-#define LVMPD_REAS_RETCODE	"retcode" /* lvm cmd ret code */
-#define LVMPD_REAS_SIGNAL	"signal" /* lvm cmd terminating singal */
-
-#define LVMPD_RET_DUP_FAILED	100
-#define LVMPD_RET_EXC_FAILED	101
-
-#endif /* _LVM_LVMPOLLD_PROTOCOL_H */

doc/Makefile.in

@@ -1,4 +1,5 @@
-# Copyright (C) 2013-2014 Red Hat, Inc. All rights reserved.
+#
+# Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -14,11 +15,17 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-SOURCES = cache.c
-
-LIB_SHARED = liblvm2cache.$(LIB_SUFFIX)
-LIB_VERSION = $(LIB_VERSION_LVM)
+CONFSRC=example.conf
+CONFDEST=lvm.conf
 
 include $(top_builddir)/make.tmpl
 
-install: install_lvm2_plugin
+install_lvm2: $(CONFSRC)
+	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+		echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
+		$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
+	fi
+
+install: install_lvm2
+
+DISTCLEAN_TARGETS += $(CONFSRC)

doc/caching_foreign_vgs.txt

@@ -1,86 +0,0 @@
-Q: Why should lvmetad cache foreign VGs?
-A: It's the most useful behavior in the "steady state".
-
-How to arrive at that conclusion.
-Four code configurations to consider, each in two different circumstances.
-
-configurations:
-
-1. lvm not using lvmetad
-2. lvm using lvmetad and lvmlockd
-3. lvm using lvmetad, and lvmetad does not cache foreign VGs
-   (Not currently implemented.)
-4. lvm using lvmetad, and lvmetad caches foreign VGs
-
-circumstances:
-
-A. steady state: PVs are not added or removed to/from foreign VGs
-B. transient state: PVs are added or removed to/from foreign VGs
-
-combinations:
-
-1.A. A PV is correctly shown in the foreign VG.
-1.B. A PV is correctly shown in the foreign VG.
-
-The most accurate representation, at the cost of always scanning disks.
-
-
-2.A. A PV is correctly shown in the foreign VG.
-2.B. A PV is correctly shown in the foreign VG.
-
-The most accurate representation, at the cost of using lvmlockd.
-
-
-3.A. A PV in a foreign VG is shown as unused.
-3.B. A PV in a foreign VG is shown as unused.
-
-If lvmetad ignores foreign VGs and does not cache them, the PVs in the
-foreign VGs appear to be unused.  This largely defeats the purpose of
-system_id, which is meant to treat VGs/PVs as foreign instead of free
-(albeit imperfectly, see below.)
-
-
-4.A. A PV is correctly shown in the foreign VG.
-4.B. A PV is not correctly shown in the foreign VG.
-
-This avoids the cost of always scanning disks, and avoids the cost of
-using lvmlockd.  The steady state 4.A. is an improvement over the steady
-state 3.A.  When the steady state is the common case, this is a big
-advantage.  When the steady state is *not* the common case, the foreign VG
-concept is not as useful (if shared devices are this dynamic, lvmlockd
-should be considered.)
-
-The limitations related to the transient state 4.B. are explained in
-lvmsystemid(7), along with how to handle it.  The specific inaccuracies
-possible in 4.B. are:
-
-. PV is shown as belonging to a foreign VG, but is actually unused.
-. PV is shown as unused, but actually belongs to a foreign VG.
-
-To resolve the inaccuracies in the transient state (4.B.), and return the
-system to an accurate steady state (4.A.), the disks need to be scanned,
-which updates lvmetad.  The scanning/updating is a manual step, i.e.
-running 'pvscan --cache', which by definition scans disks and updates
-lvmetad.
-
---
-
-The --foreign command line option for report/display commands
-(vgs/lvs/pvs/vgdisplay/lvdisplay/pvdisplay) is not directly related to
-whether or not lvmetad caches foreign VGs.
-
-By default, foreign VGs are silently ignored and not printed by these
-commands.  However, when the --foreign option is used, these commands do
-produce output about foreign VGs.
-
-(When --foreign is not used, and the command specifically requests a
-foreign VG by name, an error is produced about not accessing foreign VGs,
-and the foreign VG is not displayed.)
-
-The decision to report/display foreign VGs or not is independent of
-whether lvmetad is caching those VGs.  When lvmetad is caching the foreign
-VG, a report/display command run with --foreign will scan disks to read
-the foreign VG and give the most up to date version of it (the copy of the
-foreign VG in lvmetad may be out of date due to changes to the VG by the
-foreign host.)
-

doc/example.conf.in

@@ -0,0 +1,920 @@
+# This is an example configuration file for the LVM2 system.
+# It contains the default settings that would be used if there was no
+# @DEFAULT_SYS_DIR@/lvm.conf file.
+#
+# Refer to 'man lvm.conf' for further information including the file layout.
+#
+# To put this file in a different directory and override @DEFAULT_SYS_DIR@ set
+# the environment variable LVM_SYSTEM_DIR before running the tools.
+#
+# N.B. Take care that each setting only appears once if uncommenting
+# example settings in this file.
+
+# This section allows you to set the way the configuration settings are handled.
+config {
+
+    # If enabled, any LVM2 configuration mismatch is reported.
+    # This implies checking that the configuration key is understood
+    # by LVM2 and that the value of the key is of a proper type.
+    # If disabled, any configuration mismatch is ignored and default
+    # value is used instead without any warning (a message about the
+    # configuration key not being found is issued in verbose mode only).
+    checks = 1
+
+    # If enabled, any configuration mismatch aborts the LVM2 process.
+    abort_on_errors = 0
+}
+
+# This section allows you to configure which block devices should
+# be used by the LVM system.
+devices {
+
+    # Where do you want your volume groups to appear ?
+    dir = "/dev"
+
+    # An array of directories that contain the device nodes you wish
+    # to use with LVM2.
+    scan = [ "/dev" ]
+
+    # If set, the cache of block device nodes with all associated symlinks
+    # will be constructed out of the existing udev database content.
+    # This avoids using and opening any inapplicable non-block devices or
+    # subdirectories found in the device directory. This setting is applied
+    # to udev-managed device directory only, other directories will be scanned
+    # fully. LVM2 needs to be compiled with udev support for this setting to
+    # take effect. N.B. Any device node or symlink not managed by udev in
+    # udev directory will be ignored with this setting on.
+    obtain_device_list_from_udev = 1
+
+    # If several entries in the scanned directories correspond to the
+    # same block device and the tools need to display a name for device,
+    # all the pathnames are matched against each item in the following
+    # list of regular expressions in turn and the first match is used.
+    preferred_names = [ ]
+
+    # Try to avoid using undescriptive /dev/dm-N names, if present.
+    # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
+
+    # A filter that tells LVM2 to only use a restricted set of devices.
+    # The filter consists of an array of regular expressions.  These
+    # expressions can be delimited by a character of your choice, and
+    # prefixed with either an 'a' (for accept) or 'r' (for reject).
+    # The first expression found to match a device name determines if
+    # the device will be accepted or rejected (ignored).  Devices that
+    # don't match any patterns are accepted.
+
+    # Be careful if there there are symbolic links or multiple filesystem 
+    # entries for the same device as each name is checked separately against
+    # the list of patterns.  The effect is that if the first pattern in the 
+    # list to match a name is an 'a' pattern for any of the names, the device
+    # is accepted; otherwise if the first pattern in the list to match a name
+    # is an 'r' pattern for any of the names it is rejected; otherwise it is
+    # accepted.
+
+    # Don't have more than one filter line active at once: only one gets used.
+
+    # Run vgscan after you change this parameter to ensure that
+    # the cache file gets regenerated (see below).
+    # If it doesn't do what you expect, check the output of 'vgscan -vvvv'.
+
+
+    # By default we accept every block device:
+    filter = [ "a/.*/" ]
+
+    # Exclude the cdrom drive
+    # filter = [ "r|/dev/cdrom|" ]
+
+    # When testing I like to work with just loopback devices:
+    # filter = [ "a/loop/", "r/.*/" ]
+
+    # Or maybe all loops and ide drives except hdc:
+    # filter =[ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ]
+
+    # Use anchors if you want to be really specific
+    # filter = [ "a|^/dev/hda8$|", "r/.*/" ]
+
+    # Since "filter" is often overridden from command line, it is not suitable
+    # for system-wide device filtering (udev rules, lvmetad). To hide devices
+    # from LVM-specific udev processing and/or from lvmetad, you need to set
+    # global_filter. The syntax is the same as for normal "filter"
+    # above. Devices that fail the global_filter are not even opened by LVM.
+
+    # global_filter = []
+
+    # The results of the filtering are cached on disk to avoid
+    # rescanning dud devices (which can take a very long time).
+    # By default this cache is stored in the @DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@ directory
+    # in a file called '.cache'.
+    # It is safe to delete the contents: the tools regenerate it.
+    # (The old setting 'cache' is still respected if neither of
+    # these new ones is present.)
+    # N.B. If obtain_device_list_from_udev is set to 1 the list of
+    # devices is instead obtained from udev and any existing .cache
+    # file is removed.
+    cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@"
+    cache_file_prefix = ""
+
+    # You can turn off writing this cache file by setting this to 0.
+    write_cache_state = 1
+
+    # Advanced settings.
+
+    # List of pairs of additional acceptable block device types found 
+    # in /proc/devices with maximum (non-zero) number of partitions.
+    # types = [ "fd", 16 ]
+
+    # If sysfs is mounted (2.6 kernels) restrict device scanning to 
+    # the block devices it believes are valid.
+    # 1 enables; 0 disables.
+    sysfs_scan = 1
+
+    # By default, LVM2 will ignore devices used as component paths
+    # of device-mapper multipath devices.
+    # 1 enables; 0 disables.
+    multipath_component_detection = 1
+
+    # By default, LVM2 will ignore devices used as components of
+    # software RAID (md) devices by looking for md superblocks.
+    # 1 enables; 0 disables.
+    md_component_detection = 1
+
+    # By default, if a PV is placed directly upon an md device, LVM2
+    # will align its data blocks with the md device's stripe-width.
+    # 1 enables; 0 disables.
+    md_chunk_alignment = 1
+
+    # Default alignment of the start of a data area in MB.  If set to 0,
+    # a value of 64KB will be used.  Set to 1 for 1MiB, 2 for 2MiB, etc.
+    # default_data_alignment = @DEFAULT_DATA_ALIGNMENT@
+
+    # By default, the start of a PV's data area will be a multiple of
+    # the 'minimum_io_size' or 'optimal_io_size' exposed in sysfs.
+    # - minimum_io_size - the smallest request the device can perform
+    #   w/o incurring a read-modify-write penalty (e.g. MD's chunk size)
+    # - optimal_io_size - the device's preferred unit of receiving I/O
+    #   (e.g. MD's stripe width)
+    # minimum_io_size is used if optimal_io_size is undefined (0).
+    # If md_chunk_alignment is enabled, that detects the optimal_io_size.
+    # This setting takes precedence over md_chunk_alignment.
+    # 1 enables; 0 disables.
+    data_alignment_detection = 1
+
+    # Alignment (in KB) of start of data area when creating a new PV.
+    # md_chunk_alignment and data_alignment_detection are disabled if set.
+    # Set to 0 for the default alignment (see: data_alignment_default)
+    # or page size, if larger.
+    data_alignment = 0
+
+    # By default, the start of the PV's aligned data area will be shifted by
+    # the 'alignment_offset' exposed in sysfs.  This offset is often 0 but
+    # may be non-zero; e.g.: certain 4KB sector drives that compensate for
+    # windows partitioning will have an alignment_offset of 3584 bytes
+    # (sector 7 is the lowest aligned logical block, the 4KB sectors start
+    # at LBA -1, and consequently sector 63 is aligned on a 4KB boundary).
+    # But note that pvcreate --dataalignmentoffset will skip this detection.
+    # 1 enables; 0 disables.
+    data_alignment_offset_detection = 1
+
+    # If, while scanning the system for PVs, LVM2 encounters a device-mapper
+    # device that has its I/O suspended, it waits for it to become accessible.
+    # Set this to 1 to skip such devices.  This should only be needed
+    # in recovery situations.
+    ignore_suspended_devices = 0
+
+    # During each LVM operation errors received from each device are counted.
+    # If the counter of a particular device exceeds the limit set here, no
+    # further I/O is sent to that device for the remainder of the respective
+    # operation. Setting the parameter to 0 disables the counters altogether.
+    disable_after_error_count = 0
+
+    # Allow use of pvcreate --uuid without requiring --restorefile.
+    require_restorefile_with_uuid = 1
+
+    # Minimum size (in KB) of block devices which can be used as PVs.
+    # In a clustered environment all nodes must use the same value.
+    # Any value smaller than 512KB is ignored.
+
+    # Ignore devices smaller than 2MB such as floppy drives.
+    pv_min_size = 2048
+
+    # The original built-in setting was 512 up to and including version 2.02.84.
+    # pv_min_size = 512
+
+    # Issue discards to a logical volumes's underlying physical volume(s) when
+    # the logical volume is no longer using the physical volumes' space (e.g.
+    # lvremove, lvreduce, etc).  Discards inform the storage that a region is
+    # no longer in use.  Storage that supports discards advertise the protocol
+    # specific way discards should be issued by the kernel (TRIM, UNMAP, or
+    # WRITE SAME with UNMAP bit set).  Not all storage will support or benefit
+    # from discards but SSDs and thinly provisioned LUNs generally do.  If set
+    # to 1, discards will only be issued if both the storage and kernel provide
+    # support.
+    # 1 enables; 0 disables.
+    issue_discards = 0
+}
+
+# This section allows you to configure the way in which LVM selects
+# free space for its Logical Volumes.
+allocation {
+
+    # When searching for free space to extend an LV, the "cling"
+    # allocation policy will choose space on the same PVs as the last
+    # segment of the existing LV.  If there is insufficient space and a
+    # list of tags is defined here, it will check whether any of them are
+    # attached to the PVs concerned and then seek to match those PV tags
+    # between existing extents and new extents.
+    # Use the special tag "@*" as a wildcard to match any PV tag.
+ 
+    # Example: LVs are mirrored between two sites within a single VG.
+    # PVs are tagged with either @site1 or @site2 to indicate where
+    # they are situated.
+
+    # cling_tag_list = [ "@site1", "@site2" ]
+    # cling_tag_list = [ "@*" ]
+
+    # Changes made in version 2.02.85 extended the reach of the 'cling'
+    # policies to detect more situations where data can be grouped
+    # onto the same disks.  Set this to 0 to revert to the previous
+    # algorithm.
+    maximise_cling = 1
+
+    # Set to 1 to guarantee that mirror logs will always be placed on 
+    # different PVs from the mirror images.  This was the default
+    # until version 2.02.85.
+    mirror_logs_require_separate_pvs = 0
+
+    # Set to 1 to guarantee that thin pool metadata will always
+    # be placed on different PVs from the pool data.
+    thin_pool_metadata_require_separate_pvs = 0
+
+    # Specify the minimal chunk size (in KB) for thin pool volumes.
+    # Use of the larger chunk size may improve perfomance for plain
+    # thin volumes, however using them for snapshot volumes is less efficient,
+    # as it consumes more space and takes extra time for copying.
+    # When unset, lvm tries to estimate chunk size starting from 64KB
+    # Supported values are in range from 64 to 1048576.
+    # thin_pool_chunk_size = 64
+
+    # Specify discards behavior of the thin pool volume.
+    # Select one of  "ignore", "nopassdown", "passdown"
+    # thin_pool_discards = "passdown"
+
+    # Set to 0, to disable zeroing of thin pool data chunks before their
+    # first use.
+    # N.B. zeroing larger thin pool chunk size degrades performance.
+    # thin_pool_zero = 1
+}
+
+# This section that allows you to configure the nature of the
+# information that LVM2 reports.
+log {
+
+    # Controls the messages sent to stdout or stderr.
+    # There are three levels of verbosity, 3 being the most verbose.
+    verbose = 0
+
+    # Set to 1 to suppress all non-essential messages from stdout.
+    # This has the same effect as -qq.
+    # When this is set, the following commands still produce output:
+    # dumpconfig, lvdisplay, lvmdiskscan, lvs, pvck, pvdisplay, 
+    # pvs, version, vgcfgrestore -l, vgdisplay, vgs.
+    # Non-essential messages are shifted from log level 4 to log level 5
+    # for syslog and lvm2_log_fn purposes.
+    # Any 'yes' or 'no' questions not overridden by other arguments
+    # are suppressed and default to 'no'.
+    silent = 0
+
+    # Should we send log messages through syslog?
+    # 1 is yes; 0 is no.
+    syslog = 1
+
+    # Should we log error and debug messages to a file?
+    # By default there is no log file.
+    #file = "/var/log/lvm2.log"
+
+    # Should we overwrite the log file each time the program is run?
+    # By default we append.
+    overwrite = 0
+
+    # What level of log messages should we send to the log file and/or syslog?
+    # There are 6 syslog-like log levels currently in use - 2 to 7 inclusive.
+    # 7 is the most verbose (LOG_DEBUG).
+    level = 0
+
+    # Format of output messages
+    # Whether or not (1 or 0) to indent messages according to their severity
+    indent = 1
+
+    # Whether or not (1 or 0) to display the command name on each line output
+    command_names = 0
+
+    # A prefix to use before the message text (but after the command name,
+    # if selected).  Default is two spaces, so you can see/grep the severity
+    # of each message.
+    prefix = "  "
+
+    # To make the messages look similar to the original LVM tools use:
+    #   indent = 0
+    #   command_names = 1
+    #   prefix = " -- "
+
+    # Set this if you want log messages during activation.
+    # Don't use this in low memory situations (can deadlock).
+    # activation = 0
+
+    # Some debugging messages are assigned to a class and only appear
+    # in debug output if the class is listed here.
+    # Classes currently available:
+    #   memory, devices, activation, allocation, lvmetad, metadata, cache,
+    #   locking
+    # Use "all" to see everything.
+    debug_classes = [ "memory", "devices", "activation", "allocation",
+		      "lvmetad", "metadata", "cache", "locking" ]
+}
+
+# Configuration of metadata backups and archiving.  In LVM2 when we
+# talk about a 'backup' we mean making a copy of the metadata for the
+# *current* system.  The 'archive' contains old metadata configurations.
+# Backups are stored in a human readeable text format.
+backup {
+
+    # Should we maintain a backup of the current metadata configuration ?
+    # Use 1 for Yes; 0 for No.
+    # Think very hard before turning this off!
+    backup = 1
+
+    # Where shall we keep it ?
+    # Remember to back up this directory regularly!
+    backup_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_BACKUP_SUBDIR@"
+
+    # Should we maintain an archive of old metadata configurations.
+    # Use 1 for Yes; 0 for No.
+    # On by default.  Think very hard before turning this off.
+    archive = 1
+
+    # Where should archived files go ?
+    # Remember to back up this directory regularly!
+    archive_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_ARCHIVE_SUBDIR@"
+
+    # What is the minimum number of archive files you wish to keep ?
+    retain_min = 10
+
+    # What is the minimum time you wish to keep an archive file for ?
+    retain_days = 30
+}
+
+# Settings for the running LVM2 in shell (readline) mode.
+shell {
+
+    # Number of lines of history to store in ~/.lvm_history
+    history_size = 100
+}
+
+
+# Miscellaneous global LVM2 settings
+global {
+    # The file creation mask for any files and directories created.
+    # Interpreted as octal if the first digit is zero.
+    umask = 077
+
+    # Allow other users to read the files
+    #umask = 022
+
+    # Enabling test mode means that no changes to the on disk metadata
+    # will be made.  Equivalent to having the -t option on every
+    # command.  Defaults to off.
+    test = 0
+
+    # Default value for --units argument
+    units = "h"
+
+    # Since version 2.02.54, the tools distinguish between powers of
+    # 1024 bytes (e.g. KiB, MiB, GiB) and powers of 1000 bytes (e.g.
+    # KB, MB, GB).
+    # If you have scripts that depend on the old behaviour, set this to 0
+    # temporarily until you update them.
+    si_unit_consistency = 1
+
+    # Whether or not to communicate with the kernel device-mapper.
+    # Set to 0 if you want to use the tools to manipulate LVM metadata 
+    # without activating any logical volumes.
+    # If the device-mapper kernel driver is not present in your kernel
+    # setting this to 0 should suppress the error messages.
+    activation = 1
+
+    # If we can't communicate with device-mapper, should we try running 
+    # the LVM1 tools?
+    # This option only applies to 2.4 kernels and is provided to help you
+    # switch between device-mapper kernels and LVM1 kernels.
+    # The LVM1 tools need to be installed with .lvm1 suffices
+    # e.g. vgscan.lvm1 and they will stop working after you start using
+    # the new lvm2 on-disk metadata format.
+    # The default value is set when the tools are built.
+    # fallback_to_lvm1 = 0
+
+    # The default metadata format that commands should use - "lvm1" or "lvm2".
+    # The command line override is -M1 or -M2.
+    # Defaults to "lvm2".
+    # format = "lvm2"
+
+    # Location of proc filesystem
+    proc = "/proc"
+
+    # Type of locking to use. Defaults to local file-based locking (1).
+    # Turn locking off by setting to 0 (dangerous: risks metadata corruption
+    # if LVM2 commands get run concurrently).
+    # Type 2 uses the external shared library locking_library.
+    # Type 3 uses built-in clustered locking.
+    # Type 4 uses read-only locking which forbids any operations that might 
+    # change metadata.
+    locking_type = 1
+
+    # Set to 0 to fail when a lock request cannot be satisfied immediately.
+    wait_for_locks = 1
+
+    # If using external locking (type 2) and initialisation fails,
+    # with this set to 1 an attempt will be made to use the built-in
+    # clustered locking.
+    # If you are using a customised locking_library you should set this to 0.
+    fallback_to_clustered_locking = 1
+
+    # If an attempt to initialise type 2 or type 3 locking failed, perhaps
+    # because cluster components such as clvmd are not running, with this set
+    # to 1 an attempt will be made to use local file-based locking (type 1).
+    # If this succeeds, only commands against local volume groups will proceed.
+    # Volume Groups marked as clustered will be ignored.
+    fallback_to_local_locking = 1
+
+    # Local non-LV directory that holds file-based locks while commands are
+    # in progress.  A directory like /tmp that may get wiped on reboot is OK.
+    locking_dir = "@DEFAULT_LOCK_DIR@"
+
+    # Whenever there are competing read-only and read-write access requests for
+    # a volume group's metadata, instead of always granting the read-only
+    # requests immediately, delay them to allow the read-write requests to be
+    # serviced.  Without this setting, write access may be stalled by a high
+    # volume of read-only requests.
+    # NB. This option only affects locking_type = 1 viz. local file-based
+    # locking.
+    prioritise_write_locks = 1
+
+    # Other entries can go here to allow you to load shared libraries
+    # e.g. if support for LVM1 metadata was compiled as a shared library use
+    #   format_libraries = "liblvm2format1.so" 
+    # Full pathnames can be given.
+
+    # Search this directory first for shared libraries.
+    #   library_dir = "/lib"
+
+    # The external locking library to load if locking_type is set to 2.
+    #   locking_library = "liblvm2clusterlock.so"
+
+    # Treat any internal errors as fatal errors, aborting the process that
+    # encountered the internal error. Please only enable for debugging.
+    abort_on_internal_errors = 0
+
+    # Check whether CRC is matching when parsed VG is used multiple times.
+    # This is useful to catch unexpected internal cached volume group
+    # structure modification. Please only enable for debugging.
+    detect_internal_vg_cache_corruption = 0
+
+    # If set to 1, no operations that change on-disk metadata will be permitted.
+    # Additionally, read-only commands that encounter metadata in need of repair
+    # will still be allowed to proceed exactly as if the repair had been 
+    # performed (except for the unchanged vg_seqno).
+    # Inappropriate use could mess up your system, so seek advice first!
+    metadata_read_only = 0
+
+    # 'mirror_segtype_default' defines which segtype will be used when the
+    # shorthand '-m' option is used for mirroring.  The possible options are:
+    #
+    # "mirror" - The original RAID1 implementation provided by LVM2/DM.  It is
+    # 	         characterized by a flexible log solution (core, disk, mirrored)
+    #		 and by the necessity to block I/O while reconfiguring in the
+    #		 event of a failure.
+    #
+    #		 There is an inherent race in the dmeventd failure handling
+    #		 logic with snapshots of devices using this type of RAID1 that
+    #		 in the worst case could cause a deadlock.
+    #		   Ref: https://bugzilla.redhat.com/show_bug.cgi?id=817130#c10
+    #
+    # "raid1"  - This implementation leverages MD's RAID1 personality through
+    # 	       	 device-mapper.  It is characterized by a lack of log options.
+    #		 (A log is always allocated for every device and they are placed
+    #		 on the same device as the image - no separate devices are
+    #		 required.)  This mirror implementation does not require I/O
+    #		 to be blocked in the kernel in the event of a failure.
+    #		 This mirror implementation is not cluster-aware and cannot be
+    #		 used in a shared (active/active) fashion in a cluster.
+    #
+    # Specify the '--type <mirror|raid1>' option to override this default
+    # setting.
+    mirror_segtype_default = "mirror"
+
+    # 'raid10_segtype_default' determines the segment types used by default
+    # when the '--stripes/-i' and '--mirrors/-m' arguments are both specified
+    # during the creation of a logical volume.
+    # Possible settings include:
+    #
+    # "raid10" - This implementation leverages MD's RAID10 personality through
+    #            device-mapper.
+    #
+    # "mirror" - LVM will layer the 'mirror' and 'stripe' segment types.  It
+    #            will do this by creating a mirror on top of striped sub-LVs;
+    #            effectively creating a RAID 0+1 array.  This is suboptimal
+    #            in terms of providing redunancy and performance.  Changing to
+    #            this setting is not advised.
+    # Specify the '--type <raid10|mirror>' option to override this default
+    # setting.
+    raid10_segtype_default = "mirror"
+
+    # The default format for displaying LV names in lvdisplay was changed 
+    # in version 2.02.89 to show the LV name and path separately.
+    # Previously this was always shown as /dev/vgname/lvname even when that
+    # was never a valid path in the /dev filesystem.
+    # Set to 1 to reinstate the previous format.
+    #
+    # lvdisplay_shows_full_device_path = 0
+
+    # Whether to use (trust) a running instance of lvmetad. If this is set to
+    # 0, all commands fall back to the usual scanning mechanisms. When set to 1
+    # *and* when lvmetad is running (it is not auto-started), the volume group
+    # metadata and PV state flags are obtained from the lvmetad instance and no
+    # scanning is done by the individual commands. In a setup with lvmetad,
+    # lvmetad udev rules *must* be set up for LVM to work correctly. Without
+    # proper udev rules, all changes in block device configuration will be
+    # *ignored* until a manual 'pvscan --cache' is performed.
+    #
+    # If lvmetad has been running while use_lvmetad was 0, it MUST be stopped
+    # before changing use_lvmetad to 1 and started again afterwards.
+    use_lvmetad = 0
+
+    # Full path of the utility called to check that a thin metadata device
+    # is in a state that allows it to be used.
+    # Each time a thin pool needs to be activated or after it is deactivated
+    # this utility is executed. The activation will only proceed if the utility
+    # has an exit status of 0.
+    # Set to "" to skip this check.  (Not recommended.)
+    # The thin tools are available as part of the device-mapper-persistent-data
+    # package from https://github.com/jthornber/thin-provisioning-tools.
+    #
+    thin_check_executable = "@THIN_CHECK_CMD@"
+
+    # String with options passed with thin_check command. By default,
+    # option '-q' is for quiet output.
+    thin_check_options = [ "-q" ]
+
+    # If set, given features are not used by thin driver.
+    # This can be helpful not just for testing, but i.e. allows to avoid
+    # using problematic implementation of some thin feature.
+    # Features:
+    #   block_size
+    #   discards
+    #   discards_non_power_2
+    #
+    # thin_disabled_features = [ "discards", "block_size" ]
+}
+
+activation {
+    # Set to 1 to perform internal checks on the operations issued to
+    # libdevmapper.  Useful for debugging problems with activation.
+    # Some of the checks may be expensive, so it's best to use this
+    # only when there seems to be a problem.
+    checks = 0
+
+    # Set to 0 to disable udev synchronisation (if compiled into the binaries).
+    # Processes will not wait for notification from udev.
+    # They will continue irrespective of any possible udev processing
+    # in the background.  You should only use this if udev is not running
+    # or has rules that ignore the devices LVM2 creates.
+    # The command line argument --nodevsync takes precedence over this setting.
+    # If set to 1 when udev is not running, and there are LVM2 processes
+    # waiting for udev, run 'dmsetup udevcomplete_all' manually to wake them up.
+    udev_sync = 1
+
+    # Set to 0 to disable the udev rules installed by LVM2 (if built with
+    # --enable-udev_rules). LVM2 will then manage the /dev nodes and symlinks
+    # for active logical volumes directly itself.
+    # N.B. Manual intervention may be required if this setting is changed
+    # while any logical volumes are active.
+    udev_rules = 1
+
+    # Set to 1 for LVM2 to verify operations performed by udev. This turns on
+    # additional checks (and if necessary, repairs) on entries in the device
+    # directory after udev has completed processing its events. 
+    # Useful for diagnosing problems with LVM2/udev interactions.
+    verify_udev_operations = 0
+
+    # If set to 1 and if deactivation of an LV fails, perhaps because
+    # a process run from a quick udev rule temporarily opened the device,
+    # retry the operation for a few seconds before failing.
+    retry_deactivation = 1
+
+    # How to fill in missing stripes if activating an incomplete volume.
+    # Using "error" will make inaccessible parts of the device return
+    # I/O errors on access.  You can instead use a device path, in which 
+    # case, that device will be used to in place of missing stripes.
+    # But note that using anything other than "error" with mirrored 
+    # or snapshotted volumes is likely to result in data corruption.
+    missing_stripe_filler = "error"
+
+    # The linear target is an optimised version of the striped target
+    # that only handles a single stripe.  Set this to 0 to disable this
+    # optimisation and always use the striped target.
+    use_linear_target = 1
+
+    # How much stack (in KB) to reserve for use while devices suspended
+    # Prior to version 2.02.89 this used to be set to 256KB
+    reserved_stack = 64
+
+    # How much memory (in KB) to reserve for use while devices suspended
+    reserved_memory = 8192
+
+    # Nice value used while devices suspended
+    process_priority = -18
+
+    # If volume_list is defined, each LV is only activated if there is a
+    # match against the list.
+    #
+    #   "vgname" and "vgname/lvname" are matched exactly.
+    #   "@tag" matches any tag set in the LV or VG.
+    #   "@*" matches if any tag defined on the host is also set in the LV or VG
+    #
+    # If any host tags exist but volume_list is not defined, a default
+    # single-entry list containing "@*" is assumed.
+    #
+    # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+
+    # If auto_activation_volume_list is defined, each LV that is to be
+    # activated with the autoactivation option (--activate ay/-a ay) is
+    # first checked against the list. There are two scenarios in which
+    # the autoactivation option is used:
+    #
+    #   - automatic activation of volumes based on incoming PVs. If all the
+    #     PVs making up a VG are present in the system, the autoactivation
+    #     is triggered. This requires lvmetad (global/use_lvmetad=1) and udev
+    #     to be running. In this case, "pvscan --cache -aay" is called
+    #     automatically without any user intervention while processing
+    #     udev events. Please, make sure you define auto_activation_volume_list
+    #     properly so only the volumes you want and expect are autoactivated.
+    #
+    #   - direct activation on command line with the autoactivation option.
+    #     In this case, the user calls "vgchange --activate ay/-a ay" or
+    #     "lvchange --activate ay/-a ay" directly.
+    #
+    # By default, the auto_activation_volume_list is not defined and all
+    # volumes will be activated either automatically or by using --activate ay/-a ay.
+    #
+    # N.B. The "activation/volume_list" is still honoured in all cases so even
+    # if the VG/LV passes the auto_activation_volume_list, it still needs to
+    # pass the volume_list for it to be activated in the end.
+
+    # If auto_activation_volume_list is defined but empty, no volumes will be
+    # activated automatically and --activate ay/-a ay will do nothing.
+    #
+    # auto_activation_volume_list = []
+
+    # If auto_activation_volume_list is defined and it's not empty, only matching
+    # volumes will be activated either automatically or by using --activate ay/-a ay.
+    #
+    #   "vgname" and "vgname/lvname" are matched exactly.
+    #   "@tag" matches any tag set in the LV or VG.
+    #   "@*" matches if any tag defined on the host is also set in the LV or VG
+    #
+    # auto_activation_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+
+    # If read_only_volume_list is defined, each LV that is to be activated 
+    # is checked against the list, and if it matches, it as activated
+    # in read-only mode.  (This overrides '--permission rw' stored in the
+    # metadata.)
+    #
+    #   "vgname" and "vgname/lvname" are matched exactly.
+    #   "@tag" matches any tag set in the LV or VG.
+    #   "@*" matches if any tag defined on the host is also set in the LV or VG
+    #
+    # read_only_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+
+    # For RAID or 'mirror' segment types, 'raid_region_size' is the
+    # size (in kiB) of each:
+    # - synchronization operation when initializing
+    # - each copy operation when performing a 'pvmove' (using 'mirror' segtype)
+    # This setting has replaced 'mirror_region_size' since version 2.02.99
+    raid_region_size = 512
+
+    # Setting to use when there is no readahead value stored in the metadata.
+    #
+    # "none" - Disable readahead.
+    # "auto" - Use default value chosen by kernel.
+    readahead = "auto"
+
+    # 'raid_fault_policy' defines how a device failure in a RAID logical
+    # volume is handled.  This includes logical volumes that have the following
+    # segment types: raid1, raid4, raid5*, and raid6*.
+    #
+    # In the event of a failure, the following policies will determine what
+    # actions are performed during the automated response to failures (when
+    # dmeventd is monitoring the RAID logical volume) and when 'lvconvert' is
+    # called manually with the options '--repair' and '--use-policies'.
+    #
+    # "warn"	- Use the system log to warn the user that a device in the RAID
+    # 		  logical volume has failed.  It is left to the user to run
+    #		  'lvconvert --repair' manually to remove or replace the failed
+    #		  device.  As long as the number of failed devices does not
+    #		  exceed the redundancy of the logical volume (1 device for
+    #		  raid4/5, 2 for raid6, etc) the logical volume will remain
+    #		  usable.
+    #
+    # "allocate" - Attempt to use any extra physical volumes in the volume
+    # 		  group as spares and replace faulty devices.
+    #
+    raid_fault_policy = "warn"
+
+    # 'mirror_image_fault_policy' and 'mirror_log_fault_policy' define
+    # how a device failure affecting a mirror (of "mirror" segment type) is
+    # handled.  A mirror is composed of mirror images (copies) and a log.
+    # A disk log ensures that a mirror does not need to be re-synced
+    # (all copies made the same) every time a machine reboots or crashes.
+    #
+    # In the event of a failure, the specified policy will be used to determine
+    # what happens. This applies to automatic repairs (when the mirror is being
+    # monitored by dmeventd) and to manual lvconvert --repair when
+    # --use-policies is given.
+    #
+    # "remove" - Simply remove the faulty device and run without it.  If
+    #            the log device fails, the mirror would convert to using
+    #            an in-memory log.  This means the mirror will not
+    #            remember its sync status across crashes/reboots and
+    #            the entire mirror will be re-synced.  If a
+    #            mirror image fails, the mirror will convert to a
+    #            non-mirrored device if there is only one remaining good
+    #            copy.
+    #
+    # "allocate" - Remove the faulty device and try to allocate space on
+    #            a new device to be a replacement for the failed device.
+    #            Using this policy for the log is fast and maintains the
+    #            ability to remember sync state through crashes/reboots.
+    #            Using this policy for a mirror device is slow, as it
+    #            requires the mirror to resynchronize the devices, but it
+    #            will preserve the mirror characteristic of the device.
+    #            This policy acts like "remove" if no suitable device and
+    #            space can be allocated for the replacement.
+    #
+    # "allocate_anywhere" - Not yet implemented. Useful to place the log device
+    #            temporarily on same physical volume as one of the mirror
+    #            images. This policy is not recommended for mirror devices
+    #            since it would break the redundant nature of the mirror. This
+    #            policy acts like "remove" if no suitable device and space can
+    #            be allocated for the replacement.
+
+    mirror_log_fault_policy = "allocate"
+    mirror_image_fault_policy = "remove"
+
+    # 'snapshot_autoextend_threshold' and 'snapshot_autoextend_percent' define
+    # how to handle automatic snapshot extension. The former defines when the
+    # snapshot should be extended: when its space usage exceeds this many
+    # percent. The latter defines how much extra space should be allocated for
+    # the snapshot, in percent of its current size.
+    #
+    # For example, if you set snapshot_autoextend_threshold to 70 and
+    # snapshot_autoextend_percent to 20, whenever a snapshot exceeds 70% usage,
+    # it will be extended by another 20%. For a 1G snapshot, using up 700M will
+    # trigger a resize to 1.2G. When the usage exceeds 840M, the snapshot will
+    # be extended to 1.44G, and so on.
+    #
+    # Setting snapshot_autoextend_threshold to 100 disables automatic
+    # extensions. The minimum value is 50 (A setting below 50 will be treated
+    # as 50).
+
+    snapshot_autoextend_threshold = 100
+    snapshot_autoextend_percent = 20
+
+    # 'thin_pool_autoextend_threshold' and 'thin_pool_autoextend_percent' define
+    # how to handle automatic pool extension. The former defines when the
+    # pool should be extended: when its space usage exceeds this many
+    # percent. The latter defines how much extra space should be allocated for
+    # the pool, in percent of its current size.
+    #
+    # For example, if you set thin_pool_autoextend_threshold to 70 and
+    # thin_pool_autoextend_percent to 20, whenever a pool exceeds 70% usage,
+    # it will be extended by another 20%. For a 1G pool, using up 700M will
+    # trigger a resize to 1.2G. When the usage exceeds 840M, the pool will
+    # be extended to 1.44G, and so on.
+    #
+    # Setting thin_pool_autoextend_threshold to 100 disables automatic
+    # extensions. The minimum value is 50 (A setting below 50 will be treated
+    # as 50).
+
+    thin_pool_autoextend_threshold = 100
+    thin_pool_autoextend_percent = 20
+
+    # While activating devices, I/O to devices being (re)configured is
+    # suspended, and as a precaution against deadlocks, LVM2 needs to pin
+    # any memory it is using so it is not paged out.  Groups of pages that
+    # are known not to be accessed during activation need not be pinned
+    # into memory.  Each string listed in this setting is compared against
+    # each line in /proc/self/maps, and the pages corresponding to any
+    # lines that match are not pinned.  On some systems locale-archive was
+    # found to make up over 80% of the memory used by the process.
+    # mlock_filter = [ "locale/locale-archive", "gconv/gconv-modules.cache" ]
+
+    # Set to 1 to revert to the default behaviour prior to version 2.02.62
+    # which used mlockall() to pin the whole process's memory while activating
+    # devices.
+    use_mlockall = 0
+
+    # Monitoring is enabled by default when activating logical volumes.
+    # Set to 0 to disable monitoring or use the --ignoremonitoring option.
+    monitoring = 1
+
+    # When pvmove or lvconvert must wait for the kernel to finish
+    # synchronising or merging data, they check and report progress
+    # at intervals of this number of seconds.  The default is 15 seconds.
+    # If this is set to 0 and there is only one thing to wait for, there
+    # are no progress reports, but the process is awoken immediately the
+    # operation is complete.
+    polling_interval = 15
+}
+
+
+####################
+# Advanced section #
+####################
+
+# Metadata settings
+#
+# metadata {
+    # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
+    # You might want to override it from the command line with 0 
+    # when running pvcreate on new PVs which are to be added to large VGs.
+
+    # pvmetadatacopies = 1
+
+    # Default number of copies of metadata to maintain for each VG.
+    # If set to a non-zero value, LVM automatically chooses which of
+    # the available metadata areas to use to achieve the requested
+    # number of copies of the VG metadata.  If you set a value larger
+    # than the the total number of metadata areas available then
+    # metadata is stored in them all.
+    # The default value of 0 ("unmanaged") disables this automatic
+    # management and allows you to control which metadata areas
+    # are used at the individual PV level using 'pvchange
+    # --metadataignore y/n'.
+
+    # vgmetadatacopies = 0
+
+    # Approximate default size of on-disk metadata areas in sectors.
+    # You should increase this if you have large volume groups or
+    # you want to retain a large on-disk history of your metadata changes.
+
+    # pvmetadatasize = 255
+
+    # List of directories holding live copies of text format metadata.
+    # These directories must not be on logical volumes!
+    # It's possible to use LVM2 with a couple of directories here,
+    # preferably on different (non-LV) filesystems, and with no other 
+    # on-disk metadata (pvmetadatacopies = 0). Or this can be in
+    # addition to on-disk metadata areas.
+    # The feature was originally added to simplify testing and is not
+    # supported under low memory situations - the machine could lock up.
+    #
+    # Never edit any files in these directories by hand unless you
+    # you are absolutely sure you know what you are doing! Use
+    # the supplied toolset to make changes (e.g. vgcfgrestore).
+
+    # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
+#}
+
+# Event daemon
+#
+dmeventd {
+    # mirror_library is the library used when monitoring a mirror device.
+    #
+    # "libdevmapper-event-lvm2mirror.so" attempts to recover from
+    # failures.  It removes failed devices from a volume group and
+    # reconfigures a mirror as necessary. If no mirror library is
+    # provided, mirrors are not monitored through dmeventd.
+
+    mirror_library = "libdevmapper-event-lvm2mirror.so"
+
+    # snapshot_library is the library used when monitoring a snapshot device.
+    #
+    # "libdevmapper-event-lvm2snapshot.so" monitors the filling of
+    # snapshots and emits a warning through syslog when the use of
+    # the snapshot exceeds 80%. The warning is repeated when 85%, 90% and
+    # 95% of the snapshot is filled.
+
+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+
+    # thin_library is the library used when monitoring a thin device.
+    #
+    # "libdevmapper-event-lvm2thin.so" monitors the filling of
+    # pool and emits a warning through syslog when the use of
+    # the pool exceeds 80%. The warning is repeated when 85%, 90% and
+    # 95% of the pool is filled.
+
+    thin_library = "libdevmapper-event-lvm2thin.so"
+
+    # Full path of the dmeventd binary.
+    #
+    # executable = "@DMEVENTD_PATH@"
+}

doc/kernel/cache-policies.txt

@@ -30,48 +30,28 @@ multiqueue
 
 This policy is the default.
 
-The multiqueue policy has three sets of 16 queues: one set for entries
-waiting for the cache and another two for those in the cache (a set for
-clean entries and a set for dirty entries).
-
+The multiqueue policy has two sets of 16 queues: one set for entries
+waiting for the cache and another one for those in the cache.
 Cache entries in the queues are aged based on logical time. Entry into
 the cache is based on variable thresholds and queue selection is based
 on hit count on entry. The policy aims to take different cache miss
 costs into account and to adjust to varying load patterns automatically.
 
 Message and constructor argument pairs are:
-	'sequential_threshold <#nr_sequential_ios>'
-	'random_threshold <#nr_random_ios>'
-	'read_promote_adjustment <value>'
-	'write_promote_adjustment <value>'
-	'discard_promote_adjustment <value>'
+	'sequential_threshold <#nr_sequential_ios>' and
+	'random_threshold <#nr_random_ios>'.
 
 The sequential threshold indicates the number of contiguous I/Os
-required before a stream is treated as sequential.  Once a stream is
-considered sequential it will bypass the cache.  The random threshold
+required before a stream is treated as sequential.  The random threshold
 is the number of intervening non-contiguous I/Os that must be seen
 before the stream is treated as random again.
 
 The sequential and random thresholds default to 512 and 4 respectively.
 
-Large, sequential I/Os are probably better left on the origin device
-since spindles tend to have good sequential I/O bandwidth.  The
-io_tracker counts contiguous I/Os to try to spot when the I/O is in one
-of these sequential modes.  But there are use-cases for wanting to
-promote sequential blocks to the cache (e.g. fast application startup).
-If sequential threshold is set to 0 the sequential I/O detection is
-disabled and sequential I/O will no longer implicitly bypass the cache.
-Setting the random threshold to 0 does _not_ disable the random I/O
-stream detection.
-
-Internally the mq policy determines a promotion threshold.  If the hit
-count of a block not in the cache goes above this threshold it gets
-promoted to the cache.  The read, write and discard promote adjustment
-tunables allow you to tweak the promotion threshold by adding a small
-value based on the io type.  They default to 4, 8 and 1 respectively.
-If you're trying to quickly warm a new cache device you may wish to
-reduce these to encourage promotion.  Remember to switch them back to
-their defaults after the cache fills though.
+Large, sequential ios are probably better left on the origin device
+since spindles tend to have good bandwidth. The io_tracker counts
+contiguous I/Os to try to spot when the io is in one of these sequential
+modes.
 
 cleaner
 -------

doc/kernel/cache.txt

@@ -50,16 +50,14 @@ other parameters detailed later):
    which are dirty, and extra hints for use by the policy object.
    This information could be put on the cache device, but having it
    separate allows the volume manager to configure it differently,
-   e.g. as a mirror for extra robustness.  This metadata device may only
-   be used by a single cache device.
+   e.g. as a mirror for extra robustness.
 
 Fixed block size
 ----------------
 
 The origin is divided up into blocks of a fixed size.  This block size
 is configurable when you first create the cache.  Typically we've been
-using block sizes of 256KB - 1024KB.  The block size must be between 64
-(32KB) and 2097152 (1GB) and a multiple of 64 (32KB).
+using block sizes of 256k - 1024k.
 
 Having a fixed block size simplifies the target a lot.  But it is
 something of a compromise.  For instance, a small part of a block may be
@@ -68,11 +66,10 @@ So large block sizes are bad because they waste cache space.  And small
 block sizes are bad because they increase the amount of metadata (both
 in core and on disk).
 
-Cache operating modes
----------------------
+Writeback/writethrough
+----------------------
 
-The cache has three operating modes: writeback, writethrough and
-passthrough.
+The cache has two modes, writeback and writethrough.
 
 If writeback, the default, is selected then a write to a block that is
 cached will go only to the cache and the block will be marked dirty in
@@ -82,38 +79,15 @@ If writethrough is selected then a write to a cached block will not
 complete until it has hit both the origin and cache devices.  Clean
 blocks should remain clean.
 
-If passthrough is selected, useful when the cache contents are not known
-to be coherent with the origin device, then all reads are served from
-the origin device (all reads miss the cache) and all writes are
-forwarded to the origin device; additionally, write hits cause cache
-block invalidates.  To enable passthrough mode the cache must be clean.
-Passthrough mode allows a cache device to be activated without having to
-worry about coherency.  Coherency that exists is maintained, although
-the cache will gradually cool as writes take place.  If the coherency of
-the cache can later be verified, or established through use of the
-"invalidate_cblocks" message, the cache device can be transitioned to
-writethrough or writeback mode while still warm.  Otherwise, the cache
-contents can be discarded prior to transitioning to the desired
-operating mode.
-
 A simple cleaner policy is provided, which will clean (write back) all
-dirty blocks in a cache.  Useful for decommissioning a cache or when
-shrinking a cache.  Shrinking the cache's fast device requires all cache
-blocks, in the area of the cache being removed, to be clean.  If the
-area being removed from the cache still contains dirty blocks the resize
-will fail.  Care must be taken to never reduce the volume used for the
-cache's fast device until the cache is clean.  This is of particular
-importance if writeback mode is used.  Writethrough and passthrough
-modes already maintain a clean cache.  Future support to partially clean
-the cache, above a specified threshold, will allow for keeping the cache
-warm and in writeback mode during resize.
+dirty blocks in a cache.  Useful for decommissioning a cache.
 
 Migration throttling
 --------------------
 
 Migrating data between the origin and cache device uses bandwidth.
 The user can set a throttle to prevent more than a certain amount of
-migration occurring at any one time.  Currently we're not taking any
+migration occuring at any one time.  Currently we're not taking any
 account of normal io traffic going to the devices.  More work needs
 doing here to avoid migrating during those peak io moments.
 
@@ -124,11 +98,12 @@ the default being 204800 sectors (or 100MB).
 Updating on-disk metadata
 -------------------------
 
-On-disk metadata is committed every time a FLUSH or FUA bio is written.
-If no such requests are made then commits will occur every second.  This
-means the cache behaves like a physical disk that has a volatile write
-cache.  If power is lost you may lose some recent writes.  The metadata
-should always be consistent in spite of any crash.
+On-disk metadata is committed every time a REQ_SYNC or REQ_FUA bio is
+written.  If no such requests are made then commits will occur every
+second.  This means the cache behaves like a physical disk that has a
+write cache (the same is true of the thin-provisioning target).  If
+power is lost you may lose some recent writes.  The metadata should
+always be consistent in spite of any crash.
 
 The 'dirty' state for a cache block changes far too frequently for us
 to keep updating it on the fly.  So we treat it as a hint.  In normal
@@ -184,7 +159,7 @@ Constructor
  block size      : cache unit size in sectors
 
  #feature args   : number of feature arguments passed
- feature args    : writethrough or passthrough (The default is writeback.)
+ feature args    : writethrough.  (The default is writeback.)
 
  policy          : the replacement policy to use
  #policy args    : an even number of arguments corresponding to
@@ -200,13 +175,6 @@ Optional feature arguments are:
 		   back cache block contents later for performance reasons,
 		   so they may differ from the corresponding origin blocks.
 
-   passthrough	 : a degraded mode useful for various cache coherency
-		   situations (e.g., rolling back snapshots of
-		   underlying storage).	 Reads and writes always go to
-		   the origin.	If a write goes to a cached origin
-		   block, then the cache block is invalidated.
-		   To enable passthrough mode the cache must be clean.
-
 A policy called 'default' is always registered.  This is an alias for
 the policy we currently think is giving best all round performance.
 
@@ -216,43 +184,36 @@ the characteristics of a specific policy, always request it by name.
 Status
 ------
 
-<metadata block size> <#used metadata blocks>/<#total metadata blocks>
-<cache block size> <#used cache blocks>/<#total cache blocks>
-<#read hits> <#read misses> <#write hits> <#write misses>
-<#demotions> <#promotions> <#dirty> <#features> <features>*
-<#core args> <core args>* <policy name> <#policy args> <policy args>*
+<#used metadata blocks>/<#total metadata blocks> <#read hits> <#read misses>
+<#write hits> <#write misses> <#demotions> <#promotions> <#blocks in cache>
+<#dirty> <#features> <features>* <#core args> <core args>* <#policy args>
+<policy args>*
 
-metadata block size	 : Fixed block size for each metadata block in
-			     sectors
-#used metadata blocks	 : Number of metadata blocks used
-#total metadata blocks	 : Total number of metadata blocks
-cache block size	 : Configurable block size for the cache device
-			     in sectors
-#used cache blocks	 : Number of blocks resident in the cache
-#total cache blocks	 : Total number of cache blocks
-#read hits		 : Number of times a READ bio has been mapped
+#used metadata blocks    : Number of metadata blocks used
+#total metadata blocks   : Total number of metadata blocks
+#read hits               : Number of times a READ bio has been mapped
 			     to the cache
-#read misses		 : Number of times a READ bio has been mapped
+#read misses             : Number of times a READ bio has been mapped
 			     to the origin
-#write hits		 : Number of times a WRITE bio has been mapped
+#write hits              : Number of times a WRITE bio has been mapped
 			     to the cache
-#write misses		 : Number of times a WRITE bio has been
+#write misses            : Number of times a WRITE bio has been
 			     mapped to the origin
-#demotions		 : Number of times a block has been removed
+#demotions               : Number of times a block has been removed
 			     from the cache
-#promotions		 : Number of times a block has been moved to
+#promotions              : Number of times a block has been moved to
 			     the cache
-#dirty			 : Number of blocks in the cache that differ
+#blocks in cache         : Number of blocks resident in the cache
+#dirty                   : Number of blocks in the cache that differ
 			     from the origin
-#feature args		 : Number of feature args to follow
-feature args		 : 'writethrough' (optional)
-#core args		 : Number of core arguments (must be even)
-core args		 : Key/value pairs for tuning the core
+#feature args            : Number of feature args to follow
+feature args             : 'writethrough' (optional)
+#core args               : Number of core arguments (must be even)
+core args                : Key/value pairs for tuning the core
 			     e.g. migration_threshold
-policy name		 : Name of the policy
-#policy args		 : Number of policy arguments to follow (must be even)
-policy args		 : Key/value pairs
-			     e.g. sequential_threshold
+#policy args             : Number of policy arguments to follow (must be even)
+policy args              : Key/value pairs
+			     e.g. 'sequential_threshold 1024
 
 Messages
 --------
@@ -268,28 +229,12 @@ The message format is:
 E.g.
    dmsetup message my_cache 0 sequential_threshold 1024
 
-
-Invalidation is removing an entry from the cache without writing it
-back.  Cache blocks can be invalidated via the invalidate_cblocks
-message, which takes an arbitrary number of cblock ranges.  Each cblock
-range's end value is "one past the end", meaning 5-10 expresses a range
-of values from 5 to 9.  Each cblock must be expressed as a decimal
-value, in the future a variant message that takes cblock ranges
-expressed in hexidecimal may be needed to better support efficient
-invalidation of larger caches.  The cache must be in passthrough mode
-when invalidate_cblocks is used.
-
-   invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*
-
-E.g.
-   dmsetup message my_cache 0 invalidate_cblocks 2345 3456-4567 5678-6789
-
 Examples
 ========
 
 The test suite can be found here:
 
-https://github.com/jthornber/device-mapper-test-suite
+https://github.com/jthornber/thinp-test-suite
 
 dmsetup create my_cache --table '0 41943040 cache /dev/mapper/metadata \
 	/dev/mapper/ssd /dev/mapper/origin 512 1 writeback default 0'

doc/kernel/crypt.txt

@@ -4,15 +4,12 @@ dm-crypt
 Device-Mapper's "crypt" target provides transparent encryption of block devices
 using the kernel crypto API.
 
-For a more detailed description of supported parameters see:
-https://gitlab.com/cryptsetup/cryptsetup/wikis/DMCrypt
-
 Parameters: <cipher> <key> <iv_offset> <device path> \
 	      <offset> [<#opt_params> <opt_params>]
 
 <cipher>
     Encryption cipher and an optional IV generation mode.
-    (In format cipher[:keycount]-chainmode-ivmode[:ivopts]).
+    (In format cipher[:keycount]-chainmode-ivopts:ivmode).
     Examples:
        des
        aes-cbc-essiv:sha256
@@ -22,11 +19,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> \
 
 <key>
     Key used for encryption. It is encoded as a hexadecimal number.
-    You can only use key sizes that are valid for the selected cipher
-    in combination with the selected iv mode.
-    Note that for some iv modes the key string can contain additional
-    keys (for example IV seed) so the key contains more parts concatenated
-    into a single string.
+    You can only use key sizes that are valid for the selected cipher.
 
 <keycount>
     Multi-key compatibility mode. You can define <keycount> keys and
@@ -51,7 +44,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> \
     Otherwise #opt_params is the number of following arguments.
 
     Example of optional parameters section:
-        3 allow_discards same_cpu_crypt submit_from_crypt_cpus
+        1 allow_discards
 
 allow_discards
     Block discard requests (a.k.a. TRIM) are passed through the crypt device.
@@ -63,24 +56,11 @@ allow_discards
     used space etc.) if the discarded blocks can be located easily on the
     device later.
 
-same_cpu_crypt
-    Perform encryption using the same cpu that IO was submitted on.
-    The default is to use an unbound workqueue so that encryption work
-    is automatically balanced between available CPUs.
-
-submit_from_crypt_cpus
-    Disable offloading writes to a separate thread after encryption.
-    There are some situations where offloading write bios from the
-    encryption threads to a single thread degrades performance
-    significantly.  The default is to offload write bios to the same
-    thread because it benefits CFQ to have writes submitted using the
-    same context.
-
 Example scripts
 ===============
 LUKS (Linux Unified Key Setup) is now the preferred way to set up disk
 encryption with dm-crypt using the 'cryptsetup' utility, see
-https://gitlab.com/cryptsetup/cryptsetup
+http://code.google.com/p/cryptsetup/
 
 [[
 #!/bin/sh

doc/kernel/era.txt

@@ -1,108 +0,0 @@
-Introduction
-============
-
-dm-era is a target that behaves similar to the linear target.  In
-addition it keeps track of which blocks were written within a user
-defined period of time called an 'era'.  Each era target instance
-maintains the current era as a monotonically increasing 32-bit
-counter.
-
-Use cases include tracking changed blocks for backup software, and
-partially invalidating the contents of a cache to restore cache
-coherency after rolling back a vendor snapshot.
-
-Constructor
-===========
-
- era <metadata dev> <origin dev> <block size>
-
- metadata dev    : fast device holding the persistent metadata
- origin dev	 : device holding data blocks that may change
- block size      : block size of origin data device, granularity that is
-		     tracked by the target
-
-Messages
-========
-
-None of the dm messages take any arguments.
-
-checkpoint
-----------
-
-Possibly move to a new era.  You shouldn't assume the era has
-incremented.  After sending this message, you should check the
-current era via the status line.
-
-take_metadata_snap
-------------------
-
-Create a clone of the metadata, to allow a userland process to read it.
-
-drop_metadata_snap
-------------------
-
-Drop the metadata snapshot.
-
-Status
-======
-
-<metadata block size> <#used metadata blocks>/<#total metadata blocks>
-<current era> <held metadata root | '-'>
-
-metadata block size	 : Fixed block size for each metadata block in
-			     sectors
-#used metadata blocks	 : Number of metadata blocks used
-#total metadata blocks	 : Total number of metadata blocks
-current era		 : The current era
-held metadata root	 : The location, in blocks, of the metadata root
-			     that has been 'held' for userspace read
-			     access. '-' indicates there is no held root
-
-Detailed use case
-=================
-
-The scenario of invalidating a cache when rolling back a vendor
-snapshot was the primary use case when developing this target:
-
-Taking a vendor snapshot
-------------------------
-
-- Send a checkpoint message to the era target
-- Make a note of the current era in its status line
-- Take vendor snapshot (the era and snapshot should be forever
-  associated now).
-
-Rolling back to an vendor snapshot
-----------------------------------
-
-- Cache enters passthrough mode (see: dm-cache's docs in cache.txt)
-- Rollback vendor storage
-- Take metadata snapshot
-- Ascertain which blocks have been written since the snapshot was taken
-  by checking each block's era
-- Invalidate those blocks in the caching software
-- Cache returns to writeback/writethrough mode
-
-Memory usage
-============
-
-The target uses a bitset to record writes in the current era.  It also
-has a spare bitset ready for switching over to a new era.  Other than
-that it uses a few 4k blocks for updating metadata.
-
-   (4 * nr_blocks) bytes + buffers
-
-Resilience
-==========
-
-Metadata is updated on disk before a write to a previously unwritten
-block is performed.  As such dm-era should not be effected by a hard
-crash such as power failure.
-
-Userland tools
-==============
-
-Userland tools are found in the increasingly poorly named
-thin-provisioning-tools project:
-
-    https://github.com/jthornber/thin-provisioning-tools

doc/kernel/log-writes.txt

@@ -1,140 +0,0 @@
-dm-log-writes
-=============
-
-This target takes 2 devices, one to pass all IO to normally, and one to log all
-of the write operations to.  This is intended for file system developers wishing
-to verify the integrity of metadata or data as the file system is written to.
-There is a log_write_entry written for every WRITE request and the target is
-able to take arbitrary data from userspace to insert into the log.  The data
-that is in the WRITE requests is copied into the log to make the replay happen
-exactly as it happened originally.
-
-Log Ordering
-============
-
-We log things in order of completion once we are sure the write is no longer in
-cache.  This means that normal WRITE requests are not actually logged until the
-next REQ_FLUSH request.  This is to make it easier for userspace to replay the
-log in a way that correlates to what is on disk and not what is in cache, to
-make it easier to detect improper waiting/flushing.
-
-This works by attaching all WRITE requests to a list once the write completes.
-Once we see a REQ_FLUSH request we splice this list onto the request and once
-the FLUSH request completes we log all of the WRITEs and then the FLUSH.  Only
-completed WRITEs, at the time the REQ_FLUSH is issued, are added in order to
-simulate the worst case scenario with regard to power failures.  Consider the
-following example (W means write, C means complete):
-
-W1,W2,W3,C3,C2,Wflush,C1,Cflush
-
-The log would show the following
-
-W3,W2,flush,W1....
-
-Again this is to simulate what is actually on disk, this allows us to detect
-cases where a power failure at a particular point in time would create an
-inconsistent file system.
-
-Any REQ_FUA requests bypass this flushing mechanism and are logged as soon as
-they complete as those requests will obviously bypass the device cache.
-
-Any REQ_DISCARD requests are treated like WRITE requests.  Otherwise we would
-have all the DISCARD requests, and then the WRITE requests and then the FLUSH
-request.  Consider the following example:
-
-WRITE block 1, DISCARD block 1, FLUSH
-
-If we logged DISCARD when it completed, the replay would look like this
-
-DISCARD 1, WRITE 1, FLUSH
-
-which isn't quite what happened and wouldn't be caught during the log replay.
-
-Target interface
-================
-
-i) Constructor
-
-   log-writes <dev_path> <log_dev_path>
-
-   dev_path	: Device that all of the IO will go to normally.
-   log_dev_path : Device where the log entries are written to.
-
-ii) Status
-
-    <#logged entries> <highest allocated sector>
-
-    #logged entries	       : Number of logged entries
-    highest allocated sector   : Highest allocated sector
-
-iii) Messages
-
-    mark <description>
-
-	You can use a dmsetup message to set an arbitrary mark in a log.
-	For example say you want to fsck a file system after every
-	write, but first you need to replay up to the mkfs to make sure
-	we're fsck'ing something reasonable, you would do something like
-	this:
-
-	  mkfs.btrfs -f /dev/mapper/log
-	  dmsetup message log 0 mark mkfs
-	  <run test>
-
-	  This would allow you to replay the log up to the mkfs mark and
-	  then replay from that point on doing the fsck check in the
-	  interval that you want.
-
-	Every log has a mark at the end labeled "dm-log-writes-end".
-
-Userspace component
-===================
-
-There is a userspace tool that will replay the log for you in various ways.
-It can be found here: https://github.com/josefbacik/log-writes
-
-Example usage
-=============
-
-Say you want to test fsync on your file system.  You would do something like
-this:
-
-TABLE="0 $(blockdev --getsz /dev/sdb) log-writes /dev/sdb /dev/sdc"
-dmsetup create log --table "$TABLE"
-mkfs.btrfs -f /dev/mapper/log
-dmsetup message log 0 mark mkfs
-
-mount /dev/mapper/log /mnt/btrfs-test
-<some test that does fsync at the end>
-dmsetup message log 0 mark fsync
-md5sum /mnt/btrfs-test/foo
-umount /mnt/btrfs-test
-
-dmsetup remove log
-replay-log --log /dev/sdc --replay /dev/sdb --end-mark fsync
-mount /dev/sdb /mnt/btrfs-test
-md5sum /mnt/btrfs-test/foo
-<verify md5sum's are correct>
-
-Another option is to do a complicated file system operation and verify the file
-system is consistent during the entire operation.  You could do this with:
-
-TABLE="0 $(blockdev --getsz /dev/sdb) log-writes /dev/sdb /dev/sdc"
-dmsetup create log --table "$TABLE"
-mkfs.btrfs -f /dev/mapper/log
-dmsetup message log 0 mark mkfs
-
-mount /dev/mapper/log /mnt/btrfs-test
-<fsstress to dirty the fs>
-btrfs filesystem balance /mnt/btrfs-test
-umount /mnt/btrfs-test
-dmsetup remove log
-
-replay-log --log /dev/sdc --replay /dev/sdb --end-mark mkfs
-btrfsck /dev/sdb
-replay-log --log /dev/sdc --replay /dev/sdb --start-mark mkfs \
-	--fsck "btrfsck /dev/sdb" --check fua
-
-And that will replay the log until it sees a FUA request, run the fsck command
-and if the fsck passes it will replay to the next FUA, until it is completed or
-the fsck command exists abnormally.

doc/kernel/raid.txt

@@ -222,5 +222,3 @@ Version History
 1.4.2   Add RAID10 "far" and "offset" algorithm support.
 1.5.0   Add message interface to allow manipulation of the sync_action.
 	New status (STATUSTYPE_INFO) fields: sync_action and mismatch_cnt.
-1.5.1   Add ability to restore transiently failed devices on resume.
-1.5.2   'mismatch_cnt' is zero unless [last_]sync_action is "check".

doc/kernel/statistics.txt

@@ -1,186 +0,0 @@
-DM statistics
-=============
-
-Device Mapper supports the collection of I/O statistics on user-defined
-regions of a DM device.	 If no regions are defined no statistics are
-collected so there isn't any performance impact.  Only bio-based DM
-devices are currently supported.
-
-Each user-defined region specifies a starting sector, length and step.
-Individual statistics will be collected for each step-sized area within
-the range specified.
-
-The I/O statistics counters for each step-sized area of a region are
-in the same format as /sys/block/*/stat or /proc/diskstats (see:
-Documentation/iostats.txt).  But two extra counters (12 and 13) are
-provided: total time spent reading and writing in milliseconds.	 All
-these counters may be accessed by sending the @stats_print message to
-the appropriate DM device via dmsetup.
-
-Each region has a corresponding unique identifier, which we call a
-region_id, that is assigned when the region is created.	 The region_id
-must be supplied when querying statistics about the region, deleting the
-region, etc.  Unique region_ids enable multiple userspace programs to
-request and process statistics for the same DM device without stepping
-on each other's data.
-
-The creation of DM statistics will allocate memory via kmalloc or
-fallback to using vmalloc space.  At most, 1/4 of the overall system
-memory may be allocated by DM statistics.  The admin can see how much
-memory is used by reading
-/sys/module/dm_mod/parameters/stats_current_allocated_bytes
-
-Messages
-========
-
-    @stats_create <range> <step> [<program_id> [<aux_data>]]
-
-	Create a new region and return the region_id.
-
-	<range>
-	  "-" - whole device
-	  "<start_sector>+<length>" - a range of <length> 512-byte sectors
-				      starting with <start_sector>.
-
-	<step>
-	  "<area_size>" - the range is subdivided into areas each containing
-			  <area_size> sectors.
-	  "/<number_of_areas>" - the range is subdivided into the specified
-				 number of areas.
-
-	<program_id>
-	  An optional parameter.  A name that uniquely identifies
-	  the userspace owner of the range.  This groups ranges together
-	  so that userspace programs can identify the ranges they
-	  created and ignore those created by others.
-	  The kernel returns this string back in the output of
-	  @stats_list message, but it doesn't use it for anything else.
-
-	<aux_data>
-	  An optional parameter.  A word that provides auxiliary data
-	  that is useful to the client program that created the range.
-	  The kernel returns this string back in the output of
-	  @stats_list message, but it doesn't use this value for anything.
-
-    @stats_delete <region_id>
-
-	Delete the region with the specified id.
-
-	<region_id>
-	  region_id returned from @stats_create
-
-    @stats_clear <region_id>
-
-	Clear all the counters except the in-flight i/o counters.
-
-	<region_id>
-	  region_id returned from @stats_create
-
-    @stats_list [<program_id>]
-
-	List all regions registered with @stats_create.
-
-	<program_id>
-	  An optional parameter.
-	  If this parameter is specified, only matching regions
-	  are returned.
-	  If it is not specified, all regions are returned.
-
-	Output format:
-	  <region_id>: <start_sector>+<length> <step> <program_id> <aux_data>
-
-    @stats_print <region_id> [<starting_line> <number_of_lines>]
-
-	Print counters for each step-sized area of a region.
-
-	<region_id>
-	  region_id returned from @stats_create
-
-	<starting_line>
-	  The index of the starting line in the output.
-	  If omitted, all lines are returned.
-
-	<number_of_lines>
-	  The number of lines to include in the output.
-	  If omitted, all lines are returned.
-
-	Output format for each step-sized area of a region:
-
-	  <start_sector>+<length> counters
-
-	  The first 11 counters have the same meaning as
-	  /sys/block/*/stat or /proc/diskstats.
-
-	  Please refer to Documentation/iostats.txt for details.
-
-	  1. the number of reads completed
-	  2. the number of reads merged
-	  3. the number of sectors read
-	  4. the number of milliseconds spent reading
-	  5. the number of writes completed
-	  6. the number of writes merged
-	  7. the number of sectors written
-	  8. the number of milliseconds spent writing
-	  9. the number of I/Os currently in progress
-	  10. the number of milliseconds spent doing I/Os
-	  11. the weighted number of milliseconds spent doing I/Os
-
-	  Additional counters:
-	  12. the total time spent reading in milliseconds
-	  13. the total time spent writing in milliseconds
-
-    @stats_print_clear <region_id> [<starting_line> <number_of_lines>]
-
-	Atomically print and then clear all the counters except the
-	in-flight i/o counters.	 Useful when the client consuming the
-	statistics does not want to lose any statistics (those updated
-	between printing and clearing).
-
-	<region_id>
-	  region_id returned from @stats_create
-
-	<starting_line>
-	  The index of the starting line in the output.
-	  If omitted, all lines are printed and then cleared.
-
-	<number_of_lines>
-	  The number of lines to process.
-	  If omitted, all lines are printed and then cleared.
-
-    @stats_set_aux <region_id> <aux_data>
-
-	Store auxiliary data aux_data for the specified region.
-
-	<region_id>
-	  region_id returned from @stats_create
-
-	<aux_data>
-	  The string that identifies data which is useful to the client
-	  program that created the range.  The kernel returns this
-	  string back in the output of @stats_list message, but it
-	  doesn't use this value for anything.
-
-Examples
-========
-
-Subdivide the DM device 'vol' into 100 pieces and start collecting
-statistics on them:
-
-  dmsetup message vol 0 @stats_create - /100
-
-Set the auxillary data string to "foo bar baz" (the escape for each
-space must also be escaped, otherwise the shell will consume them):
-
-  dmsetup message vol 0 @stats_set_aux 0 foo\\ bar\\ baz
-
-List the statistics:
-
-  dmsetup message vol 0 @stats_list
-
-Print the statistics:
-
-  dmsetup message vol 0 @stats_print 0
-
-Delete the statistics:
-
-  dmsetup message vol 0 @stats_delete 0

doc/kernel/switch.txt

@@ -1,138 +0,0 @@
-dm-switch
-=========
-
-The device-mapper switch target creates a device that supports an
-arbitrary mapping of fixed-size regions of I/O across a fixed set of
-paths.  The path used for any specific region can be switched
-dynamically by sending the target a message.
-
-It maps I/O to underlying block devices efficiently when there is a large
-number of fixed-sized address regions but there is no simple pattern
-that would allow for a compact representation of the mapping such as
-dm-stripe.
-
-Background
-----------
-
-Dell EqualLogic and some other iSCSI storage arrays use a distributed
-frameless architecture.  In this architecture, the storage group
-consists of a number of distinct storage arrays ("members") each having
-independent controllers, disk storage and network adapters.  When a LUN
-is created it is spread across multiple members.  The details of the
-spreading are hidden from initiators connected to this storage system.
-The storage group exposes a single target discovery portal, no matter
-how many members are being used.  When iSCSI sessions are created, each
-session is connected to an eth port on a single member.  Data to a LUN
-can be sent on any iSCSI session, and if the blocks being accessed are
-stored on another member the I/O will be forwarded as required.  This
-forwarding is invisible to the initiator.  The storage layout is also
-dynamic, and the blocks stored on disk may be moved from member to
-member as needed to balance the load.
-
-This architecture simplifies the management and configuration of both
-the storage group and initiators.  In a multipathing configuration, it
-is possible to set up multiple iSCSI sessions to use multiple network
-interfaces on both the host and target to take advantage of the
-increased network bandwidth.  An initiator could use a simple round
-robin algorithm to send I/O across all paths and let the storage array
-members forward it as necessary, but there is a performance advantage to
-sending data directly to the correct member.
-
-A device-mapper table already lets you map different regions of a
-device onto different targets.  However in this architecture the LUN is
-spread with an address region size on the order of 10s of MBs, which
-means the resulting table could have more than a million entries and
-consume far too much memory.
-
-Using this device-mapper switch target we can now build a two-layer
-device hierarchy:
-
-    Upper Tier - Determine which array member the I/O should be sent to.
-    Lower Tier - Load balance amongst paths to a particular member.
-
-The lower tier consists of a single dm multipath device for each member.
-Each of these multipath devices contains the set of paths directly to
-the array member in one priority group, and leverages existing path
-selectors to load balance amongst these paths.  We also build a
-non-preferred priority group containing paths to other array members for
-failover reasons.
-
-The upper tier consists of a single dm-switch device.  This device uses
-a bitmap to look up the location of the I/O and choose the appropriate
-lower tier device to route the I/O.  By using a bitmap we are able to
-use 4 bits for each address range in a 16 member group (which is very
-large for us).  This is a much denser representation than the dm table
-b-tree can achieve.
-
-Construction Parameters
-=======================
-
-    <num_paths> <region_size> <num_optional_args> [<optional_args>...]
-    [<dev_path> <offset>]+
-
-<num_paths>
-    The number of paths across which to distribute the I/O.
-
-<region_size>
-    The number of 512-byte sectors in a region. Each region can be redirected
-    to any of the available paths.
-
-<num_optional_args>
-    The number of optional arguments. Currently, no optional arguments
-    are supported and so this must be zero.
-
-<dev_path>
-    The block device that represents a specific path to the device.
-
-<offset>
-    The offset of the start of data on the specific <dev_path> (in units
-    of 512-byte sectors). This number is added to the sector number when
-    forwarding the request to the specific path. Typically it is zero.
-
-Messages
-========
-
-set_region_mappings <index>:<path_nr> [<index>]:<path_nr> [<index>]:<path_nr>...
-
-Modify the region table by specifying which regions are redirected to
-which paths.
-
-<index>
-    The region number (region size was specified in constructor parameters).
-    If index is omitted, the next region (previous index + 1) is used.
-    Expressed in hexadecimal (WITHOUT any prefix like 0x).
-
-<path_nr>
-    The path number in the range 0 ... (<num_paths> - 1).
-    Expressed in hexadecimal (WITHOUT any prefix like 0x).
-
-R<n>,<m>
-    This parameter allows repetitive patterns to be loaded quickly. <n> and <m>
-    are hexadecimal numbers. The last <n> mappings are repeated in the next <m>
-    slots.
-
-Status
-======
-
-No status line is reported.
-
-Example
-=======
-
-Assume that you have volumes vg1/switch0 vg1/switch1 vg1/switch2 with
-the same size.
-
-Create a switch device with 64kB region size:
-    dmsetup create switch --table "0 `blockdev --getsize /dev/vg1/switch0`
-	switch 3 128 0 /dev/vg1/switch0 0 /dev/vg1/switch1 0 /dev/vg1/switch2 0"
-
-Set mappings for the first 7 entries to point to devices switch0, switch1,
-switch2, switch0, switch1, switch2, switch1:
-    dmsetup message switch 0 set_region_mappings 0:0 :1 :2 :0 :1 :2 :1
-
-Set repetitive mapping. This command:
-    dmsetup message switch 0 set_region_mappings 1000:1 :2 R2,10
-is equivalent to:
-    dmsetup message switch 0 set_region_mappings 1000:1 :2 :1 :2 :1 :2 :1 :2 \
-	:1 :2 :1 :2 :1 :2 :1 :2 :1 :2
-

doc/kernel/thin-provisioning.txt

@@ -99,14 +99,13 @@ Using an existing pool device
 		 $data_block_size $low_water_mark"
 
 $data_block_size gives the smallest unit of disk space that can be
-allocated at a time expressed in units of 512-byte sectors.
-$data_block_size must be between 128 (64KB) and 2097152 (1GB) and a
-multiple of 128 (64KB).  $data_block_size cannot be changed after the
-thin-pool is created.  People primarily interested in thin provisioning
-may want to use a value such as 1024 (512KB).  People doing lots of
-snapshotting may want a smaller value such as 128 (64KB).  If you are
-not zeroing newly-allocated data, a larger $data_block_size in the
-region of 256000 (128MB) is suggested.
+allocated at a time expressed in units of 512-byte sectors.  People
+primarily interested in thin provisioning may want to use a value such
+as 1024 (512KB).  People doing lots of snapshotting may want a smaller value
+such as 128 (64KB).  If you are not zeroing newly-allocated data,
+a larger $data_block_size in the region of 256000 (128MB) is suggested.
+$data_block_size must be the same for the lifetime of the
+metadata device.
 
 $low_water_mark is expressed in blocks of size $data_block_size.  If
 free space on the data device drops below this level then a dm event
@@ -116,35 +115,6 @@ Resuming a device with a new table itself triggers an event so the
 userspace daemon can use this to detect a situation where a new table
 already exceeds the threshold.
 
-A low water mark for the metadata device is maintained in the kernel and
-will trigger a dm event if free space on the metadata device drops below
-it.
-
-Updating on-disk metadata
--------------------------
-
-On-disk metadata is committed every time a FLUSH or FUA bio is written.
-If no such requests are made then commits will occur every second.  This
-means the thin-provisioning target behaves like a physical disk that has
-a volatile write cache.  If power is lost you may lose some recent
-writes.  The metadata should always be consistent in spite of any crash.
-
-If data space is exhausted the pool will either error or queue IO
-according to the configuration (see: error_if_no_space).  If metadata
-space is exhausted or a metadata operation fails: the pool will error IO
-until the pool is taken offline and repair is performed to 1) fix any
-potential inconsistencies and 2) clear the flag that imposes repair.
-Once the pool's metadata device is repaired it may be resized, which
-will allow the pool to return to normal operation.  Note that if a pool
-is flagged as needing repair, the pool's data and metadata devices
-cannot be resized until repair is performed.  It should also be noted
-that when the pool's metadata space is exhausted the current metadata
-transaction is aborted.  Given that the pool will cache IO whose
-completion may have already been acknowledged to upper IO layers
-(e.g. filesystem) it is strongly suggested that consistency checks
-(e.g. fsck) be performed on those layers when repair of the pool is
-required.
-
 Thin provisioning
 -----------------
 
@@ -264,8 +234,6 @@ i) Constructor
       read_only: Don't allow any changes to be made to the pool
 		 metadata.
 
-      error_if_no_space: Error IOs, instead of queueing, if no space.
-
     Data block size must be between 64KB (128 sectors) and 1GB
     (2097152 sectors) inclusive.
 
@@ -287,9 +255,10 @@ ii) Status
 	should register for the event and then check the target's status.
 
     held metadata root:
-	The location, in blocks, of the metadata root that has been
+	The location, in sectors, of the metadata root that has been
 	'held' for userspace read access.  '-' indicates there is no
-	held root.
+	held root.  This feature is not yet implemented so '-' is
+	always returned.
 
     discard_passdown|no_discard_passdown
 	Whether or not discards are actually being passed down to the
@@ -306,14 +275,6 @@ ii) Status
 	contain the string 'Fail'.  The userspace recovery tools
 	should then be used.
 
-    error_if_no_space|queue_if_no_space
-	If the pool runs out of data or metadata space, the pool will
-	either queue or error the IO destined to the data device.  The
-	default is to queue the IO until more space is added or the
-	'no_space_timeout' expires.  The 'no_space_timeout' dm-thin-pool
-	module parameter can be used to change this timeout -- it
-	defaults to 60 seconds but may be disabled using a value of 0.
-
 iii) Messages
 
     create_thin <dev id>
@@ -380,6 +341,9 @@ then you'll have no access to blocks mapped beyond the end.  If you
 load a target that is bigger than before, then extra blocks will be
 provisioned as and when needed.
 
+If you wish to reduce the size of your thin device and potentially
+regain some space then send the 'trim' message to the pool.
+
 ii) Status
 
      <nr mapped sectors> <highest mapped sector>

doc/kernel/verity.txt

@@ -11,7 +11,6 @@ Construction Parameters
     <data_block_size> <hash_block_size>
     <num_data_blocks> <hash_start_block>
     <algorithm> <digest> <salt>
-    [<#opt_params> <opt_params>]
 
 <version>
     This is the type of the on-disk hash format.
@@ -63,22 +62,6 @@ Construction Parameters
 <salt>
     The hexadecimal encoding of the salt value.
 
-<#opt_params>
-    Number of optional parameters. If there are no optional parameters,
-    the optional paramaters section can be skipped or #opt_params can be zero.
-    Otherwise #opt_params is the number of following arguments.
-
-    Example of optional parameters section:
-        1 ignore_corruption
-
-ignore_corruption
-    Log corrupted blocks, but allow read operations to proceed normally.
-
-restart_on_corruption
-    Restart the system when a corrupted block is discovered. This option is
-    not compatible with ignore_corruption and requires user space support to
-    avoid restart loops.
-
 Theory of operation
 ===================
 
@@ -142,7 +125,7 @@ block boundary) are the hash blocks which are stored a depth at a time
 
 The full specification of kernel parameters and on-disk metadata format
 is available at the cryptsetup project's wiki page
-  https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity
+  http://code.google.com/p/cryptsetup/wiki/DMVerity
 
 Status
 ======
@@ -159,7 +142,7 @@ Set up a device:
 
 A command line tool veritysetup is available to compute or verify
 the hash tree or activate the kernel device. This is available from
-the cryptsetup upstream repository https://gitlab.com/cryptsetup/cryptsetup/
+the cryptsetup upstream repository http://code.google.com/p/cryptsetup/
 (as a libcryptsetup extension).
 
 Create hash on the device:

doc/lvmetad_design.txt

@@ -137,17 +137,6 @@ hosts. Overall, this is not hard, but the devil is in the details. I would
 possibly disable lvmetad for clustered volume groups in the first phase and
 only proceed when the local mode is robust and well tested.
 
-With lvmlockd, lvmetad state is kept up to date by flagging either an
-individual VG as "invalid", or the global state as "invalid".  When either
-the VG or the global state are read, this invalid flag is returned along
-with the data.  The client command can check for this invalid state and
-decide to read the information from disk rather than use the stale cached
-data.  After the latest data is read from disk, the command may choose to
-send it to lvmetad to update the cache.  lvmlockd uses version numbers
-embedded in its VG and global locks to detect when cached data becomes
-invalid, and it then tells lvmetad to set the related invalid flag.
-dct, 2015-06-23
-
 Protocol & co.
 --------------
 

doc/lvmpolld_overview.txt

@@ -1,81 +0,0 @@
-LVM poll daemon overview
-========================
-
-(last updated: 2015-05-09)
-
-LVM poll daemon (lvmpolld) is the alternative for lvm2 classical polling
-mechanisms. The motivation behind new lvmpolld was to create persistent
-system service that would be more durable and transparent. It's suited
-particularly for any systemd enabled distribution.
-
-Before lvmpolld any background polling process originating in a lvm2 command
-initiated inside cgroup of a systemd service could get killed if the main
-process (service) exited in such cgroup. That could lead to premature termination
-of such lvm2 polling process.
-
-Also without lvmpolld there were no means to detect a particular polling process
-suited for monitoring of specific operation is already in-progress and therefore
-it's not desirable to start next one with exactly same task. lvmpolld is able to
-detect such duplicate requests and not spawn such redundant process.
-
-lvmpolld is primarily targeted for systems with systemd as init process. For systems
-without systemd there's no need to install lvmpolld because there is no issue
-with observation described in second paragraph. You can still benefit from
-avoiding duplicate polling process being spawned, but without systemd lvmpolld
-can't easily be run on-demand (activated by a socket maintained by systemd).
-
-lvmpolld implement shutdown on idle and can shutdown automatically when idle
-for requested time. 60 second is recommended default here. This behaviour can be
-turned off if found useless.
-
-Data structures
----------------
-
-a) Logical Volume (struct lvmpolld_lv)
-
-Each operation is identified by LV. Internal identifier within lvmpolld
-is full LV uuid (vg_uuid+lv_uuid) prefixed with LVM_SYSTEM_DIR if set by client.
-
-such full identifier may look like:
-
-  "/etc/lvm/lvm.confWFd2dU67S8Av29IcJCnYzqQirdfElnxzhCdzEh7EJrfCn9R1TIQjIj58weUZDre4"
-
-or without LVM_SYSTEM_DIR being set explicitly:
-
-  "WFd2dU67S8Av29IcJCnYzqQirdfElnxzhCdzEh7EJrfCn9R1TIQjIj58weUZDre4"
-
-
-LV carries various metadata about polling operation. The most significant are:
-
-VG name
-LV name
-polling interval (usually --interval passed to lvm2 command or default from lvm2 
-		  configuration)
-operation type (one of: pvmove, convert, merge, thin_merge)
-LVM_SYSTEM_DIR (if set, this is also passed among environment variables of lvpoll
-		command spawned by lvmpolld)
-
-b) LV stores (struct lvmpolld_store)
-
-lvmpolld uses two stores for Logical volumes (struct lvmpolld_lv). One store for polling
-operations in-progress. These operations are as of now: PV move, mirror up-conversion,
-classical snapshot merge, thin snapshot merge.
-
-The second store is suited only for pvmove --abort operations in-progress. Both
-stores are independent and identical LVs (pvmove /dev/sda3 and pvmove --abort /dev/sda3)
-can be run concurently from lvmpolld point of view (on lvm2 side the consistency is
-guaranteed by lvm2 locking mechanism).
-
-Locking order
--------------
-
-There are two types of locks in lvmpolld. Each store has own store lock and each LV has
-own lv lock.
-
-Locking order is:
-1) store lock
-2) LV lock
-
-Each LV has to be inside a store. When daemon requires to take both locks it has
-to take a store lock first and LV lock has to be taken afterwards (after the
-appropriate store lock where the LV is being stored :))

include/.symlinks.in

@@ -1,27 +1,29 @@
 @top_srcdir@/daemons/clvmd/clvm.h
 @top_srcdir@/daemons/dmeventd/libdevmapper-event.h
 @top_srcdir@/daemons/lvmetad/lvmetad-client.h
-@top_srcdir@/daemons/lvmpolld/lvmpolld-protocol.h
-@top_srcdir@/daemons/lvmpolld/polling_ops.h
-@top_srcdir@/daemons/lvmlockd/lvmlockd-client.h
 @top_srcdir@/liblvm/lvm2app.h
 @top_srcdir@/lib/activate/activate.h
 @top_srcdir@/lib/activate/targets.h
 @top_srcdir@/lib/cache/lvmcache.h
 @top_srcdir@/lib/cache/lvmetad.h
-@top_srcdir@/lib/locking/lvmlockd.h
+@top_srcdir@/lib/commands/errors.h
 @top_srcdir@/lib/commands/toolcontext.h
 @top_srcdir@/lib/config/config.h
 @top_srcdir@/lib/config/config_settings.h
 @top_srcdir@/lib/config/defaults.h
 @top_srcdir@/lib/datastruct/btree.h
+@top_srcdir@/lib/datastruct/lvm-types.h
 @top_srcdir@/lib/datastruct/str_list.h
 @top_srcdir@/lib/device/dev-cache.h
-@top_srcdir@/lib/device/dev-ext-udev-constants.h
 @top_srcdir@/lib/device/dev-type.h
 @top_srcdir@/lib/device/device.h
-@top_srcdir@/lib/device/device-types.h
 @top_srcdir@/lib/display/display.h
+@top_srcdir@/lib/filters/filter-composite.h
+@top_srcdir@/lib/filters/filter-md.h
+@top_srcdir@/lib/filters/filter-mpath.h
+@top_srcdir@/lib/filters/filter-persistent.h
+@top_srcdir@/lib/filters/filter-regex.h
+@top_srcdir@/lib/filters/filter-sysfs.h
 @top_srcdir@/lib/filters/filter.h
 @top_srcdir@/lib/format1/format1.h
 @top_srcdir@/lib/format_pool/format_pool.h
@@ -33,8 +35,6 @@
 @top_srcdir@/lib/locking/locking.h
 @top_srcdir@/lib/log/log.h
 @top_srcdir@/lib/log/lvm-logging.h
-@top_srcdir@/lib/lvmpolld/lvmpolld-client.h
-@top_srcdir@/lib/lvmpolld/polldaemon.h
 @top_srcdir@/lib/metadata/lv.h
 @top_srcdir@/lib/metadata/lv_alloc.h
 @top_srcdir@/lib/metadata/metadata.h
@@ -45,21 +45,20 @@
 @top_srcdir@/lib/metadata/vg.h
 @top_srcdir@/lib/mm/memlock.h
 @top_srcdir@/lib/mm/xlate.h
+@top_builddir@/lib/misc/configure.h
 @top_srcdir@/lib/misc/crc.h
 @top_srcdir@/lib/misc/intl.h
+@top_srcdir@/lib/misc/util.h
 @top_srcdir@/lib/misc/last-path-component.h
 @top_srcdir@/lib/misc/lib.h
 @top_srcdir@/lib/misc/lvm-exec.h
 @top_srcdir@/lib/misc/lvm-file.h
-@top_srcdir@/lib/misc/lvm-flock.h
 @top_srcdir@/lib/misc/lvm-globals.h
-@top_srcdir@/lib/misc/lvm-signal.h
 @top_srcdir@/lib/misc/lvm-string.h
-@top_srcdir@/lib/misc/lvm-percent.h
+@top_builddir@/lib/misc/lvm-version.h
 @top_srcdir@/lib/misc/lvm-wrappers.h
+@top_srcdir@/lib/misc/lvm-percent.h
 @top_srcdir@/lib/misc/sharedlib.h
-@top_srcdir@/lib/misc/util.h
-@top_srcdir@/lib/properties/prop_common.h
 @top_srcdir@/lib/report/properties.h
 @top_srcdir@/lib/report/report.h
 @top_srcdir@/lib/uuid/uuid.h
@@ -74,4 +73,3 @@
 @top_srcdir@/libdm/misc/kdev_t.h
 @top_srcdir@/po/pogen.h
 @top_srcdir@/tools/lvm2cmd.h
-@top_srcdir@/tools/tool.h