diff options
Diffstat (limited to 'xlators/mgmt')
53 files changed, 257 insertions, 257 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c index c8e30a5682f..d140b19099f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-bitrot.c b/xlators/mgmt/glusterd/src/glusterd-bitrot.c index 0608badb91d..c653249cbb2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitrot.c +++ b/xlators/mgmt/glusterd/src/glusterd-bitrot.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -16,10 +16,10 @@ #include "glusterd-store.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" -#include "run.h" -#include "syscall.h" -#include "byte-order.h" -#include "compat-errno.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/compat-errno.h> #include "glusterd-scrub-svc.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 6a015a88147..38483a1ec42 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -20,9 +20,9 @@ #include "glusterd-svc-helper.h" #include "glusterd-messages.h" #include "glusterd-server-quorum.h" -#include "run.h" +#include <glusterfs/run.h> #include "glusterd-volgen.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include <sys/signal.h> /* misc */ diff --git a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c index f84a7617549..e80e152cd58 100644 --- a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "rpc-clnt.h" #include "glusterd.h" #include "glusterd-conn-mgmt.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 1aa38686d6f..140197e00da 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -17,8 +17,8 @@ #include "glusterd-utils.h" #include "glusterd-volgen.h" #include "glusterd-svc-helper.h" -#include "run.h" -#include "syscall.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> #include "glusterd-messages.h" #include <signal.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c index 0b56a0eb45a..67e3f41e5dd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c @@ -12,7 +12,7 @@ #include "glusterd-utils.h" #include "glusterd-gfproxyd-svc-helper.h" #include "glusterd-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "glusterd-volgen.h" void diff --git a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c index 0a78d4d1fd0..f9c8617526b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" @@ -18,7 +18,7 @@ #include "glusterd-svc-helper.h" #include "glusterd-svc-mgmt.h" #include "glusterd-gfproxyd-svc-helper.h" -#include "syscall.h" +#include <glusterfs/syscall.h> void glusterd_gfproxydsvc_build(glusterd_svc_t *svc) diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 1da6d27e18a..f9cd600efd4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -9,19 +9,19 @@ */ #include <inttypes.h> -#include "glusterfs.h" -#include "compat.h" -#include "dict.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/dict.h> #include "protocol-common.h" -#include "xlator.h" -#include "logging.h" -#include "syscall.h" -#include "timer.h" -#include "defaults.h" -#include "compat.h" -#include "compat-errno.h" -#include "statedump.h" -#include "run.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/syscall.h> +#include <glusterfs/timer.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/statedump.h> +#include <glusterfs/run.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-sm.h" @@ -46,7 +46,7 @@ #include <sys/resource.h> #include <inttypes.h> -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd-syncop.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index 1466d8f0653..5b1ea8dcbb3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "glusterfs.h" -#include "syscall.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> +#include <glusterfs/compat-errno.h> #include "glusterd.h" #include "glusterd-utils.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c index 4a482d5cfb7..216cdf7f424 100644 --- a/xlators/mgmt/glusterd/src/glusterd-hooks.c +++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c @@ -8,15 +8,15 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "dict.h" -#include "xlator.h" -#include "logging.h" -#include "run.h" -#include "defaults.h" -#include "syscall.h" -#include "compat.h" -#include "compat-errno.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/run.h> +#include <glusterfs/defaults.h> +#include <glusterfs/syscall.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> #include "glusterd.h" #include "glusterd-sm.h" #include "glusterd-op-sm.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c index ad87c1df64f..bdb45314b4f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-locks.c +++ b/xlators/mgmt/glusterd/src/glusterd-locks.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -17,8 +17,8 @@ #include "glusterd-volgen.h" #include "glusterd-locks.h" #include "glusterd-errno.h" -#include "run.h" -#include "syscall.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> #include "glusterd-messages.h" #include <signal.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c index 4742225beb5..a202481d99a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -16,7 +16,7 @@ #include "glusterd-utils.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include <signal.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-mem-types.h b/xlators/mgmt/glusterd/src/glusterd-mem-types.h index c0c4e5e17f6..7a784db0372 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mem-types.h +++ b/xlators/mgmt/glusterd/src/glusterd-mem-types.h @@ -11,7 +11,7 @@ #ifndef __GLUSTERD_MEM_TYPES_H__ #define __GLUSTERD_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> typedef enum gf_gld_mem_types_ { gf_gld_mt_glusterd_conf_t = gf_common_mt_end + 1, diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index 41fedf9e288..1a4bd5499e5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -11,7 +11,7 @@ #ifndef _GLUSTERD_MESSAGES_H_ #define _GLUSTERD_MESSAGES_H_ -#include "glfs-message-id.h" +#include <glusterfs/glfs-message-id.h> /* To add new message IDs, append new identifiers at the end of the list. * diff --git a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c index 356a4bcca67..332ddefd2e9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c +++ b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c @@ -11,21 +11,21 @@ #include <fnmatch.h> #include <pwd.h> -#include "globals.h" -#include "glusterfs.h" -#include "compat.h" -#include "dict.h" -#include "list.h" -#include "logging.h" -#include "syscall.h" -#include "defaults.h" -#include "compat.h" -#include "compat-errno.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/dict.h> +#include <glusterfs/list.h> +#include <glusterfs/logging.h> +#include <glusterfs/syscall.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/run.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-utils.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd-mountbroker.h" #include "glusterd-op-sm.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c index 9bc46a9bb63..36e9052aebe 100644 --- a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" -#include "syscall.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 659d2086089..c43674d3845 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -14,19 +14,19 @@ #include <sys/mount.h> #include <libgen.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "fnmatch.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include "protocol-common.h" #include "glusterd.h" -#include "call-stub.h" -#include "defaults.h" -#include "list.h" -#include "dict.h" -#include "compat.h" -#include "compat-errno.h" -#include "statedump.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/list.h> +#include <glusterfs/dict.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/statedump.h> #include "glusterd-sm.h" #include "glusterd-op-sm.h" #include "glusterd-utils.h" @@ -37,10 +37,10 @@ #include "glusterd-messages.h" #include "glusterd-utils.h" #include "glusterd-quota.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "cli1-xdr.h" -#include "common-utils.h" -#include "run.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/run.h> #include "glusterd-snapshot-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-svc-helper.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index fccc2c22f15..cedd05c0c3e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -11,13 +11,13 @@ #define _GLUSTERD_OP_SM_H_ #include <pthread.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> #include "glusterd.h" #include "protocol-common.h" #include "glusterd-hooks.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c index 9356ec30fb3..5b5959ee721 100644 --- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c @@ -12,7 +12,7 @@ #include "glusterd-store.h" #include "glusterd-server-quorum.h" #include "glusterd-messages.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd-utils.h" void diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c index 27d664567cf..e54596e0001 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.c +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "glusterfs.h" -#include "syscall.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> +#include <glusterfs/compat-errno.h> #include "glusterd.h" #include "glusterd-utils.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.h b/xlators/mgmt/glusterd/src/glusterd-pmap.h index 8a3ebac48a0..ca063ed6a3d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.h +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.h @@ -11,13 +11,13 @@ #define _GLUSTERD_PMAP_H_ #include <pthread.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> #include "rpcsvc.h" struct pmap_port_status { diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c index 200e3056117..36018a05560 100644 --- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c @@ -14,9 +14,9 @@ #include "glusterd.h" #include "glusterd-utils.h" -#include "common-utils.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> #include "glusterd-messages.h" #include "glusterd-proc-mgmt.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index fd500ca606e..010e6beec86 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -18,11 +18,11 @@ #include "glusterd-quotad-svc.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" -#include "run.h" -#include "syscall.h" -#include "byte-order.h" -#include "compat-errno.h" -#include "quota-common-utils.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/quota-common-utils.h> #include "glusterd-quota.h" #include <sys/wait.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c index d93240e230a..fc0aaddcbe3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-rcu.h b/xlators/mgmt/glusterd/src/glusterd-rcu.h index 32ac3bbfd4e..c85f9bea8f8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rcu.h +++ b/xlators/mgmt/glusterd/src/glusterd-rcu.h @@ -21,7 +21,7 @@ #include "rculist-extra.h" #endif -#include "xlator.h" +#include <glusterfs/xlator.h> /* gd_rcu_head is a composite struct, composed of struct rcu_head and a this * pointer, which is used to pass the THIS pointer to call_rcu callbacks. diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index f90d3de9843..63a613eaf97 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -13,11 +13,11 @@ #include <sys/resource.h> #include <sys/statvfs.h> -#include "compat.h" +#include <glusterfs/compat.h> #include "protocol-common.h" -#include "xlator.h" -#include "logging.h" -#include "timer.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/timer.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-sm.h" @@ -25,11 +25,11 @@ #include "glusterd-utils.h" #include "glusterd-messages.h" #include "glusterd-store.h" -#include "run.h" +#include <glusterfs/run.h> #include "glusterd-volgen.h" #include "glusterd-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c index 355391db69f..ca1de1a915f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c @@ -7,10 +7,10 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "glusterd.h" #include "glusterd-op-sm.h" #include "glusterd-geo-rep.h" @@ -23,8 +23,8 @@ #include "glusterd-messages.h" #include "glusterd-server-quorum.h" #include "glusterd-mgmt.h" -#include "run.h" -#include "syscall.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> #include <signal.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c index 83d3128f8f0..cf04ce85541 100644 --- a/xlators/mgmt/glusterd/src/glusterd-reset-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-reset-brick.c @@ -7,10 +7,10 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "glusterd.h" #include "glusterd-op-sm.h" #include "glusterd-geo-rep.h" @@ -22,8 +22,8 @@ #include "glusterd-volgen.h" #include "glusterd-messages.h" #include "glusterd-mgmt.h" -#include "run.h" -#include "syscall.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> #include <signal.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 49a3d3b5a32..728781d4940 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -14,13 +14,13 @@ #include "xdr-generic.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include "glusterd-op-sm.h" #include "glusterd-sm.h" #include "glusterd.h" #include "protocol-common.h" #include "glusterd-utils.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd-messages.h" #include "glusterd-snapshot-utils.h" #include <sys/uio.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c index f7c23ce57c3..eab9078eb8e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c index 66c6419b535..fd334e6aff2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c +++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c index a096649fb44..69e27cbf4dc 100644 --- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c index f9b044fae47..2d2e5c852eb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-sm.c @@ -13,20 +13,20 @@ #include <sys/resource.h> #include <libgen.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "fnmatch.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include "protocol-common.h" #include "glusterd.h" -#include "call-stub.h" -#include "defaults.h" -#include "list.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/list.h> #include "glusterd-messages.h" -#include "dict.h" -#include "compat.h" -#include "compat-errno.h" -#include "statedump.h" +#include <glusterfs/dict.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/statedump.h> #include "glusterd-sm.h" #include "glusterd-op-sm.h" #include "glusterd-utils.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h index 051e83c675d..ce008ac8dfa 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-sm.h @@ -11,17 +11,17 @@ #define _GLUSTERD_SM_H_ #include <pthread.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "rpc-clnt.h" -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> //#include "glusterd.h" #include "rpcsvc.h" -#include "store.h" +#include <glusterfs/store.h> #include "glusterd-rcu.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c index 7f5fa5f0240..56bab0717cd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd-utils.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" @@ -20,7 +20,7 @@ #include "glusterd-snapd-svc.h" #include "glusterd-snapd-svc-helper.h" #include "glusterd-snapshot-utils.h" -#include "syscall.h" +#include <glusterfs/syscall.h> char *snapd_svc_name = "snapd"; diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c index 5a9e198454d..1ece374b2c2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c @@ -16,8 +16,8 @@ #endif #include <dlfcn.h> -#include "dict.h" -#include "syscall.h" +#include <glusterfs/dict.h> +#include <glusterfs/syscall.h> #include "glusterd-op-sm.h" #include "glusterd-utils.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index 48af5e8355a..8f5cd6de2aa 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -35,18 +35,18 @@ #include <regex.h> -#include "compat.h" +#include <glusterfs/compat.h> #include "protocol-common.h" -#include "xlator.h" -#include "logging.h" -#include "timer.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/timer.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-sm.h" #include "glusterd-op-sm.h" #include "glusterd-utils.h" #include "glusterd-store.h" -#include "run.h" +#include <glusterfs/run.h> #include "glusterd-volgen.h" #include "glusterd-mgmt.h" #include "glusterd-syncop.h" @@ -55,12 +55,12 @@ #include "glusterfs3.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "cli1-xdr.h" #include "xdr-generic.h" -#include "lvm-defaults.h" -#include "events.h" +#include <glusterfs/lvm-defaults.h> +#include <glusterfs/events.h> char snap_mount_dir[VALID_GLUSTERD_PATHMAX]; struct snap_create_args_ { diff --git a/xlators/mgmt/glusterd/src/glusterd-statedump.c b/xlators/mgmt/glusterd/src/glusterd-statedump.c index 8c2786cb3f7..f5ecde7ff35 100644 --- a/xlators/mgmt/glusterd/src/glusterd-statedump.c +++ b/xlators/mgmt/glusterd/src/glusterd-statedump.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "statedump.h" +#include <glusterfs/statedump.h> #include "glusterd.h" #include "glusterd-shd-svc.h" #include "glusterd-quotad-svc.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-statedump.h b/xlators/mgmt/glusterd/src/glusterd-statedump.h index 7d7fc1a7fa3..b5ef1f48e82 100644 --- a/xlators/mgmt/glusterd/src/glusterd-statedump.h +++ b/xlators/mgmt/glusterd/src/glusterd-statedump.h @@ -11,7 +11,7 @@ #ifndef _GLUSTERD_STATEDUMP_H_ #define _GLUSTERD_STATEDUMP_H_ -#include "xlator.h" +#include <glusterfs/xlator.h> int glusterd_dump_priv(xlator_t *this); diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 4a967ae7494..7fb5c1715b4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -11,32 +11,32 @@ #include "glusterd-op-sm.h" #include <inttypes.h> -#include "glusterfs.h" -#include "compat.h" -#include "dict.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/dict.h> #include "protocol-common.h" -#include "xlator.h" -#include "logging.h" -#include "timer.h" -#include "syscall.h" -#include "defaults.h" -#include "compat.h" -#include "compat-errno.h" -#include "statedump.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/timer.h> +#include <glusterfs/syscall.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/statedump.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-sm.h" #include "glusterd-op-sm.h" #include "glusterd-utils.h" #include "glusterd-hooks.h" -#include "store.h" +#include <glusterfs/store.h> #include "glusterd-store.h" #include "glusterd-snapshot-utils.h" #include "glusterd-messages.h" #include "rpc-clnt.h" -#include "common-utils.h" -#include "quota-common-utils.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/quota-common-utils.h> #include <sys/resource.h> #include <inttypes.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h index 63e7617b1dc..e60be6e7c91 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.h +++ b/xlators/mgmt/glusterd/src/glusterd-store.h @@ -11,14 +11,14 @@ #define _GLUSTERD_HA_H_ #include <pthread.h> -#include "compat-uuid.h" - -#include "glusterfs.h" -#include "xlator.h" -#include "run.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/compat-uuid.h> + +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/run.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> #include "glusterd.h" #include "rpcsvc.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c index 3007d92f539..ca19a75ba82 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "glusterd-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-shd-svc.h" @@ -22,7 +22,7 @@ #include "glusterd-tierd-svc-helper.h" #include "glusterd-scrub-svc.h" #include "glusterd-svc-helper.h" -#include "syscall.h" +#include <glusterfs/syscall.h> int glusterd_svcs_reconfigure() diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c index 9954605f6e3..4cd4cea15e4 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c @@ -8,16 +8,16 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "glusterd-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-proc-mgmt.h" #include "glusterd-conn-mgmt.h" #include "glusterd-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> int glusterd_svc_create_rundir(char *rundir) diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.h b/xlators/mgmt/glusterd/src/glusterd-syncop.h index 37195ef0112..ce4a940c7a0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.h +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.h @@ -10,7 +10,7 @@ #ifndef __RPC_SYNCOP_H #define __RPC_SYNCOP_H -#include "syncop.h" +#include <glusterfs/syncop.h> #include "glusterd-sm.h" #include "glusterd.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-tier.c b/xlators/mgmt/glusterd/src/glusterd-tier.c index 9cc1b4a225e..dd86cf504ff 100644 --- a/xlators/mgmt/glusterd/src/glusterd-tier.c +++ b/xlators/mgmt/glusterd/src/glusterd-tier.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -17,11 +17,11 @@ #include "glusterd-geo-rep.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" -#include "run.h" -#include "syscall.h" -#include "byte-order.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> +#include <glusterfs/byte-order.h> #include "glusterd-svc-helper.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include "glusterd-tierd-svc.h" #include "glusterd-tierd-svc-helper.h" #include "glusterd-messages.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c index 04a6a2e4965..922eae7018f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c @@ -12,7 +12,7 @@ #include "glusterd-utils.h" #include "glusterd-tierd-svc-helper.h" #include "glusterd-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "glusterd-volgen.h" void diff --git a/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c b/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c index 43438379647..04ceec5d85e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-tierd-svc.c @@ -8,15 +8,15 @@ cases as published by the Free Software Foundation. */ -#include "globals.h" -#include "run.h" +#include <glusterfs/globals.h> +#include <glusterfs/run.h> #include "glusterd.h" #include "glusterd-utils.h" #include "glusterd-volgen.h" #include "glusterd-tierd-svc.h" #include "glusterd-tierd-svc-helper.h" #include "glusterd-svc-helper.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "glusterd-store.h" char *tierd_svc_name = "tierd"; diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index d58121f91e9..477e086509c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -20,20 +20,20 @@ #include <libxml/xmlwriter.h> #endif -#include "glusterfs.h" -#include "compat.h" -#include "dict.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> #include "glusterd-messages.h" -#include "timer.h" -#include "defaults.h" -#include "compat.h" -#include "syncop.h" -#include "run.h" -#include "compat-errno.h" -#include "statedump.h" -#include "syscall.h" +#include <glusterfs/timer.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat.h> +#include <glusterfs/syncop.h> +#include <glusterfs/run.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/statedump.h> +#include <glusterfs/syscall.h> #include "glusterd-mem-types.h" #include "glusterd.h" #include "glusterd-op-sm.h" @@ -43,7 +43,7 @@ #include "glusterd-store.h" #include "glusterd-volgen.h" #include "glusterd-pmap.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> #include "glusterd-syncop.h" #include "glusterd-mgmt.h" #include "glusterd-locks.h" @@ -59,8 +59,8 @@ #include "glusterd-bitd-svc.h" #include "glusterd-gfproxyd-svc.h" #include "glusterd-server-quorum.h" -#include "quota-common-utils.h" -#include "common-utils.h" +#include <glusterfs/quota-common-utils.h> +#include <glusterfs/common-utils.h> #include "xdr-generic.h" #include <sys/resource.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 36f828f1094..9bf19a67528 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -11,13 +11,13 @@ #define _GLUSTERD_UTILS_H #include <pthread.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> #include "glusterd.h" #include "rpc-clnt.h" #include "protocol-common.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 8b4d8adb5d9..d3beb1f68ae 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -13,25 +13,25 @@ #include <dlfcn.h> #include <utime.h> -#include "xlator.h" +#include <glusterfs/xlator.h> #include "glusterd.h" -#include "defaults.h" -#include "syscall.h" -#include "logging.h" -#include "dict.h" -#include "graph-utils.h" -#include "common-utils.h" +#include <glusterfs/defaults.h> +#include <glusterfs/syscall.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/graph-utils.h> +#include <glusterfs/common-utils.h> #include "glusterd-store.h" #include "glusterd-hooks.h" -#include "trie.h" +#include <glusterfs/trie.h> #include "glusterd-mem-types.h" #include "cli1-xdr.h" #include "glusterd-volgen.h" #include "glusterd-geo-rep.h" #include "glusterd-utils.h" #include "glusterd-messages.h" -#include "run.h" -#include "options.h" +#include <glusterfs/run.h> +#include <glusterfs/options.h> #include "glusterd-snapshot-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-svc-helper.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index d8f0c878677..7cfba3d22f7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -11,8 +11,8 @@ #include <lvm2app.h> #endif -#include "common-utils.h" -#include "syscall.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/syscall.h> #include "cli1-xdr.h" #include "xdr-generic.h" #include "glusterd.h" @@ -22,7 +22,7 @@ #include "glusterd-utils.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" -#include "run.h" +#include <glusterfs/run.h> #include "glusterd-snapshot-utils.h" #include "glusterd-svc-mgmt.h" #include "glusterd-svc-helper.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index a3082717c27..a451e18d343 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -14,20 +14,20 @@ #include <sys/resource.h> #include <libgen.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "glusterd.h" #include "rpcsvc.h" #include "fnmatch.h" -#include "xlator.h" -#include "call-stub.h" -#include "defaults.h" -#include "list.h" -#include "dict.h" -#include "options.h" -#include "compat.h" -#include "compat-errno.h" -#include "syscall.h" +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/list.h> +#include <glusterfs/dict.h> +#include <glusterfs/options.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/syscall.h> #include "glusterd-statedump.h" #include "glusterd-sm.h" #include "glusterd-op-sm.h" @@ -43,13 +43,13 @@ #include "glusterd-quotad-svc.h" #include "glusterd-snapd-svc.h" #include "glusterd-messages.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glusterd-geo-rep.h" -#include "run.h" +#include <glusterfs/run.h> #include "rpc-clnt-ping.h" #include "rpc-common-xdr.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "glusterd-mountbroker.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index bbe1c7b535f..75ca9fe367f 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -15,14 +15,14 @@ #include <pthread.h> #include <libgen.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "rpc-clnt.h" -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "call-stub.h" -#include "byte-order.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> #include "glusterd-mem-types.h" #include "rpcsvc.h" #include "glusterd-sm.h" @@ -33,10 +33,10 @@ #include "protocol-common.h" #include "glusterd-pmap.h" #include "cli1-xdr.h" -#include "syncop.h" -#include "store.h" +#include <glusterfs/syncop.h> +#include <glusterfs/store.h> #include "glusterd-rcu.h" -#include "events.h" +#include <glusterfs/events.h> #include "glusterd-gfproxyd-svc.h" #define GLUSTERD_TR_LOG_SIZE 50 |