device_mapper: rename libdevmapper.h -> all.h

I'm paranoid a file will include the global one in /usr/include
by accident.

diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h
index 54ddd79ecb32575494b72c910cebaaa20a05891a..01d4871c4353e084e2e19fafc78ae9e9722c3880 100644 (file)
--- a/daemons/cmirrord/cluster.h
+++ b/daemons/cmirrord/cluster.h
@@ -13,7 +13,7 @@
 #define _LVM_CLOG_CLUSTER_H
 
 #include "device_mapper/misc/dm-log-userspace.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */
 #define DM_ULOG_CHECKPOINT_READY 21

diff --git a/device_mapper/libdevmapper.h b/device_mapper/all.h
similarity index 100%
rename from device_mapper/libdevmapper.h
rename to device_mapper/all.h

diff --git a/device_mapper/libdm-common.h b/device_mapper/libdm-common.h
index 010d8767404ae5df900eab44fe4f40220da5285d..cf99265a7aa7815347a074829a41bb5904046cb6 100644 (file)
--- a/device_mapper/libdm-common.h
+++ b/device_mapper/libdm-common.h
@@ -16,7 +16,7 @@
 #ifndef LIB_DMCOMMON_H
 #define LIB_DMCOMMON_H
 
-#include "libdevmapper.h"
+#include "device_mapper/all.h"
 
 #define DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME "DM_DEFAULT_NAME_MANGLING_MODE"
 

diff --git a/device_mapper/misc/dm-logging.h b/device_mapper/misc/dm-logging.h
index e355bc5d7731adbf3b138e8f736089f25274b88b..4db38bdb8cb99a2784911551abf9033fbcffd371 100644 (file)
--- a/device_mapper/misc/dm-logging.h
+++ b/device_mapper/misc/dm-logging.h
@@ -16,7 +16,7 @@
 #ifndef _DM_LOGGING_H
 #define _DM_LOGGING_H
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 extern dm_log_with_errno_fn dm_log_with_errno;
 

diff --git a/device_mapper/misc/dmlib.h b/device_mapper/misc/dmlib.h
index 88b6ac39fe43ca53498c3bf8945a338fe54f7a40..fe64bd75e4a4ff9d0b082e2389dba4ae7a467a16 100644 (file)
--- a/device_mapper/misc/dmlib.h
+++ b/device_mapper/misc/dmlib.h
@@ -26,7 +26,7 @@
 #define _REENTRANT
 #define _GNU_SOURCE
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 #include "lib/misc/util.h"
 #include "dm-logging.h"
 

diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c
index 4bd15e4624b04707920981bd46f65e23dc0eb14a..7a26e1a8947f9706267665b230e29008e5a86900 100644 (file)
--- a/device_mapper/vdo/status.c
+++ b/device_mapper/vdo/status.c
@@ -1,7 +1,7 @@
 #include "target.h"
 
 // For DM_ARRAY_SIZE!
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include <ctype.h>
 #include <stdlib.h>

diff --git a/lib/config/config.h b/lib/config/config.h
index 146aae152c6a6e2269c6d7062ba834cc61eca0ba..4c8ddac7d36778b2917812e954d48072ec96eb48 100644 (file)
--- a/lib/config/config.h
+++ b/lib/config/config.h
@@ -16,7 +16,7 @@
 #ifndef _LVM_CONFIG_H
 #define _LVM_CONFIG_H
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 #include "lib/device/device.h"
 
 /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */

diff --git a/lib/device/bcache.h b/lib/device/bcache.h
index 8f328c76c0abe786b0e2ed81653ec61b30a59375..cb36c30886bfebae4139161050f607f9479d14ab 100644 (file)
--- a/lib/device/bcache.h
+++ b/lib/device/bcache.h
@@ -15,7 +15,7 @@
 #ifndef BCACHE_H
 #define BCACHE_H
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include <linux/fs.h>
 #include <stdint.h>

diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h
index d5d91ce0f98a57686b08307c2dd311ad8247e980..61aa54e180fa295da411214ec03f35262ede5214 100644 (file)
--- a/lib/metadata/pv.h
+++ b/lib/metadata/pv.h
@@ -16,7 +16,7 @@
 #define _LVM_PV_H
 
 #include "lib/uuid/uuid.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 struct device;
 struct format_type;

diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h
index 620815956a9db0cb6f3ba9d33166326a9daea4a2..9921b9109d4509e894e1098ab2763ee34194a89f 100644 (file)
--- a/lib/metadata/vg.h
+++ b/lib/metadata/vg.h
@@ -16,7 +16,7 @@
 #define _LVM_VG_H
 
 #include "lib/uuid/uuid.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 struct cmd_context;
 struct format_instance;

diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index 3ae3aacc089285daaca9ded09a91ca0e2d6a68d4..0d61f34476e15b433f111bb079fba8c8851922b9 100644 (file)
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
@@ -79,7 +79,7 @@
 
 
 #include "lib/misc/intl.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 #include "lib/misc/util.h"
 
 #ifdef DM

