diff options
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd-cman.c | 6 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd-command.c | 6 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd-gulm.c | 2 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd-openais.c | 6 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd.c | 8 | ||||
| -rw-r--r-- | daemons/clvmd/lvm-functions.c | 7 | ||||
| -rw-r--r-- | daemons/clvmd/refresh_clvmd.c | 4 | ||||
| -rw-r--r-- | daemons/clvmd/tcp-comms.c | 3 |
9 files changed, 38 insertions, 6 deletions
diff --git a/daemons/Makefile.in b/daemons/Makefile.in index 766469e1..db67d3da 100644 --- a/daemons/Makefile.in +++ b/daemons/Makefile.in @@ -27,4 +27,6 @@ endif include $(top_srcdir)/make.tmpl +ifeq ("@DMEVENTD@", "yes") device-mapper: dmeventd.device-mapper +endif diff --git a/daemons/clvmd/clvmd-cman.c b/daemons/clvmd/clvmd-cman.c index 4c713833..b03f880d 100644 --- a/daemons/clvmd/clvmd-cman.c +++ b/daemons/clvmd/clvmd-cman.c @@ -17,6 +17,10 @@ * CMAN communication layer for clvmd. */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> #include <pthread.h> #include <sys/types.h> #include <sys/stat.h> @@ -41,7 +45,7 @@ #include "clvmd-comms.h" #include "clvm.h" -#include "log.h" +#include "lvm-logging.h" #include "clvmd.h" #include "lvm-functions.h" diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index b3deb48c..12bf935e 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -50,6 +50,10 @@ */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> #include <pthread.h> #include <sys/types.h> #include <sys/utsname.h> @@ -68,7 +72,7 @@ #include <libdlm.h> #include "locking.h" -#include "log.h" +#include "lvm-logging.h" #include "lvm-functions.h" #include "clvmd-comms.h" #include "clvm.h" diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c index 5fdf9b28..5d4d3a73 100644 --- a/daemons/clvmd/clvmd-gulm.c +++ b/daemons/clvmd/clvmd-gulm.c @@ -45,7 +45,7 @@ #include <libgulm.h> #include "locking.h" -#include "log.h" +#include "lvm-logging.h" #include "clvm.h" #include "clvmd-comms.h" #include "lvm-functions.h" diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c index a830304a..42f8187d 100644 --- a/daemons/clvmd/clvmd-openais.c +++ b/daemons/clvmd/clvmd-openais.c @@ -11,6 +11,10 @@ * */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> #include <pthread.h> #include <sys/types.h> #include <sys/utsname.h> @@ -40,7 +44,7 @@ #include <openais/cpg.h> #include "locking.h" -#include "log.h" +#include "lvm-logging.h" #include "clvm.h" #include "clvmd-comms.h" #include "lvm-functions.h" diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 3a227276..eb34eaf9 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -17,6 +17,12 @@ * CLVMD: Cluster LVM daemon */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> +#include <libdevmapper.h> + #include <pthread.h> #include <sys/types.h> #include <sys/stat.h> @@ -46,7 +52,7 @@ #include "version.h" #include "clvmd.h" #include "refresh_clvmd.h" -#include "log.h" +#include "lvm-logging.h" #ifndef TRUE #define TRUE 1 diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 2e727518..621493cc 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -13,6 +13,10 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> #include <pthread.h> #include <sys/types.h> #include <sys/utsname.h> @@ -42,7 +46,8 @@ /* LVM2 headers */ #include "toolcontext.h" #include "lvmcache.h" -#include "log.h" +#include "lvm-logging.h" +#include "lvm-globals.h" #include "activate.h" #include "locking.h" #include "archiver.h" diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c index 0cbd4b91..850990c1 100644 --- a/daemons/clvmd/refresh_clvmd.c +++ b/daemons/clvmd/refresh_clvmd.c @@ -18,6 +18,10 @@ * */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 + +#include <configure.h> #include <stddef.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/daemons/clvmd/tcp-comms.c b/daemons/clvmd/tcp-comms.c index 37e954ac..306a7eb8 100644 --- a/daemons/clvmd/tcp-comms.c +++ b/daemons/clvmd/tcp-comms.c @@ -13,7 +13,10 @@ It can also make outgoing connnections to the other clvmd nodes. */ +#define _GNU_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <configure.h> #include <pthread.h> #include <sys/types.h> #include <sys/utsname.h> |