From fededfbbbc5ed79c509a34a0f8a681fa27e49533 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Thu, 14 Jun 2018 14:27:19 +0100 Subject: [PATCH] dmfilemapd: Move to libdm/dm-tools No longer uses any lvm code. --- configure | 3 +- configure.ac | 1 - daemons/Makefile.in | 6 +- daemons/dmfilemapd/.gitignore | 1 - daemons/dmfilemapd/Makefile.in | 65 ------------------- libdm/dm-tools/.gitignore | 1 + libdm/dm-tools/Makefile.in | 42 ++++++++++-- .../dm-tools}/dmfilemapd.c | 11 ++-- 8 files changed, 46 insertions(+), 84 deletions(-) delete mode 100644 daemons/dmfilemapd/.gitignore delete mode 100644 daemons/dmfilemapd/Makefile.in rename {daemons/dmfilemapd => libdm/dm-tools}/dmfilemapd.c (99%) diff --git a/configure b/configure index ed3a3156c..4536b0302 100755 --- a/configure +++ b/configure @@ -13611,7 +13611,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14319,7 +14319,6 @@ do "daemons/dmeventd/plugins/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/mirror/Makefile" ;; "daemons/dmeventd/plugins/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/snapshot/Makefile" ;; "daemons/dmeventd/plugins/thin/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/thin/Makefile" ;; - "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; "daemons/lvmdbusd/lvmdb.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdb.py" ;; diff --git a/configure.ac b/configure.ac index 42f19fd6e..05b13e0c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1764,7 +1764,6 @@ daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile -daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py diff --git a/daemons/Makefile.in b/daemons/Makefile.in index 8edaefaa5..5226a5eb4 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -44,12 +44,8 @@ ifeq ("@BUILD_LVMDBUSD@", "yes") SUBDIRS += lvmdbusd endif -ifeq ("@BUILD_DMFILEMAPD@", "yes") - SUBDIRS += dmfilemapd -endif - ifeq ($(MAKECMDGOALS),distclean) - SUBDIRS = cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd dmfilemapd + SUBDIRS = cmirrord dmeventd lvmetad lvmpolld lvmlockd lvmdbusd endif include $(top_builddir)/make.tmpl diff --git a/daemons/dmfilemapd/.gitignore b/daemons/dmfilemapd/.gitignore deleted file mode 100644 index 6dcde30b0..000000000 --- a/daemons/dmfilemapd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -dmfilemapd diff --git a/daemons/dmfilemapd/Makefile.in b/daemons/dmfilemapd/Makefile.in deleted file mode 100644 index 1afd6b8ed..000000000 --- a/daemons/dmfilemapd/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (C) 2016 Red Hat, Inc. All rights reserved. -# -# This file is part of the device-mapper userspace tools. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions -# of the GNU Lesser General Public License v.2.1. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ - -SOURCES = dmfilemapd.c - -TARGETS = dmfilemapd - -.PHONY: install_dmfilemapd install_dmfilemapd_static - -INSTALL_DMFILEMAPD_TARGETS = install_dmfilemapd_dynamic - -CLEAN_TARGETS = dmfilemapd.static - -CFLOW_LIST = $(SOURCES) -CFLOW_LIST_TARGET = $(LIB_NAME).cflow -CFLOW_TARGET = dmfilemapd - -include $(top_builddir)/make.tmpl - -all: device-mapper -device-mapper: $(TARGETS) - -CFLAGS_dmfilemapd.o += $(EXTRA_EXEC_CFLAGS) - -dmfilemapd: $(LIB_SHARED) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) - -dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o - $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L$(interfacebuilddir) \ - -o $@ dmfilemapd.o $(DL_LIBS) $(LIBS) $(STATIC_LIBS) - -ifneq ("$(CFLOW_CMD)", "") -CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) --include $(top_builddir)/libdm/libdevmapper.cflow --include $(top_builddir)/lib/liblvm-internal.cflow --include $(top_builddir)/lib/liblvm2cmd.cflow --include $(top_builddir)/daemons/dmfilemapd/$(LIB_NAME).cflow -endif - -install_dmfilemapd_dynamic: dmfilemapd - $(INSTALL_PROGRAM) -D $< $(sbindir)/$( #include @@ -29,13 +26,15 @@ #include #ifdef __linux__ -# include "kdev_t.h" +# include "libdm/misc/kdev_t.h" #else # define MAJOR(x) major((x)) # define MINOR(x) minor((x)) # define MKDEV(x,y) makedev((x),(y)) #endif +#define DEFAULT_PROC_DIR "/proc" + /* limit to two updates/sec */ #define FILEMAPD_WAIT_USECS 500000