diff --git a/lib/report/properties.h b/lib/report/properties.h
index 38b61110c3ab3ae2fd8a1fc0a944dc6083c45722..3d93b08e95671134a26c83a8c40588d325778199 100644 (file)
--- a/lib/report/properties.h
+++ b/lib/report/properties.h
@@ -14,7 +14,7 @@
 #ifndef _LVM_PROPERTIES_H
 #define _LVM_PROPERTIES_H
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 #include "lib/metadata/metadata.h"
 #include "lib/report/report.h"
 #include "lib/properties/prop_common.h"

diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 9ba199672e90326555cdeba1245dc19bd3815509..7791e64ab07b121717dd02b01802f475428db309 100644 (file)
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "configure.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 //----------------------------------------------------------------
 

diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c
index 56871a734e0bcd073c5975e4538465334133677e..9f6b661ca4dc9a82de3f2f85de8ab84edadb4d2a 100644 (file)
--- a/test/unit/activation-generator_t.c
+++ b/test/unit/activation-generator_t.c
@@ -16,7 +16,7 @@
 #include "framework.h"
 #include "units.h"
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 //----------------------------------------------------------------
 

diff --git a/test/unit/bitset_t.c b/test/unit/bitset_t.c
index 9b18fcbf05fe4e7b7c3ab2c34426b37fb46d2dcb..12b2a2092f844b643ed13e34e806b7ebb10a9f66 100644 (file)
--- a/test/unit/bitset_t.c
+++ b/test/unit/bitset_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 enum {
         NR_BITS = 137

diff --git a/test/unit/config_t.c b/test/unit/config_t.c
index 21af55146d4d5491da977bba9560625eceac5dea..50d388f4f6834ef008d8a7223198cf84c0593b95 100644 (file)
--- a/test/unit/config_t.c
+++ b/test/unit/config_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 static void *_mem_init(void)
 {

diff --git a/test/unit/dmlist_t.c b/test/unit/dmlist_t.c
index 8a9948f72d0de537782884cbb52760b1a53cb004..0e333854d966bacb8cc5f8ad3a94a66a6e3bba02 100644 (file)
--- a/test/unit/dmlist_t.c
+++ b/test/unit/dmlist_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 static void test_dmlist_splice(void *fixture)
 {

diff --git a/test/unit/dmstatus_t.c b/test/unit/dmstatus_t.c
index f50dd75c459a6971743818ce077a2f414044bdbe..ac2015ed11e8b24419d4a59d89a666df2210236b 100644 (file)
--- a/test/unit/dmstatus_t.c
+++ b/test/unit/dmstatus_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 static void *_mem_init(void)
 {

diff --git a/test/unit/framework.h b/test/unit/framework.h
index 0a8a5f27bf2d825475a7c9b5c19e62d7a0e98eb2..0c455969c6791542a14da9e639d332faa6f130f7 100644 (file)
--- a/test/unit/framework.h
+++ b/test/unit/framework.h
@@ -1,7 +1,7 @@
 #ifndef TEST_UNIT_FRAMEWORK_H
 #define TEST_UNIT_FRAMEWORK_H
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/test/unit/matcher_t.c b/test/unit/matcher_t.c
index 296c78ad111436b5d8f840a34738435b76203d53..89b2988a64e202e05ff2c656ba84f21a80699421 100644 (file)
--- a/test/unit/matcher_t.c
+++ b/test/unit/matcher_t.c
@@ -14,7 +14,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include "matcher_data.h"
 

diff --git a/test/unit/percent_t.c b/test/unit/percent_t.c
index 43414809aa9eb511d79a6fb84fb4086011901ef6..9b349a97ce070496ebe4c8f499c769e4649073d2 100644 (file)
--- a/test/unit/percent_t.c
+++ b/test/unit/percent_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include <stdio.h>
 #include <string.h>

diff --git a/test/unit/string_t.c b/test/unit/string_t.c
index 3557247e8f889a8ac5e7101b7d336f3b3b404644..82c6448e1cae0a2291beb4fb2aedf5114e96db11 100644 (file)
--- a/test/unit/string_t.c
+++ b/test/unit/string_t.c
@@ -13,7 +13,7 @@
  */
 
 #include "units.h"
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 
 #include <stdio.h>
 #include <string.h>

diff --git a/tools/tool.h b/tools/tool.h
index 51d530c76576f02809e5f2876b9f6be164bb1f8c..a4cef3def34f7772bf249363d11f0b7e089a5a0e 100644 (file)
--- a/tools/tool.h
+++ b/tools/tool.h
@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 
-#include "device_mapper/libdevmapper.h"
+#include "device_mapper/all.h"
 #include "lib/misc/util.h"
 
 #endif /* _LVM_TOOL_H */