Skip to content

Commit

Permalink
device_mapper: rename libdevmapper.h -> all.h
Browse files Browse the repository at this point in the history
I'm paranoid a file will include the global one in /usr/include
by accident.
  • Loading branch information
jthornber committed Jun 8, 2018
1 parent 88ae928 commit 286c1ba
Show file tree
Hide file tree
Showing 23 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion daemons/cmirrord/cluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion device_mapper/libdm-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion device_mapper/misc/dm-logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion device_mapper/misc/dmlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion device_mapper/vdo/status.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lib/config/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/device/bcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lib/metadata/pv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/metadata/vg.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/misc/lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/report/properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/lvm2_activation_generator_systemd_red_hat.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <unistd.h>

#include "configure.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

//----------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion test/unit/activation-generator_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "framework.h"
#include "units.h"

#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

//----------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion test/unit/bitset_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

enum {
NR_BITS = 137
Expand Down
2 changes: 1 addition & 1 deletion test/unit/config_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

static void *_mem_init(void)
{
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dmlist_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

static void test_dmlist_splice(void *fixture)
{
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dmstatus_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

static void *_mem_init(void)
{
Expand Down
2 changes: 1 addition & 1 deletion test/unit/framework.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/unit/matcher_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

#include "matcher_data.h"

Expand Down
2 changes: 1 addition & 1 deletion test/unit/percent_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

#include <stdio.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion test/unit/string_t.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

#include "units.h"
#include "device_mapper/libdevmapper.h"
#include "device_mapper/all.h"

#include <stdio.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion tools/tool.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 286c1ba

Please sign in to comment.