From 286c1ba3369d1901480425e305e313e8ea365da4 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 8 Jun 2018 12:31:45 +0100 Subject: [PATCH] device_mapper: rename libdevmapper.h -> all.h I'm paranoid a file will include the global one in /usr/include by accident. --- daemons/cmirrord/cluster.h | 2 +- device_mapper/{libdevmapper.h => all.h} | 0 device_mapper/libdm-common.h | 2 +- device_mapper/misc/dm-logging.h | 2 +- device_mapper/misc/dmlib.h | 2 +- device_mapper/vdo/status.c | 2 +- lib/config/config.h | 2 +- lib/device/bcache.h | 2 +- lib/metadata/pv.h | 2 +- lib/metadata/vg.h | 2 +- lib/misc/lib.h | 2 +- lib/report/properties.h | 2 +- scripts/lvm2_activation_generator_systemd_red_hat.c | 2 +- test/unit/activation-generator_t.c | 2 +- test/unit/bitset_t.c | 2 +- test/unit/config_t.c | 2 +- test/unit/dmlist_t.c | 2 +- test/unit/dmstatus_t.c | 2 +- test/unit/framework.h | 2 +- test/unit/matcher_t.c | 2 +- test/unit/percent_t.c | 2 +- test/unit/string_t.c | 2 +- tools/tool.h | 2 +- 23 files changed, 22 insertions(+), 22 deletions(-) rename device_mapper/{libdevmapper.h => all.h} (100%) diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h index 54ddd79ec..01d4871c4 100644 --- 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 010d87674..cf99265a7 100644 --- 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 e355bc5d7..4db38bdb8 100644 --- 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 88b6ac39f..fe64bd75e 100644 --- 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 4bd15e462..7a26e1a89 100644 --- 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 #include diff --git a/lib/config/config.h b/lib/config/config.h index 146aae152..4c8ddac7d 100644 --- 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 8f328c76c..cb36c3088 100644 --- 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 #include diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index d5d91ce0f..61aa54e18 100644 --- 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 620815956..9921b9109 100644 --- 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 3ae3aacc0..0d61f3447 100644 --- 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 38b61110c..3d93b08e9 100644 --- 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 9ba199672..7791e64ab 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -27,7 +27,7 @@ #include #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 56871a734..9f6b661ca 100644 --- 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 9b18fcbf0..12b2a2092 100644 --- 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 21af55146..50d388f4f 100644 --- 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 8a9948f72..0e333854d 100644 --- 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 f50dd75c4..ac2015ed1 100644 --- 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 0a8a5f27b..0c455969c 100644 --- 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 #include diff --git a/test/unit/matcher_t.c b/test/unit/matcher_t.c index 296c78ad1..89b2988a6 100644 --- 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 43414809a..9b349a97c 100644 --- 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 #include diff --git a/test/unit/string_t.c b/test/unit/string_t.c index 3557247e8..82c6448e1 100644 --- 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 #include diff --git a/tools/tool.h b/tools/tool.h index 51d530c76..a4cef3def 100644 --- a/tools/tool.h +++ b/tools/tool.h @@ -24,7 +24,7 @@ #include -#include "device_mapper/libdevmapper.h" +#include "device_mapper/all.h" #include "lib/misc/util.h" #endif /* _LVM_TOOL_H */