summaryrefslogtreecommitdiff
path: root/daemons/cmirrord
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
committerJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
commit7f97c7ea9ade36bab817aca9eeee5c5177550127 (patch)
tree2fac9b50b16b91dd22ca155223c26beba9677377 /daemons/cmirrord
parent02b99be57eab4f55bd0db045a3873bdf5e500b92 (diff)
downloadlvm2-7f97c7ea9ade36bab817aca9eeee5c5177550127.tar.gz
build: Don't generate symlinks in include/ dir
As we start refactoring the code to break dependencies (see doc/refactoring.txt), I want us to use full paths in the includes (eg, #include "base/data-struct/list.h"). This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in metadata/ from base/
Diffstat (limited to 'daemons/cmirrord')
-rw-r--r--daemons/cmirrord/cluster.c2
-rw-r--r--daemons/cmirrord/cluster.h4
-rw-r--r--daemons/cmirrord/compat.c2
-rw-r--r--daemons/cmirrord/functions.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c
index 180e34ac8..6bb9d6347 100644
--- a/daemons/cmirrord/cluster.c
+++ b/daemons/cmirrord/cluster.c
@@ -16,7 +16,7 @@
#include "functions.h"
#include "link_mon.h"
#include "local.h"
-#include "xlate.h"
+#include "lib/mm/xlate.h"
#include <corosync/cpg.h>
#include <errno.h>
diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h
index 5b1e58bd7..0efbd64bf 100644
--- a/daemons/cmirrord/cluster.h
+++ b/daemons/cmirrord/cluster.h
@@ -12,8 +12,8 @@
#ifndef _LVM_CLOG_CLUSTER_H
#define _LVM_CLOG_CLUSTER_H
-#include "dm-log-userspace.h"
-#include "libdevmapper.h"
+#include "libdm/misc/dm-log-userspace.h"
+#include "libdm/libdevmapper.h"
#define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */
#define DM_ULOG_CHECKPOINT_READY 21
diff --git a/daemons/cmirrord/compat.c b/daemons/cmirrord/compat.c
index a9696d7be..c0dd7934e 100644
--- a/daemons/cmirrord/compat.c
+++ b/daemons/cmirrord/compat.c
@@ -8,7 +8,7 @@
#include "logging.h"
#include "cluster.h"
#include "compat.h"
-#include "xlate.h"
+#include "lib/mm/xlate.h"
#include <errno.h>
diff --git a/daemons/cmirrord/functions.h b/daemons/cmirrord/functions.h
index 4620f9968..c770459a9 100644
--- a/daemons/cmirrord/functions.h
+++ b/daemons/cmirrord/functions.h
@@ -12,7 +12,7 @@
#ifndef _LVM_CLOG_FUNCTIONS_H
#define _LVM_CLOG_FUNCTIONS_H
-#include "dm-log-userspace.h"
+#include "libdm/misc/dm-log-userspace.h"
#include "cluster.h"
#define LOG_RESUMED 1