diff options
669 files changed, 2202 insertions, 2193 deletions
diff --git a/api/src/gfapi-messages.h b/api/src/gfapi-messages.h index 03269a1c9d8..68d12427aea 100644 --- a/api/src/gfapi-messages.h +++ b/api/src/gfapi-messages.h @@ -11,7 +11,7 @@ #ifndef _GFAPI_MESSAGES_H__ #define _GFAPI_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/api/src/glfs-fops.c b/api/src/glfs-fops.c index 302ccc5db07..2a1cc73ccee 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -18,10 +18,10 @@ #include "glfs-internal.h" #include "glfs-mem-types.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "glfs.h" #include "gfapi-messages.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include <limits.h> #include "glusterfs3.h" diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 6a020ca7ab6..3e4e2fb4c52 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -10,7 +10,7 @@ #include "glfs-internal.h" #include "glfs-mem-types.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "glfs.h" #include "glfs-handles.h" #include "gfapi-messages.h" @@ -2267,7 +2267,7 @@ out: GFAPI_SYMVER_PUBLIC(glfs_h_poll_upcall370, glfs_h_poll_upcall, 3.7.0); #ifdef HAVE_ACL_LIBACL_H -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> #include <acl/libacl.h> int diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h index a8d5c59e209..8fdfec8ca02 100644 --- a/api/src/glfs-internal.h +++ b/api/src/glfs-internal.h @@ -11,11 +11,11 @@ #ifndef _GLFS_INTERNAL_H #define _GLFS_INTERNAL_H -#include "xlator.h" -#include "glusterfs.h" -#include "upcall-utils.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/upcall-utils.h> #include "glfs-handles.h" -#include "refcount.h" +#include <glusterfs/refcount.h> #define GLFS_SYMLINK_MAX_FOLLOW 2048 diff --git a/api/src/glfs-master.c b/api/src/glfs-master.c index 969095a8224..5c833b6106c 100644 --- a/api/src/glfs-master.c +++ b/api/src/glfs-master.c @@ -15,8 +15,8 @@ #include <inttypes.h> #include <limits.h> -#include "xlator.h" -#include "glusterfs.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> #include "glfs-internal.h" #include "glfs-mem-types.h" diff --git a/api/src/glfs-mem-types.h b/api/src/glfs-mem-types.h index e1316d128af..bfa325a3ad9 100644 --- a/api/src/glfs-mem-types.h +++ b/api/src/glfs-mem-types.h @@ -11,7 +11,7 @@ #ifndef _GLFS_MEM_TYPES_H #define _GLFS_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> #define GF_MEM_TYPE_START (gf_common_mt_end + 1) diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c index 87b62173689..bf99005cbc3 100644 --- a/api/src/glfs-mgmt.c +++ b/api/src/glfs-mgmt.c @@ -15,11 +15,11 @@ #include <signal.h> #include <pthread.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "glfs.h" -#include "dict.h" -#include "gf-event.h" -#include "defaults.h" +#include <glusterfs/dict.h> +#include <glusterfs/gf-event.h> +#include <glusterfs/defaults.h> #include "rpc-clnt.h" #include "protocol-common.h" @@ -29,13 +29,13 @@ #include "xdr-generic.h" #include "rpc-common-xdr.h" -#include "syncop.h" -#include "xlator.h" +#include <glusterfs/syncop.h> +#include <glusterfs/xlator.h> #include "glfs-internal.h" #include "glfs-mem-types.h" #include "gfapi-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> int glfs_volfile_fetch(struct glfs *fs); diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index 155d3dc538f..a79f4905749 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -15,16 +15,16 @@ #include <inttypes.h> #include <limits.h> -#include "glusterfs.h" -#include "logging.h" -#include "stack.h" -#include "gf-event.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/stack.h> +#include <glusterfs/gf-event.h> #include "glfs-mem-types.h" -#include "common-utils.h" -#include "syncop.h" -#include "call-stub.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/syncop.h> +#include <glusterfs/call-stub.h> #include "gfapi-messages.h" -#include "inode.h" +#include <glusterfs/inode.h> #include "glfs-internal.h" #define graphid_str(subvol) \ diff --git a/api/src/glfs.c b/api/src/glfs.c index 4c951d7b6f1..f9d0937f2b3 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -34,17 +34,17 @@ #include <sys/prctl.h> #endif -#include "glusterfs.h" -#include "logging.h" -#include "stack.h" -#include "gf-event.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/stack.h> +#include <glusterfs/gf-event.h> #include "glfs-mem-types.h" -#include "common-utils.h" -#include "syncop.h" -#include "call-stub.h" -#include "hashfn.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/syncop.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/hashfn.h> #include "rpc-clnt.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include "gfapi-messages.h" #include "glfs.h" diff --git a/cli/src/cli-cmd-global.c b/cli/src/cli-cmd-global.c index e1bedf13542..d0729ac1f0a 100644 --- a/cli/src/cli-cmd-global.c +++ b/cli/src/cli-cmd-global.c @@ -23,9 +23,9 @@ #include "cli-cmd.h" #include "cli-mem-types.h" #include "cli1-xdr.h" -#include "run.h" -#include "syscall.h" -#include "common-utils.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> +#include <glusterfs/common-utils.h> extern rpc_clnt_prog_t *cli_rpc_prog; diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 94deb9125a2..b29b3e9bd29 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -18,8 +18,8 @@ #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" -#include "dict.h" -#include "list.h" +#include <glusterfs/dict.h> +#include <glusterfs/list.h> #include "protocol-common.h" #include "cli1-xdr.h" diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c index ccbd2edde20..6c7a7ea2794 100644 --- a/cli/src/cli-cmd-peer.c +++ b/cli/src/cli-cmd-peer.c @@ -18,7 +18,7 @@ #include "cli-mem-types.h" #include "cli1-xdr.h" #include "protocol-common.h" -#include "events.h" +#include <glusterfs/events.h> extern struct rpc_clnt *global_rpc; diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index ea4484eb3f7..c14faabc4f9 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -23,10 +23,10 @@ #include "cli-cmd.h" #include "cli-mem-types.h" #include "cli1-xdr.h" -#include "run.h" -#include "syscall.h" -#include "common-utils.h" -#include "events.h" +#include <glusterfs/run.h> +#include <glusterfs/syscall.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/events.h> extern struct rpc_clnt *global_rpc; extern struct rpc_clnt *global_quotad_rpc; diff --git a/cli/src/cli-cmd.h b/cli/src/cli-cmd.h index 70c864eae30..b6bc5659936 100644 --- a/cli/src/cli-cmd.h +++ b/cli/src/cli-cmd.h @@ -13,7 +13,7 @@ #include <netdb.h> #include "cli.h" -#include "list.h" +#include <glusterfs/list.h> #define GLUSTER_SHARED_STORAGE "gluster_shared_storage" diff --git a/cli/src/cli-mem-types.h b/cli/src/cli-mem-types.h index a762b685f0a..b42b4dd86c2 100644 --- a/cli/src/cli-mem-types.h +++ b/cli/src/cli-mem-types.h @@ -10,7 +10,7 @@ #ifndef __CLI_MEM_TYPES_H__ #define __CLI_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> #define CLI_MEM_TYPE_START (gf_common_mt_end + 1) diff --git a/cli/src/cli-quotad-client.h b/cli/src/cli-quotad-client.h index 57a998c913c..71a44e5916b 100644 --- a/cli/src/cli-quotad-client.h +++ b/cli/src/cli-quotad-client.h @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ #include "cli.h" -#include "compat-errno.h" -#include "compat.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> #include "cli-cmd.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c index 38aa6f4b7ae..cc327c0b3f5 100644 --- a/cli/src/cli-rl.c +++ b/cli/src/cli-rl.c @@ -17,7 +17,7 @@ #include "cli-cmd.h" #include "cli-mem-types.h" -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include <fnmatch.h> diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 4c212d6cde9..4dcabbdb04b 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -24,7 +24,7 @@ #define REBAL_ESTIMATE_START_TIME 600 #include "cli.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include "cli-cmd.h" #include <sys/uio.h> #include <stdlib.h> @@ -33,18 +33,18 @@ #include "xdr-generic.h" #include "protocol-common.h" #include "cli-mem-types.h" -#include "compat.h" -#include "upcall-utils.h" +#include <glusterfs/compat.h> +#include <glusterfs/upcall-utils.h> -#include "syscall.h" +#include <glusterfs/syscall.h> #include "glusterfs3.h" #include "portmap-xdr.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "cli-quotad-client.h" -#include "run.h" -#include "quota-common-utils.h" -#include "events.h" +#include <glusterfs/run.h> +#include <glusterfs/quota-common-utils.h> +#include <glusterfs/events.h> enum gf_task_types { GF_TASK_TYPE_REBALANCE, GF_TASK_TYPE_REMOVE_BRICK }; diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index fa79066cb3a..b417bb807ba 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -10,10 +10,10 @@ #include <stdlib.h> #include "cli.h" #include "cli1-xdr.h" -#include "run.h" -#include "compat.h" -#include "syscall.h" -#include "upcall-utils.h" +#include <glusterfs/run.h> +#include <glusterfs/compat.h> +#include <glusterfs/syscall.h> +#include <glusterfs/upcall-utils.h> enum gf_task_types { GF_TASK_TYPE_REBALANCE, GF_TASK_TYPE_REMOVE_BRICK }; diff --git a/cli/src/cli.c b/cli/src/cli.c index 99fe6f1612c..dfc0a65d02a 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -44,19 +44,19 @@ #include "cli-cmd.h" #include "cli-mem-types.h" -#include "xlator.h" -#include "glusterfs.h" -#include "compat.h" -#include "logging.h" -#include "dict.h" -#include "list.h" -#include "timer.h" -#include "stack.h" -#include "revision.h" -#include "common-utils.h" -#include "gf-event.h" -#include "syscall.h" -#include "call-stub.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/list.h> +#include <glusterfs/timer.h> +#include <glusterfs/stack.h> +#include <glusterfs/revision.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/gf-event.h> +#include <glusterfs/syscall.h> +#include <glusterfs/call-stub.h> #include <fnmatch.h> #include "xdr-generic.h" diff --git a/cli/src/cli.h b/cli/src/cli.h index 2c2b4355111..5df86d52f81 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -11,10 +11,10 @@ #define __CLI_H__ #include "rpc-clnt.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "protocol-common.h" -#include "logging.h" -#include "quota-common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/quota-common-utils.h> #include "cli1-xdr.h" diff --git a/contrib/fuse-lib/misc.c b/contrib/fuse-lib/misc.c index 266bcc75125..1a9b418e511 100644 --- a/contrib/fuse-lib/misc.c +++ b/contrib/fuse-lib/misc.c @@ -10,7 +10,7 @@ #include <string.h> #include <limits.h> #include <fcntl.h> -#include "glusterfs.h" +#include "glusterfs/glusterfs.h" #include "fuse_kernel.h" #include "fuse-misc.h" diff --git a/contrib/fuse-lib/mount-gluster-compat.h b/contrib/fuse-lib/mount-gluster-compat.h index a16103e0fbb..d3646d08d8e 100644 --- a/contrib/fuse-lib/mount-gluster-compat.h +++ b/contrib/fuse-lib/mount-gluster-compat.h @@ -96,9 +96,9 @@ typedef long long mount_flag_t; #define FREE(ptr) free (ptr) #define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__) #else /* FUSE_UTIL */ -#include "glusterfs.h" -#include "logging.h" -#include "common-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" #define GFFUSE_LOGERR(...) \ gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__) diff --git a/contrib/macfuse/mount_darwin.c b/contrib/macfuse/mount_darwin.c index 21ed7e503a6..d1d1c34e761 100644 --- a/contrib/macfuse/mount_darwin.c +++ b/contrib/macfuse/mount_darwin.c @@ -34,9 +34,9 @@ #include "fuse_param.h" #include "fuse_ioctl.h" -#include "glusterfs.h" -#include "logging.h" -#include "common-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" #define GFFUSE_LOGERR(...) \ gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__) diff --git a/contrib/timer-wheel/timer-wheel.h b/contrib/timer-wheel/timer-wheel.h index baa029ebb30..5637735ec22 100644 --- a/contrib/timer-wheel/timer-wheel.h +++ b/contrib/timer-wheel/timer-wheel.h @@ -17,9 +17,9 @@ #ifndef __TIMER_WHEEL_H #define __TIMER_WHEEL_H -#include "locking.h" +#include "glusterfs/locking.h" -#include "list.h" +#include "glusterfs/list.h" #define TVR_BITS 8 #define TVN_BITS 6 diff --git a/contrib/umountd/umountd.c b/contrib/umountd/umountd.c index 6b9e3c43031..3f933ecb554 100644 --- a/contrib/umountd/umountd.c +++ b/contrib/umountd/umountd.c @@ -23,11 +23,11 @@ #include <sys/stat.h> #include <sys/mount.h> -#include "glusterfs.h" -#include "globals.h" -#include "logging.h" -#include "syscall.h" -#include "mem-types.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/globals.h" +#include "glusterfs/logging.h" +#include "glusterfs/syscall.h" +#include "glusterfs/mem-types.h" static void usage (void) diff --git a/extras/create_new_xlator/new-xlator-tmpl.c b/extras/create_new_xlator/new-xlator-tmpl.c index caa10b374d1..9bb9aa6e4bc 100644 --- a/extras/create_new_xlator/new-xlator-tmpl.c +++ b/extras/create_new_xlator/new-xlator-tmpl.c @@ -113,9 +113,9 @@ xlator_api_t xlator_api = { #include "@XL_NAME@-mem-types.h" #include "@XL_NAME@-messages.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #endif /* __@HFL_NAME@_H__ */ @@ -123,7 +123,7 @@ xlator_api_t xlator_api = { #ifndef __ @HFL_NAME @_H__ #define __ @HFL_NAME @_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_mdc_mem_types_ { gf_ @FOP_PREFIX @_mt_ = gf_common_mt_end + 1, @@ -136,7 +136,7 @@ enum gf_mdc_mem_types_ { #ifndef __ @HFL_NAME @_H__ #define __ @HFL_NAME @_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/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c index b0c5d31ba0b..47dca0413e9 100644 --- a/extras/geo-rep/gsync-sync-gfid.c +++ b/extras/geo-rep/gsync-sync-gfid.c @@ -7,8 +7,8 @@ #include <libgen.h> #include <ctype.h> #include <stdlib.h> -#include "glusterfs.h" -#include "syscall.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> #ifndef UUID_CANONICAL_FORM_LEN #define UUID_CANONICAL_FORM_LEN 36 diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c index cf0e76f69c4..b5aeec5bf33 100644 --- a/geo-replication/src/gsyncd.c +++ b/geo-replication/src/gsyncd.c @@ -7,8 +7,8 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "compat.h" -#include "syscall.h" +#include <glusterfs/compat.h> +#include <glusterfs/syscall.h> #include <stdlib.h> #include <stdio.h> @@ -24,13 +24,13 @@ * We unconditionally pass then while building gsyncd binary. */ #ifdef USE_LIBGLUSTERFS -#include "glusterfs.h" -#include "globals.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/globals.h> +#include <glusterfs/defaults.h> #endif -#include "common-utils.h" -#include "run.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/run.h> #include "procdiggy.h" #define _GLUSTERD_CALLED_ "_GLUSTERD_CALLED_" diff --git a/geo-replication/src/procdiggy.c b/geo-replication/src/procdiggy.c index 05c1e1edc68..6f6ee64bb3a 100644 --- a/geo-replication/src/procdiggy.c +++ b/geo-replication/src/procdiggy.c @@ -15,8 +15,8 @@ #include <ctype.h> #include <sys/param.h> /* for PATH_MAX */ -#include "common-utils.h" -#include "syscall.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/syscall.h> #include "procdiggy.h" pid_t diff --git a/glusterfsd/src/gf_attach.c b/glusterfsd/src/gf_attach.c index 07ec0ed0686..6293b9b6013 100644 --- a/glusterfsd/src/gf_attach.c +++ b/glusterfsd/src/gf_attach.c @@ -13,8 +13,8 @@ #include <unistd.h> //#include "config.h" -#include "glusterfs.h" -#include "globals.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/globals.h> #include "glfs-internal.h" #include "rpc-clnt.h" #include "protocol-common.h" diff --git a/glusterfsd/src/glusterfsd-mem-types.h b/glusterfsd/src/glusterfsd-mem-types.h index 8df01c475cb..e59b558deb0 100644 --- a/glusterfsd/src/glusterfsd-mem-types.h +++ b/glusterfsd/src/glusterfsd-mem-types.h @@ -10,7 +10,7 @@ #ifndef __GLUSTERFSD_MEM_TYPES_H__ #define __GLUSTERFSD_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> #define GF_MEM_TYPE_START (gf_common_mt_end + 1) diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h index 4adc9fd030a..602cd9ecfd5 100644 --- a/glusterfsd/src/glusterfsd-messages.h +++ b/glusterfsd/src/glusterfsd-messages.h @@ -11,7 +11,7 @@ #ifndef _GLUSTERFSD_MESSAGES_H_ #define _GLUSTERFSD_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/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 2ce56f2bb18..6127d4a298d 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -13,10 +13,10 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" -#include "dict.h" -#include "gf-event.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/dict.h> +#include <glusterfs/gf-event.h> +#include <glusterfs/defaults.h> #include "rpc-clnt.h" #include "protocol-common.h" @@ -28,11 +28,11 @@ #include "glusterfsd.h" #include "rpcsvc.h" #include "cli1-xdr.h" -#include "statedump.h" -#include "syncop.h" -#include "xlator.h" -#include "syscall.h" -#include "monitoring.h" +#include <glusterfs/statedump.h> +#include <glusterfs/syncop.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syscall.h> +#include <glusterfs/monitoring.h> #include "server.h" static gf_boolean_t is_mgmt_rpc_reconnect = _gf_false; diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 5bf0db0edfb..6347941f369 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -53,32 +53,32 @@ #endif #endif -#include "xlator.h" -#include "glusterfs.h" -#include "compat.h" -#include "logging.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/logging.h> #include "glusterfsd-messages.h" -#include "dict.h" -#include "list.h" -#include "timer.h" +#include <glusterfs/dict.h> +#include <glusterfs/list.h> +#include <glusterfs/timer.h> #include "glusterfsd.h" -#include "revision.h" -#include "common-utils.h" -#include "gf-event.h" -#include "statedump.h" -#include "latency.h" +#include <glusterfs/revision.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/gf-event.h> +#include <glusterfs/statedump.h> +#include <glusterfs/latency.h> #include "glusterfsd-mem-types.h" -#include "syscall.h" -#include "call-stub.h" +#include <glusterfs/syscall.h> +#include <glusterfs/call-stub.h> #include <fnmatch.h> #include "rpc-clnt.h" -#include "syncop.h" -#include "client_t.h" +#include <glusterfs/syncop.h> +#include <glusterfs/client_t.h> #include "netgroups.h" #include "exports.h" -#include "monitoring.h" +#include <glusterfs/monitoring.h> -#include "daemon.h" +#include <glusterfs/daemon.h> /* using argp for command line parsing */ static char gf_doc[] = ""; diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c index 0ce9defc83a..6030de3e585 100644 --- a/heal/src/glfs-heal.c +++ b/heal/src/glfs-heal.c @@ -15,12 +15,12 @@ #include "glfs-handles.h" #include "glfs-internal.h" #include "protocol-common.h" -#include "syscall.h" -#include "syncop.h" -#include "syncop-utils.h" +#include <glusterfs/syscall.h> +#include <glusterfs/syncop.h> +#include <glusterfs/syncop-utils.h> #include <string.h> #include <time.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include <libgen.h> #if (HAVE_LIB_XML) diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index a910d8e8a53..1d06f1586a9 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -47,20 +47,29 @@ BUILT_SOURCES = graph.lex.c defaults.c eventtypes.h protocol-common.h protocol-common.h: $(top_srcdir)/rpc/rpc-lib/src/protocol-common.h cp $(top_srcdir)/rpc/rpc-lib/src/protocol-common.h . -libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \ - dict.h glusterfs.h hashfn.h timespec.h logging.h xlator.h \ - stack.h timer.h list.h inode.h call-stub.h compat.h fd.h \ - revision.h compat-errno.h gf-event.h mem-pool.h byte-order.h \ - gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h \ - checksum.h daemon.h store.h rbthash.h iatt.h latency.h \ - mem-types.h syncop.h cluster-syncop.h graph-utils.h trie.h \ - refcount.h run.h options.h lkowner.h fd-lk.h circ-buff.h \ - event-history.h gidcache.h client_t.h glusterfs-acl.h \ - glfs-message-id.h template-component-messages.h strfd.h \ - syncop-utils.h parse-utils.h libglusterfs-messages.h \ - lvm-defaults.h quota-common-utils.h rot-buffs.h \ - compat-uuid.h upcall-utils.h throttle-tbf.h events.h\ - compound-fop-utils.h atomic.h monitoring.h +libglusterfs_la_HEADERS = glusterfs/common-utils.h glusterfs/defaults.h \ + glusterfs/default-args.h glusterfs/dict.h glusterfs/glusterfs.h \ + glusterfs/hashfn.h glusterfs/timespec.h glusterfs/logging.h \ + glusterfs/xlator.h glusterfs/stack.h glusterfs/timer.h glusterfs/list.h \ + glusterfs/inode.h glusterfs/call-stub.h glusterfs/compat.h glusterfs/fd.h \ + glusterfs/revision.h glusterfs/compat-errno.h glusterfs/gf-event.h \ + glusterfs/mem-pool.h glusterfs/byte-order.h glusterfs/gf-dirent.h \ + glusterfs/locking.h glusterfs/syscall.h glusterfs/iobuf.h \ + glusterfs/globals.h glusterfs/statedump.h glusterfs/checksum.h \ + glusterfs/daemon.h glusterfs/store.h glusterfs/rbthash.h glusterfs/iatt.h \ + glusterfs/latency.h glusterfs/mem-types.h glusterfs/syncop.h \ + glusterfs/cluster-syncop.h glusterfs/graph-utils.h glusterfs/trie.h \ + glusterfs/refcount.h glusterfs/run.h glusterfs/options.h \ + glusterfs/lkowner.h glusterfs/fd-lk.h glusterfs/circ-buff.h \ + glusterfs/event-history.h glusterfs/gidcache.h glusterfs/client_t.h \ + glusterfs/glusterfs-acl.h glusterfs/glfs-message-id.h \ + glusterfs/template-component-messages.h glusterfs/strfd.h \ + glusterfs/syncop-utils.h glusterfs/parse-utils.h \ + glusterfs/libglusterfs-messages.h glusterfs/lvm-defaults.h \ + glusterfs/quota-common-utils.h glusterfs/rot-buffs.h \ + glusterfs/compat-uuid.h glusterfs/upcall-utils.h glusterfs/throttle-tbf.h \ + glusterfs/events.h glusterfs/compound-fop-utils.h glusterfs/atomic.h \ + glusterfs/monitoring.h libglusterfs_ladir = $(includedir)/glusterfs diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c index 7e2713fa384..96454dfaeb5 100644 --- a/libglusterfs/src/call-stub.c +++ b/libglusterfs/src/call-stub.c @@ -11,9 +11,9 @@ #include <openssl/md5.h> #include <inttypes.h> -#include "call-stub.h" -#include "mem-types.h" -#include "libglusterfs-messages.h" +#include "glusterfs/call-stub.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/libglusterfs-messages.h" static call_stub_t * stub_new(call_frame_t *frame, char wind, glusterfs_fop_t fop) diff --git a/libglusterfs/src/circ-buff.c b/libglusterfs/src/circ-buff.c index cb37ed30ea2..913115c7be1 100644 --- a/libglusterfs/src/circ-buff.c +++ b/libglusterfs/src/circ-buff.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "circ-buff.h" -#include "libglusterfs-messages.h" +#include "glusterfs/circ-buff.h" +#include "glusterfs/libglusterfs-messages.h" void cb_destroy_data(circular_buffer_t *cb, void (*destroy_buffer_data)(void *data)) diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c index 586cbd84e5c..0f98a66a123 100644 --- a/libglusterfs/src/client_t.c +++ b/libglusterfs/src/client_t.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "dict.h" -#include "statedump.h" -#include "client_t.h" -#include "list.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/dict.h" +#include "glusterfs/statedump.h" +#include "glusterfs/client_t.h" +#include "glusterfs/list.h" #include "rpcsvc.h" -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" static int gf_client_chain_client_entries(cliententry_t *entries, uint32_t startidx, diff --git a/libglusterfs/src/cluster-syncop.c b/libglusterfs/src/cluster-syncop.c index dab00577886..5a08f26e48c 100644 --- a/libglusterfs/src/cluster-syncop.c +++ b/libglusterfs/src/cluster-syncop.c @@ -14,8 +14,8 @@ /* NOTE: Cluster-syncop, like syncop blocks the executing thread until the * responses are gathered if it is not executed as part of synctask. So it * shouldn't be invoked in epoll worker thread */ -#include "cluster-syncop.h" -#include "defaults.h" +#include "glusterfs/cluster-syncop.h" +#include "glusterfs/defaults.h" #define FOP_ONLIST(subvols, on, numsubvols, replies, output, frame, fop, \ args...) \ diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 63cbf13388f..51d33e813ce 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -40,19 +40,19 @@ #include <sys/resource.h> #endif -#include "compat-errno.h" -#include "logging.h" -#include "common-utils.h" -#include "revision.h" -#include "glusterfs.h" -#include "stack.h" -#include "lkowner.h" -#include "syscall.h" +#include "glusterfs/compat-errno.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/revision.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/stack.h" +#include "glusterfs/lkowner.h" +#include "glusterfs/syscall.h" #include "cli1-xdr.h" #define XXH_INLINE_ALL #include "xxhash.h" #include <ifaddrs.h> -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" #include "protocol-common.h" #ifdef __FreeBSD__ #include <pthread_np.h> @@ -2281,7 +2281,7 @@ next_token(char **tokenp, token_iter_t *tit) * #include <stdio.h> * #include <stdlib.h> * #include <string.h> - * #include "common-utils.h" + * #include "glusterfs/common-utils.h" * * int * main (int argc, char **argv) diff --git a/libglusterfs/src/compat-errno.c b/libglusterfs/src/compat-errno.c index 5051b75c772..df57e243239 100644 --- a/libglusterfs/src/compat-errno.c +++ b/libglusterfs/src/compat-errno.c @@ -10,7 +10,7 @@ #include <stdint.h> -#include "compat-errno.h" +#include "glusterfs/compat-errno.h" static int32_t gf_error_to_errno_array[1024]; static int32_t gf_errno_to_error_array[1024]; diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c index 137bdf45cab..9826dc089e9 100644 --- a/libglusterfs/src/compat.c +++ b/libglusterfs/src/compat.c @@ -17,16 +17,16 @@ #include <dirent.h> #ifdef GF_SOLARIS_HOST_OS -#include "logging.h" +#include "glusterfs/logging.h" #endif /* GF_SOLARIS_HOST_OS */ -#include "compat.h" -#include "common-utils.h" -#include "iatt.h" -#include "inode.h" -#include "syscall.h" -#include "run.h" -#include "libglusterfs-messages.h" +#include "glusterfs/compat.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/iatt.h" +#include "glusterfs/inode.h" +#include "glusterfs/syscall.h" +#include "glusterfs/run.h" +#include "glusterfs/libglusterfs-messages.h" #ifdef GF_SOLARIS_HOST_OS int diff --git a/libglusterfs/src/compound-fop-utils.c b/libglusterfs/src/compound-fop-utils.c index 8bdb8e8fd5b..a29ff808125 100644 --- a/libglusterfs/src/compound-fop-utils.c +++ b/libglusterfs/src/compound-fop-utils.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" -#include "default-args.h" -#include "mem-types.h" -#include "dict.h" +#include "glusterfs/defaults.h" +#include "glusterfs/default-args.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/dict.h" void compound_args_cleanup(compound_args_t *args) diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c index 7a0e0ad5ea4..4a001c29209 100644 --- a/libglusterfs/src/ctx.c +++ b/libglusterfs/src/ctx.c @@ -10,8 +10,8 @@ #include <pthread.h> -#include "globals.h" -#include "glusterfs.h" +#include "glusterfs/globals.h" +#include "glusterfs/glusterfs.h" #include "timer-wheel.h" glusterfs_ctx_t * diff --git a/libglusterfs/src/daemon.c b/libglusterfs/src/daemon.c index f821f8f7ed0..83ff5fc4a93 100644 --- a/libglusterfs/src/daemon.c +++ b/libglusterfs/src/daemon.c @@ -11,7 +11,7 @@ #include <fcntl.h> #include <unistd.h> #include <stdio.h> -#include "daemon.h" +#include "glusterfs/daemon.h" int os_daemon_return(int nochdir, int noclose) diff --git a/libglusterfs/src/default-args.c b/libglusterfs/src/default-args.c index c92f3d46a86..479974e1637 100644 --- a/libglusterfs/src/default-args.c +++ b/libglusterfs/src/default-args.c @@ -13,8 +13,8 @@ #include "config.h" #endif -#include "xlator.h" -#include "defaults.h" +#include "glusterfs/xlator.h" +#include "glusterfs/defaults.h" int args_lookup_store(default_args_t *args, loc_t *loc, dict_t *xdata) diff --git a/libglusterfs/src/defaults-tmpl.c b/libglusterfs/src/defaults-tmpl.c index bdb30d4872c..97de8193dcb 100644 --- a/libglusterfs/src/defaults-tmpl.c +++ b/libglusterfs/src/defaults-tmpl.c @@ -25,8 +25,8 @@ #include "config.h" #endif -#include "xlator.h" -#include "defaults.h" +#include "glusterfs/xlator.h" +#include "glusterfs/defaults.h" #pragma generate diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index aed35df191e..6d3ed4ba9b3 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -16,18 +16,18 @@ #include <limits.h> #include <fnmatch.h> -#include "glusterfs.h" -#include "common-utils.h" -#include "dict.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/dict.h" #define XXH_INLINE_ALL #include "xxhash.h" -#include "logging.h" -#include "compat.h" -#include "compat-errno.h" -#include "byte-order.h" -#include "globals.h" -#include "statedump.h" -#include "libglusterfs-messages.h" +#include "glusterfs/logging.h" +#include "glusterfs/compat.h" +#include "glusterfs/compat-errno.h" +#include "glusterfs/byte-order.h" +#include "glusterfs/globals.h" +#include "glusterfs/statedump.h" +#include "glusterfs/libglusterfs-messages.h" #include "glusterfs-fops.h" diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c index 041a7e6c583..38acdadbe00 100644 --- a/libglusterfs/src/event-epoll.c +++ b/libglusterfs/src/event-epoll.c @@ -16,12 +16,12 @@ #include <errno.h> #include <string.h> -#include "logging.h" -#include "gf-event.h" -#include "mem-pool.h" -#include "common-utils.h" -#include "syscall.h" -#include "libglusterfs-messages.h" +#include "glusterfs/logging.h" +#include "glusterfs/gf-event.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/syscall.h" +#include "glusterfs/libglusterfs-messages.h" #ifdef HAVE_SYS_EPOLL_H #include <sys/epoll.h> diff --git a/libglusterfs/src/event-history.c b/libglusterfs/src/event-history.c index 4845330f62b..379fed866be 100644 --- a/libglusterfs/src/event-history.c +++ b/libglusterfs/src/event-history.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "event-history.h" -#include "libglusterfs-messages.h" +#include "glusterfs/event-history.h" +#include "glusterfs/libglusterfs-messages.h" eh_t * eh_new(size_t buffer_size, gf_boolean_t use_buffer_once, diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c index 5bac4291c47..735ec2e020c 100644 --- a/libglusterfs/src/event-poll.c +++ b/libglusterfs/src/event-poll.c @@ -16,12 +16,12 @@ #include <errno.h> #include <string.h> -#include "logging.h" -#include "gf-event.h" -#include "mem-pool.h" -#include "common-utils.h" -#include "syscall.h" -#include "libglusterfs-messages.h" +#include "glusterfs/logging.h" +#include "glusterfs/gf-event.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/syscall.h" +#include "glusterfs/libglusterfs-messages.h" struct event_slot_poll { int fd; diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c index ddba9810b0b..d6023133626 100644 --- a/libglusterfs/src/event.c +++ b/libglusterfs/src/event.c @@ -16,12 +16,12 @@ #include <errno.h> #include <string.h> -#include "logging.h" -#include "gf-event.h" -#include "mem-pool.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" -#include "syscall.h" +#include "glusterfs/logging.h" +#include "glusterfs/gf-event.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" +#include "glusterfs/syscall.h" struct event_pool * event_pool_new(int count, int eventthreadcount) diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c index b1fa057b81e..9b3a2268b69 100644 --- a/libglusterfs/src/events.c +++ b/libglusterfs/src/events.c @@ -19,11 +19,11 @@ #include <netinet/in.h> #include <netdb.h> -#include "syscall.h" -#include "mem-pool.h" -#include "glusterfs.h" -#include "globals.h" -#include "events.h" +#include "glusterfs/syscall.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/globals.h" +#include "glusterfs/events.h" #define EVENT_HOST "127.0.0.1" #define EVENT_PORT 24009 diff --git a/libglusterfs/src/fd-lk.c b/libglusterfs/src/fd-lk.c index a6680661be6..c2d34f81c9c 100644 --- a/libglusterfs/src/fd-lk.c +++ b/libglusterfs/src/fd-lk.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "fd-lk.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/fd-lk.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" int32_t _fd_lk_delete_lock(fd_lk_ctx_node_t *lock) diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index 25edcbdd387..44a9ee69d67 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "fd.h" -#include "glusterfs.h" -#include "dict.h" -#include "statedump.h" -#include "libglusterfs-messages.h" +#include "glusterfs/fd.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/dict.h" +#include "glusterfs/statedump.h" +#include "glusterfs/libglusterfs-messages.h" static int gf_fd_fdtable_expand(fdtable_t *fdtable, uint32_t nr); diff --git a/libglusterfs/src/gf-dirent.c b/libglusterfs/src/gf-dirent.c index c06e959aeba..f289723359e 100644 --- a/libglusterfs/src/gf-dirent.c +++ b/libglusterfs/src/gf-dirent.c @@ -11,9 +11,9 @@ #include <stdio.h> #include <string.h> #include <stdint.h> -#include "compat.h" -#include "xlator.h" -#include "syncop.h" +#include "glusterfs/compat.h" +#include "glusterfs/xlator.h" +#include "glusterfs/syncop.h" #define ONE 1ULL #define PRESENT_D_OFF_BITS 63 diff --git a/libglusterfs/src/gfdb/gfdb_data_store.c b/libglusterfs/src/gfdb/gfdb_data_store.c index ab56a51d462..02894cf7785 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store.c +++ b/libglusterfs/src/gfdb/gfdb_data_store.c @@ -10,8 +10,8 @@ #include "gfdb_sqlite3.h" #include "gfdb_data_store.h" -#include "list.h" -#include "libglusterfs-messages.h" +#include "glusterfs/list.h" +#include "glusterfs/libglusterfs-messages.h" /****************************************************************************** * diff --git a/libglusterfs/src/gfdb/gfdb_data_store.h b/libglusterfs/src/gfdb/gfdb_data_store.h index 59f7bd01ab3..55b2fb1bc55 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store.h +++ b/libglusterfs/src/gfdb/gfdb_data_store.h @@ -10,10 +10,10 @@ #ifndef __GFDB_DATA_STORE_H #define __GFDB_DATA_STORE_H -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/xlator.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" #include <time.h> #include <sys/time.h> diff --git a/libglusterfs/src/gfdb/gfdb_data_store_helper.c b/libglusterfs/src/gfdb/gfdb_data_store_helper.c index b1f79bc8dad..5f33312ad9b 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_helper.c +++ b/libglusterfs/src/gfdb/gfdb_data_store_helper.c @@ -1,6 +1,6 @@ #include "gfdb_data_store_helper.h" -#include "syscall.h" +#include "glusterfs/syscall.h" /****************************************************************************** * diff --git a/libglusterfs/src/gfdb/gfdb_data_store_helper.h b/libglusterfs/src/gfdb/gfdb_data_store_helper.h index 7b4b0ae6aa1..3c4499bdd3b 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_helper.h +++ b/libglusterfs/src/gfdb/gfdb_data_store_helper.h @@ -15,12 +15,12 @@ #include <string.h> #include <fcntl.h> -#include "common-utils.h" -#include "compat-uuid.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/compat-uuid.h" #include "gfdb_mem-types.h" -#include "dict.h" -#include "byte-order.h" -#include "libglusterfs-messages.h" +#include "glusterfs/dict.h" +#include "glusterfs/byte-order.h" +#include "glusterfs/libglusterfs-messages.h" #define GFDB_DATA_STORE "gfdbdatastore" diff --git a/libglusterfs/src/gfdb/gfdb_mem-types.h b/libglusterfs/src/gfdb/gfdb_mem-types.h index 0ea543b7ce1..b97cdf89446 100644 --- a/libglusterfs/src/gfdb/gfdb_mem-types.h +++ b/libglusterfs/src/gfdb/gfdb_mem-types.h @@ -11,7 +11,7 @@ #ifndef __GFDB_MEM_TYPES_H__ #define __GFDB_MEM_TYPES_H__ -#include "mem-types.h" +#include "glusterfs/mem-types.h" enum gfdb_mem_types_ { gfdb_mtstart = gf_common_mt_end + 1, gfdb_mt_end }; #endif diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 63957278e8a..98232d5e379 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -10,8 +10,8 @@ #include "gfdb_sqlite3.h" #include "gfdb_sqlite3_helper.h" -#include "libglusterfs-messages.h" -#include "syscall.h" +#include "glusterfs/libglusterfs-messages.h" +#include "glusterfs/syscall.h" /****************************************************************************** * diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.h b/libglusterfs/src/gfdb/gfdb_sqlite3.h index d8af800db3c..d8240e905f7 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.h +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.h @@ -13,10 +13,10 @@ /*Sqlite3 header file*/ #include <sqlite3.h> -#include "logging.h" +#include "glusterfs/logging.h" #include "gfdb_data_store_types.h" #include "gfdb_mem-types.h" -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" #define GF_STMT_SIZE_MAX 2048 diff --git a/libglusterfs/src/gidcache.c b/libglusterfs/src/gidcache.c index b9fdb9a39be..87147163e9e 100644 --- a/libglusterfs/src/gidcache.c +++ b/libglusterfs/src/gidcache.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "gidcache.h" -#include "mem-pool.h" +#include "glusterfs/gidcache.h" +#include "glusterfs/mem-pool.h" /* * We treat this as a very simple set-associative LRU cache, with entries aged diff --git a/libglusterfs/src/globals.c b/libglusterfs/src/globals.c index 98990460c86..35482545ab3 100644 --- a/libglusterfs/src/globals.c +++ b/libglusterfs/src/globals.c @@ -10,13 +10,13 @@ #include <pthread.h> -#include "glusterfs.h" -#include "globals.h" -#include "xlator.h" -#include "mem-pool.h" -#include "syncop.h" -#include "libglusterfs-messages.h" -#include "upcall-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/globals.h" +#include "glusterfs/xlator.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/syncop.h" +#include "glusterfs/libglusterfs-messages.h" +#include "glusterfs/upcall-utils.h" const char *gf_fop_list[GF_FOP_MAXVALUE] = { [GF_FOP_NULL] = "NULL", diff --git a/libglusterfs/src/atomic.h b/libglusterfs/src/glusterfs/atomic.h index dbbdc309628..ced81748218 100644 --- a/libglusterfs/src/atomic.h +++ b/libglusterfs/src/glusterfs/atomic.h @@ -14,7 +14,7 @@ #include <inttypes.h> #include <stdbool.h> -#include "locking.h" +#include "glusterfs/locking.h" /* Macros used to join two arguments and generate a new macro name. */ #define GF_ATOMIC_MACRO_1(_macro) _macro diff --git a/libglusterfs/src/byte-order.h b/libglusterfs/src/glusterfs/byte-order.h index fd8cef9e58d..fd8cef9e58d 100644 --- a/libglusterfs/src/byte-order.h +++ b/libglusterfs/src/glusterfs/byte-order.h diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/glusterfs/call-stub.h index 815ea312c93..bfed0fbc14a 100644 --- a/libglusterfs/src/call-stub.h +++ b/libglusterfs/src/glusterfs/call-stub.h @@ -11,11 +11,11 @@ #ifndef _CALL_STUB_H_ #define _CALL_STUB_H_ -#include "xlator.h" -#include "defaults.h" -#include "default-args.h" -#include "stack.h" -#include "list.h" +#include "glusterfs/xlator.h" +#include "glusterfs/defaults.h" +#include "glusterfs/default-args.h" +#include "glusterfs/stack.h" +#include "glusterfs/list.h" typedef struct _call_stub { struct list_head list; diff --git a/libglusterfs/src/checksum.h b/libglusterfs/src/glusterfs/checksum.h index 019bb14df71..019bb14df71 100644 --- a/libglusterfs/src/checksum.h +++ b/libglusterfs/src/glusterfs/checksum.h diff --git a/libglusterfs/src/circ-buff.h b/libglusterfs/src/glusterfs/circ-buff.h index a839cd03c67..4453b8487cd 100644 --- a/libglusterfs/src/circ-buff.h +++ b/libglusterfs/src/glusterfs/circ-buff.h @@ -11,9 +11,9 @@ #ifndef _CB_H #define _CB_H -#include "common-utils.h" -#include "logging.h" -#include "mem-types.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/logging.h" +#include "glusterfs/mem-types.h" #define BUFFER_SIZE 10 #define TOTAL_SIZE BUFFER_SIZE + 1 diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/glusterfs/client_t.h index 57241a00d5f..29f50daf03b 100644 --- a/libglusterfs/src/client_t.h +++ b/libglusterfs/src/glusterfs/client_t.h @@ -11,9 +11,9 @@ #ifndef _CLIENT_T_H #define _CLIENT_T_H -#include "glusterfs.h" -#include "locking.h" /* for gf_lock_t, not included by glusterfs.h */ -#include "atomic.h" /* for gf_atomic_t */ +#include "glusterfs/glusterfs.h" +#include "glusterfs/locking.h" /* for gf_lock_t, not included by glusterfs.h */ +#include "glusterfs/atomic.h" /* for gf_atomic_t */ struct client_ctx { void *ctx_key; diff --git a/libglusterfs/src/cluster-syncop.h b/libglusterfs/src/glusterfs/cluster-syncop.h index 10388db74cc..cfd3c338683 100644 --- a/libglusterfs/src/cluster-syncop.h +++ b/libglusterfs/src/glusterfs/cluster-syncop.h @@ -11,13 +11,13 @@ #ifndef _CLUSTER_SYNCOP_H #define _CLUSTER_SYNCOP_H -#include "xlator.h" +#include "glusterfs/xlator.h" #include <sys/time.h> #include <pthread.h> #include <ucontext.h> -#include "defaults.h" -#include "default-args.h" -#include "syncop.h" +#include "glusterfs/defaults.h" +#include "glusterfs/default-args.h" +#include "glusterfs/syncop.h" /********************************************************************* * diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h index f0762566313..075a355f786 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/glusterfs/common-utils.h @@ -38,15 +38,15 @@ trap(void); /* To solve type punned error */ #define VOID(ptr) ((void **)((void *)ptr)) -#include "logging.h" -#include "glusterfs.h" -#include "locking.h" -#include "mem-pool.h" -#include "compat-uuid.h" -#include "iatt.h" -#include "libglusterfs-messages.h" +#include "glusterfs/logging.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/locking.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/compat-uuid.h" +#include "glusterfs/iatt.h" +#include "glusterfs/libglusterfs-messages.h" #include "protocol-common.h" -#include "iobuf.h" +#include "glusterfs/iobuf.h" #define STRINGIFY(val) #val #define TOSTRING(val) STRINGIFY(val) diff --git a/libglusterfs/src/compat-errno.h b/libglusterfs/src/glusterfs/compat-errno.h index c4ab09ab0d5..c4ab09ab0d5 100644 --- a/libglusterfs/src/compat-errno.h +++ b/libglusterfs/src/glusterfs/compat-errno.h diff --git a/libglusterfs/src/compat-uuid.h b/libglusterfs/src/glusterfs/compat-uuid.h index 6e7fdefbfab..6e7fdefbfab 100644 --- a/libglusterfs/src/compat-uuid.h +++ b/libglusterfs/src/glusterfs/compat-uuid.h diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/glusterfs/compat.h index 38c07b5ae7c..38c07b5ae7c 100644 --- a/libglusterfs/src/compat.h +++ b/libglusterfs/src/glusterfs/compat.h diff --git a/libglusterfs/src/compound-fop-utils.h b/libglusterfs/src/glusterfs/compound-fop-utils.h index 23a2f0df3fd..1226e328704 100644 --- a/libglusterfs/src/compound-fop-utils.h +++ b/libglusterfs/src/glusterfs/compound-fop-utils.h @@ -11,10 +11,10 @@ #ifndef __COMPOUND_FOP_UTILS_H__ #define __COMPOUND_FOP_UTILS_H__ -#include "defaults.h" -#include "default-args.h" -#include "mem-types.h" -#include "dict.h" +#include "glusterfs/defaults.h" +#include "glusterfs/default-args.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/dict.h" #define COMPOUND_PACK_ARGS(fop, fop_enum, args, counter, params...) \ do { \ diff --git a/libglusterfs/src/daemon.h b/libglusterfs/src/glusterfs/daemon.h index 48850800b5e..48850800b5e 100644 --- a/libglusterfs/src/daemon.h +++ b/libglusterfs/src/glusterfs/daemon.h diff --git a/libglusterfs/src/default-args.h b/libglusterfs/src/glusterfs/default-args.h index e5915c4c05e..f15f558202b 100644 --- a/libglusterfs/src/default-args.h +++ b/libglusterfs/src/glusterfs/default-args.h @@ -15,7 +15,7 @@ #ifndef _DEFAULT_ARGS_H #define _DEFAULT_ARGS_H -#include "xlator.h" +#include "glusterfs/xlator.h" int args_lookup_cbk_store(default_args_cbk_t *args, int32_t op_ret, diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/glusterfs/defaults.h index 8583935e069..5d6b8e28a51 100644 --- a/libglusterfs/src/defaults.h +++ b/libglusterfs/src/glusterfs/defaults.h @@ -15,7 +15,7 @@ #ifndef _DEFAULTS_H #define _DEFAULTS_H -#include "xlator.h" +#include "glusterfs/xlator.h" typedef struct { int op_ret; diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/glusterfs/dict.h index 6cbf0ce5a54..161362bb5cb 100644 --- a/libglusterfs/src/dict.h +++ b/libglusterfs/src/glusterfs/dict.h @@ -15,8 +15,8 @@ #include <sys/uio.h> #include <pthread.h> -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" typedef struct _data data_t; typedef struct _dict dict_t; diff --git a/libglusterfs/src/event-history.h b/libglusterfs/src/glusterfs/event-history.h index 5f0776ba9b0..c1af8934c03 100644 --- a/libglusterfs/src/event-history.h +++ b/libglusterfs/src/glusterfs/event-history.h @@ -11,8 +11,8 @@ #ifndef _EH_H #define _EH_H -#include "mem-types.h" -#include "circ-buff.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/circ-buff.h" struct event_hist { buffer_t *buffer; diff --git a/libglusterfs/src/events.h b/libglusterfs/src/glusterfs/events.h index 74c5326427b..74c5326427b 100644 --- a/libglusterfs/src/events.h +++ b/libglusterfs/src/glusterfs/events.h diff --git a/libglusterfs/src/fd-lk.h b/libglusterfs/src/glusterfs/fd-lk.h index 735f05ec46c..6465e6d3f58 100644 --- a/libglusterfs/src/fd-lk.h +++ b/libglusterfs/src/glusterfs/fd-lk.h @@ -11,14 +11,14 @@ #ifndef _FD_LK_H #define _FD_LK_H -#include "fd.h" -#include "locking.h" -#include "list.h" -#include "logging.h" -#include "mem-pool.h" -#include "mem-types.h" -#include "glusterfs.h" -#include "common-utils.h" +#include "glusterfs/fd.h" +#include "glusterfs/locking.h" +#include "glusterfs/list.h" +#include "glusterfs/logging.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/common-utils.h" #define get_lk_type(type) \ type == F_UNLCK ? "F_UNLCK" : (type == F_RDLCK ? "F_RDLCK" : "F_WRLCK") diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/glusterfs/fd.h index e885ecb7786..cdbe2894bc3 100644 --- a/libglusterfs/src/fd.h +++ b/libglusterfs/src/glusterfs/fd.h @@ -11,13 +11,13 @@ #ifndef _FD_H #define _FD_H -#include "list.h" +#include "glusterfs/list.h" #include <sys/types.h> #include <unistd.h> -#include "glusterfs.h" -#include "locking.h" -#include "fd-lk.h" -#include "common-utils.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/locking.h" +#include "glusterfs/fd-lk.h" +#include "glusterfs/common-utils.h" #define GF_ANON_FD_NO -2 #define GF_ANON_FD_FLAGS (O_RDWR | O_LARGEFILE) @@ -77,8 +77,8 @@ typedef struct _fdtable fdtable_t; */ #define GF_FDENTRY_ALLOCATED -2 -#include "logging.h" -#include "xlator.h" +#include "glusterfs/logging.h" +#include "glusterfs/xlator.h" void gf_fd_put(fdtable_t *fdtable, int32_t fd); diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/glusterfs/gf-dirent.h index 95403e9eabd..e358da30f58 100644 --- a/libglusterfs/src/gf-dirent.h +++ b/libglusterfs/src/glusterfs/gf-dirent.h @@ -11,8 +11,8 @@ #ifndef _GF_DIRENT_H #define _GF_DIRENT_H -#include "iatt.h" -#include "inode.h" +#include "glusterfs/iatt.h" +#include "glusterfs/inode.h" #define gf_dirent_size(name) (sizeof(gf_dirent_t) + strlen(name) + 1) diff --git a/libglusterfs/src/gf-event.h b/libglusterfs/src/glusterfs/gf-event.h index 5d92a2dd285..5d92a2dd285 100644 --- a/libglusterfs/src/gf-event.h +++ b/libglusterfs/src/glusterfs/gf-event.h diff --git a/libglusterfs/src/gidcache.h b/libglusterfs/src/glusterfs/gidcache.h index 3a7de47dec7..ddaabd765b5 100644 --- a/libglusterfs/src/gidcache.h +++ b/libglusterfs/src/glusterfs/gidcache.h @@ -11,8 +11,8 @@ #ifndef __GIDCACHE_H__ #define __GIDCACHE_H__ -#include "glusterfs.h" -#include "locking.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/locking.h" /* * TBD: make the cache size tunable diff --git a/libglusterfs/src/glfs-message-id.h b/libglusterfs/src/glusterfs/glfs-message-id.h index 001f4abdf67..001f4abdf67 100644 --- a/libglusterfs/src/glfs-message-id.h +++ b/libglusterfs/src/glusterfs/glfs-message-id.h diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/glusterfs/globals.h index 4fbe22b2c28..9a2f5324afc 100644 --- a/libglusterfs/src/globals.h +++ b/libglusterfs/src/glusterfs/globals.h @@ -115,8 +115,8 @@ #define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0 -#include "xlator.h" -#include "options.h" +#include "glusterfs/xlator.h" +#include "glusterfs/options.h" /* THIS */ #define THIS (*__glusterfs_this_location()) diff --git a/libglusterfs/src/glusterfs-acl.h b/libglusterfs/src/glusterfs/glusterfs-acl.h index 8c731fc771b..cae55e8062f 100644 --- a/libglusterfs/src/glusterfs-acl.h +++ b/libglusterfs/src/glusterfs/glusterfs-acl.h @@ -24,7 +24,7 @@ #include <stdint.h> #include <sys/types.h> /* For uid_t */ -#include "locking.h" /* For gf_lock_t in struct posix_acl_conf */ +#include "glusterfs/locking.h" /* For gf_lock_t in struct posix_acl_conf */ #define ACL_PROGRAM 100227 #define ACLV3_VERSION 3 diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs/glusterfs.h index 305635fe078..908a0ce774f 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs/glusterfs.h @@ -45,13 +45,13 @@ #define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v)) #endif -#include "list.h" -#include "locking.h" -#include "logging.h" -#include "lkowner.h" -#include "compat-uuid.h" -#include "refcount.h" -#include "atomic.h" +#include "glusterfs/list.h" +#include "glusterfs/locking.h" +#include "glusterfs/logging.h" +#include "glusterfs/lkowner.h" +#include "glusterfs/compat-uuid.h" +#include "glusterfs/refcount.h" +#include "glusterfs/atomic.h" #define GF_YES 1 #define GF_NO 0 diff --git a/libglusterfs/src/graph-utils.h b/libglusterfs/src/glusterfs/graph-utils.h index c0e87268c5c..c0e87268c5c 100644 --- a/libglusterfs/src/graph-utils.h +++ b/libglusterfs/src/glusterfs/graph-utils.h diff --git a/libglusterfs/src/hashfn.h b/libglusterfs/src/glusterfs/hashfn.h index a4cb33f072a..a4cb33f072a 100644 --- a/libglusterfs/src/hashfn.h +++ b/libglusterfs/src/glusterfs/hashfn.h diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/glusterfs/iatt.h index db366472970..339c84ccc45 100644 --- a/libglusterfs/src/iatt.h +++ b/libglusterfs/src/glusterfs/iatt.h @@ -18,8 +18,8 @@ #include <sys/stat.h> /* for iatt <--> stat conversions */ #include <unistd.h> -#include "compat.h" -#include "compat-uuid.h" +#include "glusterfs/compat.h" +#include "glusterfs/compat-uuid.h" typedef enum { IA_INVAL = 0, diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/glusterfs/inode.h index 5745ea643a3..5934373ec5b 100644 --- a/libglusterfs/src/inode.h +++ b/libglusterfs/src/glusterfs/inode.h @@ -28,10 +28,10 @@ typedef struct _inode inode_t; struct _dentry; typedef struct _dentry dentry_t; -#include "list.h" -#include "iatt.h" -#include "compat-uuid.h" -#include "fd.h" +#include "glusterfs/list.h" +#include "glusterfs/iatt.h" +#include "glusterfs/compat-uuid.h" +#include "glusterfs/fd.h" struct _inode_table { pthread_mutex_t lock; diff --git a/libglusterfs/src/iobuf.h b/libglusterfs/src/glusterfs/iobuf.h index 41ac5dd191c..6de0f13ae36 100644 --- a/libglusterfs/src/iobuf.h +++ b/libglusterfs/src/glusterfs/iobuf.h @@ -11,8 +11,8 @@ #ifndef _IOBUF_H_ #define _IOBUF_H_ -#include "list.h" -#include "common-utils.h" +#include "glusterfs/list.h" +#include "glusterfs/common-utils.h" #include <pthread.h> #include <sys/mman.h> #include <sys/uio.h> diff --git a/libglusterfs/src/latency.h b/libglusterfs/src/glusterfs/latency.h index 063ea291ee2..ed47b1f0cbc 100644 --- a/libglusterfs/src/latency.h +++ b/libglusterfs/src/glusterfs/latency.h @@ -11,7 +11,7 @@ #ifndef __LATENCY_H__ #define __LATENCY_H__ -#include "glusterfs.h" +#include "glusterfs/glusterfs.h" typedef struct fop_latency { double min; /* min time for the call (microseconds) */ diff --git a/libglusterfs/src/libglusterfs-messages.h b/libglusterfs/src/glusterfs/libglusterfs-messages.h index d40d644fad9..1b72f6df5be 100644 --- a/libglusterfs/src/libglusterfs-messages.h +++ b/libglusterfs/src/glusterfs/libglusterfs-messages.h @@ -11,7 +11,7 @@ #ifndef _LG_MESSAGES_H_ #define _LG_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/libglusterfs/src/list.h b/libglusterfs/src/glusterfs/list.h index 221a710ca30..221a710ca30 100644 --- a/libglusterfs/src/list.h +++ b/libglusterfs/src/glusterfs/list.h diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/glusterfs/lkowner.h index b49e9af6bcb..b49e9af6bcb 100644 --- a/libglusterfs/src/lkowner.h +++ b/libglusterfs/src/glusterfs/lkowner.h diff --git a/libglusterfs/src/locking.h b/libglusterfs/src/glusterfs/locking.h index 43cc87735d1..43cc87735d1 100644 --- a/libglusterfs/src/locking.h +++ b/libglusterfs/src/glusterfs/locking.h diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/glusterfs/logging.h index 859050d568b..c81e19bef32 100644 --- a/libglusterfs/src/logging.h +++ b/libglusterfs/src/glusterfs/logging.h @@ -16,7 +16,7 @@ #include <stdio.h> #include <stdarg.h> #include <pthread.h> -#include "list.h" +#include "glusterfs/list.h" #ifdef GF_DARWIN_HOST_OS #define GF_PRI_FSBLK "u" diff --git a/libglusterfs/src/lvm-defaults.h b/libglusterfs/src/glusterfs/lvm-defaults.h index 32feebf3f6e..32feebf3f6e 100644 --- a/libglusterfs/src/lvm-defaults.h +++ b/libglusterfs/src/glusterfs/lvm-defaults.h diff --git a/libglusterfs/src/mem-pool.h b/libglusterfs/src/glusterfs/mem-pool.h index 118170fd17f..1c7e868ab75 100644 --- a/libglusterfs/src/mem-pool.h +++ b/libglusterfs/src/glusterfs/mem-pool.h @@ -11,12 +11,12 @@ #ifndef _MEM_POOL_H_ #define _MEM_POOL_H_ -#include "list.h" -#include "locking.h" -#include "atomic.h" -#include "logging.h" -#include "mem-types.h" -#include "glusterfs.h" /* for glusterfs_ctx_t */ +#include "glusterfs/list.h" +#include "glusterfs/locking.h" +#include "glusterfs/atomic.h" +#include "glusterfs/logging.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/glusterfs.h" /* for glusterfs_ctx_t */ #include <stdlib.h> #include <inttypes.h> #include <string.h> diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/glusterfs/mem-types.h index 4f6ca4e0e84..4f6ca4e0e84 100644 --- a/libglusterfs/src/mem-types.h +++ b/libglusterfs/src/glusterfs/mem-types.h diff --git a/libglusterfs/src/monitoring.h b/libglusterfs/src/glusterfs/monitoring.h index 7826d4ec4df..09d9f54e734 100644 --- a/libglusterfs/src/monitoring.h +++ b/libglusterfs/src/glusterfs/monitoring.h @@ -11,7 +11,7 @@ #ifndef __MONITORING_H__ #define __MONITORING_H__ -#include "glusterfs.h" +#include "glusterfs/glusterfs.h" #define GLUSTER_METRICS_DIR "/var/run/gluster/metrics" diff --git a/libglusterfs/src/options.h b/libglusterfs/src/glusterfs/options.h index e8600f14f56..0e683d780df 100644 --- a/libglusterfs/src/options.h +++ b/libglusterfs/src/glusterfs/options.h @@ -15,8 +15,8 @@ #include <stdint.h> #include <inttypes.h> -#include "xlator.h" -#include "libglusterfs-messages.h" +#include "glusterfs/xlator.h" +#include "glusterfs/libglusterfs-messages.h" /* Add possible new type of option you may need */ typedef enum { GF_OPTION_TYPE_ANY = 0, diff --git a/libglusterfs/src/parse-utils.h b/libglusterfs/src/glusterfs/parse-utils.h index 8653b9dd180..8653b9dd180 100644 --- a/libglusterfs/src/parse-utils.h +++ b/libglusterfs/src/glusterfs/parse-utils.h diff --git a/libglusterfs/src/quota-common-utils.h b/libglusterfs/src/glusterfs/quota-common-utils.h index 49f238b31f3..0096e340756 100644 --- a/libglusterfs/src/quota-common-utils.h +++ b/libglusterfs/src/glusterfs/quota-common-utils.h @@ -11,7 +11,7 @@ #ifndef _QUOTA_COMMON_UTILS_H #define _QUOTA_COMMON_UTILS_H -#include "iatt.h" +#include "glusterfs/iatt.h" #define GF_QUOTA_CONF_VERSION 1.2 #define QUOTA_CONF_HEADER "GlusterFS Quota conf | version: v1.2\n" diff --git a/libglusterfs/src/rbthash.h b/libglusterfs/src/glusterfs/rbthash.h index dea4648ca5a..3327ebf73c5 100644 --- a/libglusterfs/src/rbthash.h +++ b/libglusterfs/src/glusterfs/rbthash.h @@ -11,11 +11,11 @@ #ifndef __RBTHASH_TABLE_H_ #define __RBTHASH_TABLE_H_ #include "rb.h" -#include "locking.h" -#include "mem-pool.h" -#include "logging.h" -#include "common-utils.h" -#include "list.h" +#include "glusterfs/locking.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/list.h" #include <pthread.h> diff --git a/libglusterfs/src/refcount.h b/libglusterfs/src/glusterfs/refcount.h index 6a3a73d80e8..cf922dabb05 100644 --- a/libglusterfs/src/refcount.h +++ b/libglusterfs/src/glusterfs/refcount.h @@ -22,7 +22,7 @@ #undef REFCOUNT_NEEDS_LOCK #else #define REFCOUNT_NEEDS_LOCK -#include "locking.h" +#include "glusterfs/locking.h" #endif /* compiler support for __sync_*_and_fetch() */ typedef void (*gf_ref_release_t)(void *data); diff --git a/libglusterfs/src/revision.h b/libglusterfs/src/glusterfs/revision.h index 3c404d30e78..3c404d30e78 100644 --- a/libglusterfs/src/revision.h +++ b/libglusterfs/src/glusterfs/revision.h diff --git a/libglusterfs/src/rot-buffs.h b/libglusterfs/src/glusterfs/rot-buffs.h index 1e91e83ecf0..9dc227d58b8 100644 --- a/libglusterfs/src/rot-buffs.h +++ b/libglusterfs/src/glusterfs/rot-buffs.h @@ -11,9 +11,9 @@ #ifndef __ROT_BUFFS_H #define __ROT_BUFFS_H -#include "list.h" -#include "locking.h" -#include "common-utils.h" +#include "glusterfs/list.h" +#include "glusterfs/locking.h" +#include "glusterfs/common-utils.h" typedef struct rbuf_iovec { struct iovec iov; diff --git a/libglusterfs/src/run.h b/libglusterfs/src/glusterfs/run.h index 76af95fd27f..76af95fd27f 100644 --- a/libglusterfs/src/run.h +++ b/libglusterfs/src/glusterfs/run.h diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/glusterfs/stack.h index cda04dfdb29..17585508a22 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/glusterfs/stack.h @@ -25,14 +25,14 @@ typedef struct call_pool call_pool_t; #include <sys/time.h> -#include "xlator.h" -#include "dict.h" -#include "list.h" -#include "common-utils.h" -#include "lkowner.h" -#include "client_t.h" -#include "libglusterfs-messages.h" -#include "timespec.h" +#include "glusterfs/xlator.h" +#include "glusterfs/dict.h" +#include "glusterfs/list.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/lkowner.h" +#include "glusterfs/client_t.h" +#include "glusterfs/libglusterfs-messages.h" +#include "glusterfs/timespec.h" #define NFS_PID 1 #define LOW_PRIO_PROC_PID -1 diff --git a/libglusterfs/src/statedump.h b/libglusterfs/src/glusterfs/statedump.h index af653041493..89d04f94587 100644 --- a/libglusterfs/src/statedump.h +++ b/libglusterfs/src/glusterfs/statedump.h @@ -12,8 +12,8 @@ #define STATEDUMP_H #include <stdarg.h> -#include "inode.h" -#include "strfd.h" +#include "glusterfs/inode.h" +#include "glusterfs/strfd.h" #define GF_DUMP_MAX_BUF_LEN 4096 diff --git a/libglusterfs/src/store.h b/libglusterfs/src/glusterfs/store.h index d69e39a7ce3..3b3a24c38f8 100644 --- a/libglusterfs/src/store.h +++ b/libglusterfs/src/glusterfs/store.h @@ -10,8 +10,8 @@ #ifndef _GLUSTERD_STORE_H_ #define _GLUSTERD_STORE_H_ -#include "compat.h" -#include "glusterfs.h" +#include "glusterfs/compat.h" +#include "glusterfs/glusterfs.h" struct gf_store_handle_ { char *path; diff --git a/libglusterfs/src/strfd.h b/libglusterfs/src/glusterfs/strfd.h index 861cd02e005..861cd02e005 100644 --- a/libglusterfs/src/strfd.h +++ b/libglusterfs/src/glusterfs/strfd.h diff --git a/libglusterfs/src/syncop-utils.h b/libglusterfs/src/glusterfs/syncop-utils.h index 1f3ee403edc..1f3ee403edc 100644 --- a/libglusterfs/src/syncop-utils.h +++ b/libglusterfs/src/glusterfs/syncop-utils.h diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/glusterfs/syncop.h index 88279d15490..203abe92b57 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/glusterfs/syncop.h @@ -11,7 +11,7 @@ #ifndef _SYNCOP_H #define _SYNCOP_H -#include "xlator.h" +#include "glusterfs/xlator.h" #include <sys/time.h> #include <pthread.h> #include <ucontext.h> diff --git a/libglusterfs/src/syscall.h b/libglusterfs/src/glusterfs/syscall.h index faaf694b22c..faaf694b22c 100644 --- a/libglusterfs/src/syscall.h +++ b/libglusterfs/src/glusterfs/syscall.h diff --git a/libglusterfs/src/template-component-messages.h b/libglusterfs/src/glusterfs/template-component-messages.h index 4dcdda4abf4..aa7ad3d1baa 100644 --- a/libglusterfs/src/template-component-messages.h +++ b/libglusterfs/src/glusterfs/template-component-messages.h @@ -11,7 +11,7 @@ #ifndef _component_MESSAGES_H_ #define _component_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/libglusterfs/src/throttle-tbf.h b/libglusterfs/src/glusterfs/throttle-tbf.h index b44a0f1fdd5..cccb13c83d9 100644 --- a/libglusterfs/src/throttle-tbf.h +++ b/libglusterfs/src/glusterfs/throttle-tbf.h @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "list.h" -#include "xlator.h" -#include "locking.h" +#include "glusterfs/list.h" +#include "glusterfs/xlator.h" +#include "glusterfs/locking.h" #ifndef THROTTLE_TBF_H__ #define THROTTLE_TBF_H__ diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/glusterfs/timer.h index 216fc65144a..1af33031851 100644 --- a/libglusterfs/src/timer.h +++ b/libglusterfs/src/glusterfs/timer.h @@ -11,8 +11,8 @@ #ifndef _TIMER_H #define _TIMER_H -#include "glusterfs.h" -#include "xlator.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/xlator.h" #include <sys/time.h> #include <pthread.h> diff --git a/libglusterfs/src/timespec.h b/libglusterfs/src/glusterfs/timespec.h index 871871d538c..871871d538c 100644 --- a/libglusterfs/src/timespec.h +++ b/libglusterfs/src/glusterfs/timespec.h diff --git a/libglusterfs/src/trie.h b/libglusterfs/src/glusterfs/trie.h index 6d2d8015964..6d2d8015964 100644 --- a/libglusterfs/src/trie.h +++ b/libglusterfs/src/glusterfs/trie.h diff --git a/libglusterfs/src/upcall-utils.h b/libglusterfs/src/glusterfs/upcall-utils.h index 765b8ef1aa6..0de8428c5fc 100644 --- a/libglusterfs/src/upcall-utils.h +++ b/libglusterfs/src/glusterfs/upcall-utils.h @@ -11,9 +11,9 @@ #ifndef _UPCALL_UTILS_H #define _UPCALL_UTILS_H -#include "iatt.h" -#include "compat-uuid.h" -#include "compat.h" +#include "glusterfs/iatt.h" +#include "glusterfs/compat-uuid.h" +#include "glusterfs/compat.h" /* Flags sent for cache_invalidation */ #define UP_NLINK 0x00000001 /* update nlink */ diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/glusterfs/xlator.h index 30c9e5875e5..4137d12eb27 100644 --- a/libglusterfs/src/xlator.h +++ b/libglusterfs/src/glusterfs/xlator.h @@ -15,14 +15,14 @@ #include <stdint.h> #include <inttypes.h> -#include "event-history.h" -#include "logging.h" -#include "common-utils.h" -#include "dict.h" -#include "compat.h" -#include "list.h" -#include "latency.h" -#include "compat-uuid.h" +#include "glusterfs/event-history.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/dict.h" +#include "glusterfs/compat.h" +#include "glusterfs/list.h" +#include "glusterfs/latency.h" +#include "glusterfs/compat-uuid.h" #define FIRST_CHILD(xl) (xl->children->xlator) #define SECOND_CHILD(xl) (xl->children->next->xlator) @@ -54,14 +54,14 @@ typedef struct _loc loc_t; typedef int32_t (*event_notify_fn_t)(xlator_t *this, int32_t event, void *data, ...); -#include "list.h" -#include "gf-dirent.h" -#include "stack.h" -#include "iobuf.h" -#include "globals.h" -#include "iatt.h" -#include "options.h" -#include "client_t.h" +#include "glusterfs/list.h" +#include "glusterfs/gf-dirent.h" +#include "glusterfs/stack.h" +#include "glusterfs/iobuf.h" +#include "glusterfs/globals.h" +#include "glusterfs/iatt.h" +#include "glusterfs/options.h" +#include "glusterfs/client_t.h" struct _loc { const char *path; diff --git a/libglusterfs/src/graph-print.c b/libglusterfs/src/graph-print.c index 3b984b64508..6531308c659 100644 --- a/libglusterfs/src/graph-print.c +++ b/libglusterfs/src/graph-print.c @@ -10,10 +10,10 @@ #include <sys/uio.h> -#include "common-utils.h" -#include "xlator.h" -#include "graph-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/xlator.h" +#include "glusterfs/graph-utils.h" +#include "glusterfs/libglusterfs-messages.h" struct gf_printer { ssize_t (*write)(struct gf_printer *gp, char *buf, size_t len); diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c index 2a213d2c48e..6b50cdbfddf 100644 --- a/libglusterfs/src/graph.c +++ b/libglusterfs/src/graph.c @@ -8,16 +8,16 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" +#include "glusterfs/xlator.h" #include <dlfcn.h> #include <netdb.h> #include <fnmatch.h> #include <stdlib.h> -#include "defaults.h" +#include "glusterfs/defaults.h" #include <unistd.h> -#include "syscall.h" +#include "glusterfs/syscall.h" #include <regex.h> -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" #if 0 static void diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l index 8af28a43539..4447191ac73 100644 --- a/libglusterfs/src/graph.l +++ b/libglusterfs/src/graph.l @@ -14,7 +14,7 @@ %{ #define YYSTYPE char * -#include "xlator.h" +#include "glusterfs/xlator.h" #include "y.tab.h" #include <string.h> #define START_STRSIZE 32 diff --git a/libglusterfs/src/graph.y b/libglusterfs/src/graph.y index 3c3f7b5bb82..80ae526d79b 100644 --- a/libglusterfs/src/graph.y +++ b/libglusterfs/src/graph.y @@ -22,11 +22,11 @@ #define RELAX_POISONING -#include "xlator.h" -#include "graph-utils.h" -#include "logging.h" -#include "syscall.h" -#include "libglusterfs-messages.h" +#include "glusterfs/xlator.h" +#include "glusterfs/graph-utils.h" +#include "glusterfs/logging.h" +#include "glusterfs/syscall.h" +#include "glusterfs/libglusterfs-messages.h" static int new_volume (char *name); static int volume_type (char *type); diff --git a/libglusterfs/src/hashfn.c b/libglusterfs/src/hashfn.c index 5c4561f1ee8..5f6988417ea 100644 --- a/libglusterfs/src/hashfn.c +++ b/libglusterfs/src/hashfn.c @@ -11,7 +11,7 @@ #include <stdint.h> #include <stdlib.h> -#include "hashfn.h" +#include "glusterfs/hashfn.h" #define get16bits(d) (*((const uint16_t *)(d))) diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c index a5dcac7d7e1..3bf32cfe442 100644 --- a/libglusterfs/src/inode.c +++ b/libglusterfs/src/inode.c @@ -8,16 +8,16 @@ cases as published by the Free Software Foundation. */ -#include "inode.h" -#include "common-utils.h" -#include "statedump.h" +#include "glusterfs/inode.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/statedump.h" #include <pthread.h> #include <sys/types.h> #include <stdint.h> -#include "list.h" +#include "glusterfs/list.h" #include <time.h> #include <assert.h> -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" /* TODO: move latest accessed dentry to list_head of inode diff --git a/libglusterfs/src/iobuf.c b/libglusterfs/src/iobuf.c index 374ea23b660..0e37c4fc6e2 100644 --- a/libglusterfs/src/iobuf.c +++ b/libglusterfs/src/iobuf.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "iobuf.h" -#include "statedump.h" +#include "glusterfs/iobuf.h" +#include "glusterfs/statedump.h" #include <stdio.h> -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" /* TODO: implement destroy margins and prefetching of arenas diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c index afbb6dcad80..e1e6de7d1ce 100644 --- a/libglusterfs/src/latency.c +++ b/libglusterfs/src/latency.c @@ -13,11 +13,11 @@ * latencies of FOPs broken down by subvolumes. */ -#include "glusterfs.h" -#include "xlator.h" -#include "common-utils.h" -#include "statedump.h" -#include "libglusterfs-messages.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/xlator.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/statedump.h" +#include "glusterfs/libglusterfs-messages.h" void gf_update_latency(call_frame_t *frame) diff --git a/libglusterfs/src/locking.c b/libglusterfs/src/locking.c index 89cbaa00c8b..7577054e33a 100644 --- a/libglusterfs/src/locking.c +++ b/libglusterfs/src/locking.c @@ -15,7 +15,7 @@ #include <unistd.h> #define LOCKING_IMPL -#include "locking.h" +#include "glusterfs/locking.h" int use_spinlocks = 0; diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c index b1a167f7997..5d469163220 100644 --- a/libglusterfs/src/logging.c +++ b/libglusterfs/src/logging.c @@ -26,7 +26,7 @@ #include <sys/stat.h> -#include "syscall.h" +#include "glusterfs/syscall.h" #define GF_JSON_MSG_LENGTH 8192 #define GF_SYSLOG_CEE_FORMAT \ @@ -37,12 +37,12 @@ #define GF_LOG_TIMESTR_SIZE 256 #define GF_MAX_SLOG_PAIR_COUNT 100 -#include "xlator.h" -#include "logging.h" -#include "defaults.h" -#include "glusterfs.h" -#include "timer.h" -#include "libglusterfs-messages.h" +#include "glusterfs/xlator.h" +#include "glusterfs/logging.h" +#include "glusterfs/defaults.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/timer.h" +#include "glusterfs/libglusterfs-messages.h" /* Do not replace gf_log in TEST_LOG with gf_msg, as there is a slight chance * that it could lead to an infinite recursion.*/ diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c index 4ef62b8da48..1130c4f736f 100644 --- a/libglusterfs/src/mem-pool.c +++ b/libglusterfs/src/mem-pool.c @@ -8,14 +8,14 @@ cases as published by the Free Software Foundation. */ -#include "mem-pool.h" -#include "logging.h" -#include "xlator.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/logging.h" +#include "glusterfs/xlator.h" #include <stdlib.h> #include <stdarg.h> #include "unittest/unittest.h" -#include "libglusterfs-messages.h" +#include "glusterfs/libglusterfs-messages.h" void gf_mem_acct_enable_set(void *data) diff --git a/libglusterfs/src/monitoring.c b/libglusterfs/src/monitoring.c index 5f11827b187..6d9bfb14937 100644 --- a/libglusterfs/src/monitoring.c +++ b/libglusterfs/src/monitoring.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "monitoring.h" -#include "xlator.h" -#include "syscall.h" +#include "glusterfs/monitoring.h" +#include "glusterfs/xlator.h" +#include "glusterfs/syscall.h" #include <stdlib.h> diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index 12078327b4f..ccb8975b33b 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -10,9 +10,9 @@ #include <fnmatch.h> -#include "xlator.h" -#include "defaults.h" -#include "libglusterfs-messages.h" +#include "glusterfs/xlator.h" +#include "glusterfs/defaults.h" +#include "glusterfs/libglusterfs-messages.h" #define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL) diff --git a/libglusterfs/src/parse-utils.c b/libglusterfs/src/parse-utils.c index d3fd0963507..0ec331ad4b3 100644 --- a/libglusterfs/src/parse-utils.c +++ b/libglusterfs/src/parse-utils.c @@ -17,10 +17,10 @@ #include <string.h> #include <stdlib.h> -#include "parse-utils.h" -#include "mem-pool.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/parse-utils.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" /** * parser_init: Initialize a parser with the a string to parse and diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c index fe6736493c6..804e2f0ad4b 100644 --- a/libglusterfs/src/quota-common-utils.c +++ b/libglusterfs/src/quota-common-utils.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "logging.h" -#include "byte-order.h" -#include "quota-common-utils.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/dict.h" +#include "glusterfs/logging.h" +#include "glusterfs/byte-order.h" +#include "glusterfs/quota-common-utils.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" gf_boolean_t quota_meta_is_null(const quota_meta_t *meta) diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c index 0068b7b881e..f5cd6a3d88c 100644 --- a/libglusterfs/src/rbthash.c +++ b/libglusterfs/src/rbthash.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "rbthash.h" +#include "glusterfs/rbthash.h" #include "rb.h" -#include "locking.h" -#include "mem-pool.h" -#include "logging.h" -#include "libglusterfs-messages.h" +#include "glusterfs/locking.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/logging.h" +#include "glusterfs/libglusterfs-messages.h" #include <pthread.h> #include <string.h> diff --git a/libglusterfs/src/refcount.c b/libglusterfs/src/refcount.c index a522d86a677..d5a5a82fa0f 100644 --- a/libglusterfs/src/refcount.c +++ b/libglusterfs/src/refcount.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "common-utils.h" -#include "refcount.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/refcount.h" #ifndef REFCOUNT_NEEDS_LOCK diff --git a/libglusterfs/src/rot-buffs.c b/libglusterfs/src/rot-buffs.c index 560d9f9805e..260bf16ecea 100644 --- a/libglusterfs/src/rot-buffs.c +++ b/libglusterfs/src/rot-buffs.c @@ -10,10 +10,10 @@ #include <math.h> -#include "mem-types.h" -#include "mem-pool.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/mem-pool.h" -#include "rot-buffs.h" +#include "glusterfs/rot-buffs.h" /** * Producer-Consumer based on top of rotational buffers. diff --git a/libglusterfs/src/run.c b/libglusterfs/src/run.c index 41275066b20..f32c17d9d4b 100644 --- a/libglusterfs/src/run.c +++ b/libglusterfs/src/run.c @@ -23,7 +23,7 @@ #include <assert.h> #include <signal.h> #include <sys/wait.h> -#include "syscall.h" +#include "glusterfs/syscall.h" /* * Following defines are available for helping development: @@ -92,12 +92,12 @@ close_fds_except(int *fdv, size_t count) #define GF_LINUX_HOST_OS #endif #else /* ! RUN_STANDALONE || RUN_DO_DEMO */ -#include "glusterfs.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" #endif -#include "run.h" +#include "glusterfs/run.h" void runinit(runner_t *runner) { diff --git a/libglusterfs/src/stack.c b/libglusterfs/src/stack.c index c06e2dc378d..82b35772d6e 100644 --- a/libglusterfs/src/stack.c +++ b/libglusterfs/src/stack.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "statedump.h" -#include "stack.h" -#include "libglusterfs-messages.h" +#include "glusterfs/statedump.h" +#include "glusterfs/stack.h" +#include "glusterfs/libglusterfs-messages.h" call_frame_t * create_frame(xlator_t *xl, call_pool_t *pool) diff --git a/libglusterfs/src/statedump.c b/libglusterfs/src/statedump.c index bab95855935..690b13088f1 100644 --- a/libglusterfs/src/statedump.c +++ b/libglusterfs/src/statedump.c @@ -9,13 +9,13 @@ */ #include <stdarg.h> -#include "glusterfs.h" -#include "logging.h" -#include "iobuf.h" -#include "statedump.h" -#include "stack.h" -#include "common-utils.h" -#include "syscall.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/logging.h" +#include "glusterfs/iobuf.h" +#include "glusterfs/statedump.h" +#include "glusterfs/stack.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/syscall.h" #ifdef HAVE_MALLOC_H #include <malloc.h> diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c index 7e03c2e332b..cdf0aeafe4c 100644 --- a/libglusterfs/src/store.c +++ b/libglusterfs/src/store.c @@ -11,12 +11,12 @@ #include <inttypes.h> #include <libgen.h> -#include "glusterfs.h" -#include "store.h" -#include "dict.h" -#include "xlator.h" -#include "syscall.h" -#include "libglusterfs-messages.h" +#include "glusterfs/glusterfs.h" +#include "glusterfs/store.h" +#include "glusterfs/dict.h" +#include "glusterfs/xlator.h" +#include "glusterfs/syscall.h" +#include "glusterfs/libglusterfs-messages.h" int32_t gf_store_mkdir(char *path) diff --git a/libglusterfs/src/strfd.c b/libglusterfs/src/strfd.c index ad66b622361..8a2580edc85 100644 --- a/libglusterfs/src/strfd.c +++ b/libglusterfs/src/strfd.c @@ -10,10 +10,10 @@ #include <stdarg.h> -#include "mem-types.h" -#include "mem-pool.h" -#include "strfd.h" -#include "common-utils.h" +#include "glusterfs/mem-types.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/strfd.h" +#include "glusterfs/common-utils.h" strfd_t * strfd_open() diff --git a/libglusterfs/src/syncop-utils.c b/libglusterfs/src/syncop-utils.c index d2a71698745..13e7165658e 100644 --- a/libglusterfs/src/syncop-utils.c +++ b/libglusterfs/src/syncop-utils.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "syncop.h" -#include "syncop-utils.h" -#include "common-utils.h" -#include "libglusterfs-messages.h" +#include "glusterfs/syncop.h" +#include "glusterfs/syncop-utils.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/libglusterfs-messages.h" struct syncop_dir_scan_data { xlator_t *subvol; diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index edf978d797d..b70953725ce 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "syncop.h" -#include "libglusterfs-messages.h" +#include "glusterfs/syncop.h" +#include "glusterfs/libglusterfs-messages.h" int syncopctx_setfsuid(void *uid) diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c index 0987a8628c2..c72a8e16b34 100644 --- a/libglusterfs/src/syscall.c +++ b/libglusterfs/src/syscall.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "syscall.h" -#include "compat.h" -#include "mem-pool.h" -#include "libglusterfs-messages.h" +#include "glusterfs/syscall.h" +#include "glusterfs/compat.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/libglusterfs-messages.h" #include <sys/types.h> #include <utime.h> diff --git a/libglusterfs/src/throttle-tbf.c b/libglusterfs/src/throttle-tbf.c index 9519defa37f..81efebd7efe 100644 --- a/libglusterfs/src/throttle-tbf.c +++ b/libglusterfs/src/throttle-tbf.c @@ -23,8 +23,8 @@ * */ -#include "mem-pool.h" -#include "throttle-tbf.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/throttle-tbf.h" typedef struct tbf_throttle { char done; diff --git a/libglusterfs/src/tier-ctr-interface.h b/libglusterfs/src/tier-ctr-interface.h index 8a627542c0c..19680aa3bea 100644 --- a/libglusterfs/src/tier-ctr-interface.h +++ b/libglusterfs/src/tier-ctr-interface.h @@ -1,7 +1,7 @@ #ifndef _TIER_CTR_INTERFACE_H_ #define _TIER_CTR_INTERFACE_H_ -#include "common-utils.h" +#include "glusterfs/common-utils.h" #include "gfdb_data_store_types.h" #define GFDB_IPC_CTR_KEY "gfdb.ipc-ctr-op" diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c index 88a28a9bd16..d882543b08b 100644 --- a/libglusterfs/src/timer.c +++ b/libglusterfs/src/timer.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "timer.h" -#include "logging.h" -#include "common-utils.h" -#include "globals.h" -#include "timespec.h" -#include "libglusterfs-messages.h" +#include "glusterfs/timer.h" +#include "glusterfs/logging.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/globals.h" +#include "glusterfs/timespec.h" +#include "glusterfs/libglusterfs-messages.h" /* fwd decl */ static gf_timer_registry_t * diff --git a/libglusterfs/src/timespec.c b/libglusterfs/src/timespec.c index c0d4ab9315b..c01527f009a 100644 --- a/libglusterfs/src/timespec.c +++ b/libglusterfs/src/timespec.c @@ -19,10 +19,10 @@ static mach_timebase_info_data_t gf_timebase; #endif -#include "logging.h" -#include "timespec.h" -#include "libglusterfs-messages.h" -#include "common-utils.h" +#include "glusterfs/logging.h" +#include "glusterfs/timespec.h" +#include "glusterfs/libglusterfs-messages.h" +#include "glusterfs/common-utils.h" void timespec_now(struct timespec *ts) diff --git a/libglusterfs/src/trie.c b/libglusterfs/src/trie.c index 4f01bcfe0da..86c6f5511de 100644 --- a/libglusterfs/src/trie.c +++ b/libglusterfs/src/trie.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <ctype.h> -#include "common-utils.h" -#include "trie.h" +#include "glusterfs/common-utils.h" +#include "glusterfs/trie.h" #define DISTANCE_EDIT 1 #define DISTANCE_INS 1 diff --git a/libglusterfs/src/unittest/global_mock.c b/libglusterfs/src/unittest/global_mock.c index 52156847d81..2fcf96dbad8 100644 --- a/libglusterfs/src/unittest/global_mock.c +++ b/libglusterfs/src/unittest/global_mock.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "logging.h" -#include "xlator.h" +#include "glusterfs/logging.h" +#include "glusterfs/xlator.h" #include <stdarg.h> #include <stddef.h> diff --git a/libglusterfs/src/unittest/log_mock.c b/libglusterfs/src/unittest/log_mock.c index d342de31067..60f6530726b 100644 --- a/libglusterfs/src/unittest/log_mock.c +++ b/libglusterfs/src/unittest/log_mock.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "logging.h" -#include "xlator.h" +#include "glusterfs/logging.h" +#include "glusterfs/xlator.h" #include <stdarg.h> #include <stddef.h> diff --git a/libglusterfs/src/unittest/mem_pool_unittest.c b/libglusterfs/src/unittest/mem_pool_unittest.c index 32137b95bb0..9ca324329ba 100644 --- a/libglusterfs/src/unittest/mem_pool_unittest.c +++ b/libglusterfs/src/unittest/mem_pool_unittest.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "mem-pool.h" -#include "logging.h" -#include "xlator.h" +#include "glusterfs/mem-pool.h" +#include "glusterfs/logging.h" +#include "glusterfs/xlator.h" #include <stdarg.h> #include <stddef.h> diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index dedce05d5c3..1b7c9d46f88 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" +#include "glusterfs/xlator.h" #include <dlfcn.h> #include <netdb.h> #include <fnmatch.h> -#include "defaults.h" -#include "libglusterfs-messages.h" +#include "glusterfs/defaults.h" +#include "glusterfs/libglusterfs-messages.h" #define SET_DEFAULT_FOP(fn) \ do { \ diff --git a/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c index d569a0403f8..fe5fe030767 100644 --- a/rpc/rpc-lib/src/auth-glusterfs.c +++ b/rpc/rpc-lib/src/auth-glusterfs.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> #include "xdr-rpc.h" #include "xdr-common.h" #include "rpc-common-xdr.h" diff --git a/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c index 46046e8e440..820a2c03953 100644 --- a/rpc/rpc-lib/src/auth-null.c +++ b/rpc/rpc-lib/src/auth-null.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> int auth_null_request_init(rpcsvc_request_t *req, void *priv) diff --git a/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c index c53870fcf94..cacb1ff8008 100644 --- a/rpc/rpc-lib/src/auth-unix.c +++ b/rpc/rpc-lib/src/auth-unix.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> #include "xdr-rpc.h" int diff --git a/rpc/rpc-lib/src/autoscale-threads.c b/rpc/rpc-lib/src/autoscale-threads.c index d629a1cd430..2c53ebbf40e 100644 --- a/rpc/rpc-lib/src/autoscale-threads.c +++ b/rpc/rpc-lib/src/autoscale-threads.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpcsvc.h" void diff --git a/rpc/rpc-lib/src/mgmt-pmap.c b/rpc/rpc-lib/src/mgmt-pmap.c index 344ec56bbf7..ccb56a479c4 100644 --- a/rpc/rpc-lib/src/mgmt-pmap.c +++ b/rpc/rpc-lib/src/mgmt-pmap.c @@ -12,7 +12,7 @@ #include "protocol-common.h" #include "rpc-clnt.h" #include "xdr-generic.h" -#include "xlator.h" +#include <glusterfs/xlator.h> /* Defining a minimal RPC client program for portmap signout */ diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.c b/rpc/rpc-lib/src/rpc-clnt-ping.c index 7c2026f9086..2298ef6394f 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.c +++ b/rpc/rpc-lib/src/rpc-clnt-ping.c @@ -10,14 +10,14 @@ #include "rpc-clnt.h" #include "rpc-clnt-ping.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "xdr-rpcclnt.h" #include "rpc-transport.h" #include "protocol-common.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "rpc-common-xdr.h" -#include "timespec.h" +#include <glusterfs/timespec.h> char *clnt_ping_procs[GF_DUMP_MAXVALUE] = { [GF_DUMP_PING] = "NULL", diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index b26d645bb12..eb69ed7c6e7 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -12,11 +12,11 @@ #include "rpc-clnt.h" #include "rpc-clnt-ping.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "xdr-rpcclnt.h" #include "rpc-transport.h" #include "protocol-common.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "rpc-common-xdr.h" diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h index d80df7f8b96..d16cc40aefe 100644 --- a/rpc/rpc-lib/src/rpc-clnt.h +++ b/rpc/rpc-lib/src/rpc-clnt.h @@ -11,9 +11,9 @@ #ifndef __RPC_CLNT_H #define __RPC_CLNT_H -#include "stack.h" +#include <glusterfs/stack.h> #include "rpc-transport.h" -#include "timer.h" +#include <glusterfs/timer.h> #include "xdr-common.h" #include "glusterfs3.h" diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c index 50013776c86..e2a448fa640 100644 --- a/rpc/rpc-lib/src/rpc-drc.c +++ b/rpc/rpc-lib/src/rpc-drc.c @@ -12,11 +12,11 @@ #ifndef RPC_DRC_H #include "rpc-drc.h" #endif -#include "locking.h" -#include "hashfn.h" -#include "common-utils.h" -#include "statedump.h" -#include "mem-pool.h" +#include <glusterfs/locking.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/statedump.h> +#include <glusterfs/mem-pool.h> #include <netinet/in.h> #include <unistd.h> diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h index 89b7c87e756..6aaede0828a 100644 --- a/rpc/rpc-lib/src/rpc-drc.h +++ b/rpc/rpc-lib/src/rpc-drc.h @@ -13,8 +13,8 @@ #include "rpcsvc-common.h" #include "rpcsvc.h" -#include "locking.h" -#include "dict.h" +#include <glusterfs/locking.h> +#include <glusterfs/dict.h> #include "rb.h" /* per-client cache structure */ diff --git a/rpc/rpc-lib/src/rpc-lib-messages.h b/rpc/rpc-lib/src/rpc-lib-messages.h index 9251578a121..2c0b820dbf9 100644 --- a/rpc/rpc-lib/src/rpc-lib-messages.h +++ b/rpc/rpc-lib/src/rpc-lib-messages.h @@ -11,7 +11,7 @@ #ifndef _RPC_LIB_MESSAGES_H_ #define _RPC_LIB_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/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 7e70b5dfdb1..0c9291380be 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -15,14 +15,14 @@ #include <fnmatch.h> #include <stdint.h> -#include "logging.h" +#include <glusterfs/logging.h> #include "rpc-transport.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> /* FIXME: xlator.h is needed for volume_option_t, need to define the datatype * in some other header */ -#include "xlator.h" -#include "list.h" +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> #ifndef GF_OPTION_LIST_EMPTY #define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL) diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index d7b86b63748..18412cc85f7 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -56,8 +56,8 @@ struct rpc_transport_ops; typedef struct rpc_transport rpc_transport_t; -#include "dict.h" -#include "compat.h" +#include <glusterfs/dict.h> +#include <glusterfs/compat.h> #include "rpcsvc-common.h" struct peer_info { diff --git a/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c index 7c45c9b2a97..18e6a133ebe 100644 --- a/rpc/rpc-lib/src/rpcsvc-auth.c +++ b/rpc/rpc-lib/src/rpcsvc-auth.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "logging.h" -#include "dict.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> extern rpcsvc_auth_t * rpcsvc_auth_null_init(rpcsvc_t *svc, dict_t *options); diff --git a/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h index 361f31c27f2..d19b2d3f34c 100644 --- a/rpc/rpc-lib/src/rpcsvc-common.h +++ b/rpc/rpc-lib/src/rpcsvc-common.h @@ -12,11 +12,11 @@ #define _RPCSVC_COMMON_H #include <pthread.h> -#include "list.h" -#include "compat.h" -#include "glusterfs.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/list.h> +#include <glusterfs/compat.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> typedef enum { RPCSVC_EVENT_ACCEPT, diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index fd531fbc1ee..0a80bb179c2 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -10,19 +10,19 @@ #include "rpcsvc.h" #include "rpc-transport.h" -#include "dict.h" -#include "logging.h" -#include "byte-order.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "list.h" +#include <glusterfs/dict.h> +#include <glusterfs/logging.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/list.h> #include "xdr-rpc.h" -#include "iobuf.h" -#include "globals.h" +#include <glusterfs/iobuf.h> +#include <glusterfs/globals.h> #include "xdr-common.h" #include "xdr-generic.h" #include "rpc-common-xdr.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "rpc-drc.h" #include "protocol-common.h" @@ -44,7 +44,7 @@ #endif #include "xdr-rpcclnt.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> struct rpcsvc_program gluster_dump_prog; diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index 3e25ef3a8e9..34045ce8a44 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -11,23 +11,23 @@ #ifndef _RPCSVC_H #define _RPCSVC_H -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpc-transport.h" -#include "logging.h" -#include "dict.h" -#include "mem-pool.h" -#include "list.h" -#include "iobuf.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/mem-pool.h> +#include <glusterfs/list.h> +#include <glusterfs/iobuf.h> #include "xdr-rpc.h" -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "rpcsvc-common.h" #include <pthread.h> #include <sys/uio.h> #include <inttypes.h> #include <rpc/rpc_msg.h> -#include "compat.h" +#include <glusterfs/compat.h> #ifndef MAX_IOVEC #define MAX_IOVEC 16 diff --git a/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c index 36fd9db1a97..2cf39a8bdfc 100644 --- a/rpc/rpc-lib/src/xdr-rpc.c +++ b/rpc/rpc-lib/src/xdr-rpc.c @@ -15,11 +15,11 @@ #include <sys/uio.h> #include <rpc/auth_unix.h> -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "xdr-common.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> /* Decodes the XDR format in msgbuf into rpc_msg. * The remaining payload is returned into payload. diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c index 9e60d19e7a2..8175cd00c3a 100644 --- a/rpc/rpc-lib/src/xdr-rpcclnt.c +++ b/rpc/rpc-lib/src/xdr-rpcclnt.c @@ -16,11 +16,11 @@ #include <rpc/auth_unix.h> #include <errno.h> -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "xdr-common.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> /* Decodes the XDR format in msgbuf into rpc_msg. * The remaining payload is returned into payload. diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c index d57f2d4f58d..47184d9f148 100644 --- a/rpc/rpc-transport/rdma/src/name.c +++ b/rpc/rpc-transport/rdma/src/name.c @@ -21,7 +21,7 @@ #include "rpc-transport.h" #include "rdma.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "rpc-lib-messages.h" #include "rpc-trans-rdma-messages.h" diff --git a/rpc/rpc-transport/rdma/src/name.h b/rpc/rpc-transport/rdma/src/name.h index 6c782b52db5..41c4c6a7e8e 100644 --- a/rpc/rpc-transport/rdma/src/name.h +++ b/rpc/rpc-transport/rdma/src/name.h @@ -13,7 +13,7 @@ #include <rdma/rdma_cma.h> -#include "compat.h" +#include <glusterfs/compat.h> int32_t gf_rdma_client_bind(rpc_transport_t *this, struct sockaddr *sockaddr, diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index ebf54885f1a..45605c8ff53 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -8,14 +8,14 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "glusterfs.h" -#include "iobuf.h" -#include "logging.h" +#include <glusterfs/dict.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/iobuf.h> +#include <glusterfs/logging.h> #include "rdma.h" #include "name.h" -#include "byte-order.h" -#include "xlator.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/xlator.h> #include "xdr-rpc.h" #include "rpc-lib-messages.h" #include "rpc-trans-rdma-messages.h" diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h index 84c1397054b..403f5678ad8 100644 --- a/rpc/rpc-transport/rdma/src/rdma.h +++ b/rpc/rpc-transport/rdma/src/rdma.h @@ -17,10 +17,10 @@ #include "rpc-clnt.h" #include "rpc-transport.h" -#include "xlator.h" -#include "gf-event.h" +#include <glusterfs/xlator.h> +#include <glusterfs/gf-event.h> #include <stdio.h> -#include <list.h> +#include <glusterfs/list.h> #include <arpa/inet.h> #include <infiniband/verbs.h> #include <rdma/rdma_cma.h> diff --git a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h index 6e9ea9a2925..662a8980648 100644 --- a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h +++ b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h @@ -11,7 +11,7 @@ #ifndef _RPC_TRANS_RDMA_MESSAGES_H_ #define _RPC_TRANS_RDMA_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/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 1f866ccdecf..ca14402ed4a 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -21,7 +21,7 @@ #include "rpc-transport.h" #include "socket.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> static void _assign_port(struct sockaddr *sockaddr, uint16_t port) diff --git a/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h index 85f8bb7040b..080c7588f5a 100644 --- a/rpc/rpc-transport/socket/src/name.h +++ b/rpc/rpc-transport/socket/src/name.h @@ -11,7 +11,7 @@ #ifndef _SOCKET_NAME_H #define _SOCKET_NAME_H -#include "compat.h" +#include <glusterfs/compat.h> int32_t client_bind(rpc_transport_t *this, struct sockaddr *sockaddr, diff --git a/rpc/rpc-transport/socket/src/socket-mem-types.h b/rpc/rpc-transport/socket/src/socket-mem-types.h index edf3ed0c6f1..241ce67f670 100644 --- a/rpc/rpc-transport/socket/src/socket-mem-types.h +++ b/rpc/rpc-transport/socket/src/socket-mem-types.h @@ -11,7 +11,7 @@ #ifndef __SOCKET_MEM_TYPES_H__ #define __SOCKET_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> typedef enum gf_sock_mem_types_ { gf_sock_connect_error_state_t = gf_common_mt_end + 1, diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 776e647d4f6..38e52081b3c 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -10,16 +10,16 @@ #include "socket.h" #include "name.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "rpc-transport.h" -#include "logging.h" -#include "xlator.h" -#include "syscall.h" -#include "byte-order.h" -#include "common-utils.h" -#include "compat-errno.h" +#include <glusterfs/logging.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syscall.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> #include "socket-mem-types.h" -#include "timer.h" +#include <glusterfs/timer.h> /* ugly #includes below */ #include "protocol-common.h" diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index f1bfba45076..9cbb2a89a22 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -21,13 +21,13 @@ #include <openssl/ecdh.h> #endif -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpc-transport.h" -#include "logging.h" -#include "dict.h" -#include "mem-pool.h" -#include "globals.h" -#include "refcount.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/mem-pool.h> +#include <glusterfs/globals.h> +#include <glusterfs/refcount.h> #ifndef MAX_IOVEC #define MAX_IOVEC 16 diff --git a/rpc/xdr/src/acl3-xdr.x b/rpc/xdr/src/acl3-xdr.x index 44f1ed4fac9..7f7364971e6 100644 --- a/rpc/xdr/src/acl3-xdr.x +++ b/rpc/xdr/src/acl3-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "xdr-nfs3.h" struct aclentry { diff --git a/rpc/xdr/src/changelog-xdr.x b/rpc/xdr/src/changelog-xdr.x index 97cd4558ccb..5956245d5ce 100644 --- a/rpc/xdr/src/changelog-xdr.x +++ b/rpc/xdr/src/changelog-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* XDR: libgfchangelog -> changelog */ diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 6f5fd256954..a32c8645708 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> enum gf_cli_defrag_type { GF_DEFRAG_CMD_NONE = 0, diff --git a/rpc/xdr/src/glusterd1-xdr.x b/rpc/xdr/src/glusterd1-xdr.x index 1ce57392b5b..9b36d34378a 100644 --- a/rpc/xdr/src/glusterd1-xdr.x +++ b/rpc/xdr/src/glusterd1-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> enum glusterd_volume_status { GLUSTERD_STATUS_NONE = 0, diff --git a/rpc/xdr/src/glusterfs-fops.x b/rpc/xdr/src/glusterfs-fops.x index 8ccc4658f6c..ffb71d6418a 100644 --- a/rpc/xdr/src/glusterfs-fops.x +++ b/rpc/xdr/src/glusterfs-fops.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* NOTE: add members ONLY at the end (just before _MAXVALUE) */ /* diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x index c253db5de5b..5e598869801 100644 --- a/rpc/xdr/src/glusterfs3-xdr.x +++ b/rpc/xdr/src/glusterfs3-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "rpc-common-xdr.h" %#include "glusterfs-fops.h" diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h index b8ef394abaf..6e5de623457 100644 --- a/rpc/xdr/src/glusterfs3.h +++ b/rpc/xdr/src/glusterfs3.h @@ -16,9 +16,9 @@ #include "xdr-generic.h" #include "glusterfs3-xdr.h" #include "glusterfs4-xdr.h" -#include "iatt.h" +#include <glusterfs/iatt.h> #include "protocol-common.h" -#include "upcall-utils.h" +#include <glusterfs/upcall-utils.h> #define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) #define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) diff --git a/rpc/xdr/src/glusterfs4-xdr.x b/rpc/xdr/src/glusterfs4-xdr.x index 5ee86c24a0b..c183dbcd704 100644 --- a/rpc/xdr/src/glusterfs4-xdr.x +++ b/rpc/xdr/src/glusterfs4-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "glusterfs-fops.h" %#include "glusterfs3-xdr.h" diff --git a/rpc/xdr/src/mount3udp.x b/rpc/xdr/src/mount3udp.x index 4fafaa053f8..e8366df400c 100644 --- a/rpc/xdr/src/mount3udp.x +++ b/rpc/xdr/src/mount3udp.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* This is used by rpcgen to auto generate the rpc stubs. * mount3udp_svc.c is heavily modified though diff --git a/rpc/xdr/src/nlm4-xdr.x b/rpc/xdr/src/nlm4-xdr.x index 0fb3a5945a1..847b0e64491 100644 --- a/rpc/xdr/src/nlm4-xdr.x +++ b/rpc/xdr/src/nlm4-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* .x file defined as according to the RFC */ diff --git a/rpc/xdr/src/nsm-xdr.x b/rpc/xdr/src/nsm-xdr.x index 65b36b27d31..7c16a741f1d 100644 --- a/rpc/xdr/src/nsm-xdr.x +++ b/rpc/xdr/src/nsm-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* * This defines the maximum length of the string diff --git a/rpc/xdr/src/portmap-xdr.x b/rpc/xdr/src/portmap-xdr.x index e360911bc07..23515572b9f 100644 --- a/rpc/xdr/src/portmap-xdr.x +++ b/rpc/xdr/src/portmap-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> struct pmap_port_by_brick_req { string brick<>; diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x index b01d282f368..760d1e0aedc 100644 --- a/rpc/xdr/src/rpc-common-xdr.x +++ b/rpc/xdr/src/rpc-common-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* This file has definition of few XDR structures which are * not captured in any section specific file */ diff --git a/rpc/xdr/src/xdr-generic.h b/rpc/xdr/src/xdr-generic.h index 367ef555dd3..794dda508cc 100644 --- a/rpc/xdr/src/xdr-generic.h +++ b/rpc/xdr/src/xdr-generic.h @@ -15,7 +15,7 @@ #include <rpc/types.h> #include <rpc/xdr.h> -#include "compat.h" +#include <glusterfs/compat.h> #define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) #define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) diff --git a/rpc/xdr/src/xdr-nfs3.c b/rpc/xdr/src/xdr-nfs3.c index aca9a299b0e..cfccaaa89b8 100644 --- a/rpc/xdr/src/xdr-nfs3.c +++ b/rpc/xdr/src/xdr-nfs3.c @@ -23,7 +23,7 @@ #endif #include "xdr-nfs3.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-common.h" bool_t diff --git a/tests/basic/logchecks-messages.h b/tests/basic/logchecks-messages.h index 1ae68646445..bf364848ec7 100644 --- a/tests/basic/logchecks-messages.h +++ b/tests/basic/logchecks-messages.h @@ -11,7 +11,7 @@ #ifndef _LOGCHECKS_MESSAGES_H_ #define _LOGCHECKS_MESSAGES_H_ -#include "glfs-message-id.h" +#include <glusterfs/glfs-message-id.h> /* NOTE: Rules for message additions * 1) Each instance of a message is _better_ left with a unique message ID, even diff --git a/tests/basic/logchecks.c b/tests/basic/logchecks.c index 86891057230..df0be28ace0 100644 --- a/tests/basic/logchecks.c +++ b/tests/basic/logchecks.c @@ -11,9 +11,9 @@ #include <stdio.h> #include <unistd.h> -#include "glusterfs.h" -#include "globals.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/globals.h> +#include <glusterfs/logging.h> #include "logchecks-messages.h" #include "../../libglusterfs/src/logging.h" diff --git a/tools/gfind_missing_files/gcrawler.c b/tools/gfind_missing_files/gcrawler.c index 9b3d243841c..4acbe92bc8f 100644 --- a/tools/gfind_missing_files/gcrawler.c +++ b/tools/gfind_missing_files/gcrawler.c @@ -16,11 +16,11 @@ #include <string.h> #include <dirent.h> #include <assert.h> -#include "locking.h" +#include <glusterfs/locking.h> -#include "compat.h" -#include "list.h" -#include "syscall.h" +#include <glusterfs/compat.h> +#include <glusterfs/list.h> +#include <glusterfs/syscall.h> #define THREAD_MAX 32 #define BUMP(name) INC(name, 1) diff --git a/tools/setgfid2path/src/main.c b/tools/setgfid2path/src/main.c index c9e71c12815..2e25ea8ab3d 100644 --- a/tools/setgfid2path/src/main.c +++ b/tools/setgfid2path/src/main.c @@ -10,8 +10,8 @@ #include <stdio.h> #include <libgen.h> -#include "common-utils.h" -#include "syscall.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/syscall.h> #define MAX_GFID2PATH_LINK_SUP 500 #define GFID_SIZE 16 diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 231a7970928..e1400acd9e7 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -15,22 +15,22 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "afr.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" -#include "byte-order.h" -#include "statedump.h" -#include "events.h" -#include "upcall-utils.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/statedump.h> +#include <glusterfs/events.h> +#include <glusterfs/upcall-utils.h> #include "afr-inode-read.h" #include "afr-inode-write.h" diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 4c40e85f393..6307b637f8d 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -16,18 +16,18 @@ #include <signal.h> #include <string.h> -#include "glusterfs.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" -#include "checksum.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> +#include <glusterfs/checksum.h> #include "afr.h" #include "afr-transaction.h" diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 5725b1c5cb3..119b74e5b10 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -15,19 +15,19 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "afr.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" -#include "byte-order.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> +#include <glusterfs/byte-order.h> #include "afr.h" #include "afr-transaction.h" diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 03338592618..d31fdaa7542 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -15,20 +15,20 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "afr.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "byte-order.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" -#include "quota-common-utils.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> +#include <glusterfs/quota-common-utils.h> #include "afr-transaction.h" #include "afr-messages.h" diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index c6fe0939841..68d68a356b3 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -15,20 +15,20 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "afr.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> #include "protocol-common.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "afr-transaction.h" #include "afr-self-heal.h" #include "afr-messages.h" diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index 95e52ff4a09..a80eab0a349 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "byte-order.h" -#include "common-utils.h" +#include <glusterfs/dict.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> #include "afr.h" #include "afr-transaction.h" diff --git a/xlators/cluster/afr/src/afr-mem-types.h b/xlators/cluster/afr/src/afr-mem-types.h index 531184b4bd7..b0fb00641a0 100644 --- a/xlators/cluster/afr/src/afr-mem-types.h +++ b/xlators/cluster/afr/src/afr-mem-types.h @@ -11,7 +11,7 @@ #ifndef __AFR_MEM_TYPES_H__ #define __AFR_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_afr_mem_types_ { gf_afr_mt_afr_fd_ctx_t = gf_common_mt_end + 1, diff --git a/xlators/cluster/afr/src/afr-messages.h b/xlators/cluster/afr/src/afr-messages.h index 696336889d3..baf1a6c291f 100644 --- a/xlators/cluster/afr/src/afr-messages.h +++ b/xlators/cluster/afr/src/afr-messages.h @@ -11,7 +11,7 @@ #ifndef _AFR_MESSAGES_H_ #define _AFR_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/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index 1763dc0a4cc..ff72c73a9f4 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -15,20 +15,20 @@ #include <stdlib.h> #include <signal.h> -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "afr.h" -#include "dict.h" -#include "xlator.h" -#include "hashfn.h" -#include "logging.h" -#include "list.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "compat.h" -#include "byte-order.h" -#include "statedump.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> +#include <glusterfs/list.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/compat.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/statedump.h> #include "afr-inode-read.h" #include "afr-inode-write.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 7a96b894cd7..7eaae914dce 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -10,10 +10,10 @@ #include "afr.h" #include "afr-self-heal.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "protocol-common.h" #include "afr-messages.h" -#include "events.h" +#include <glusterfs/events.h> void afr_heal_synctask(xlator_t *this, afr_local_t *local); diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 8cd79c73aa4..747060b170a 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -10,10 +10,10 @@ #include "afr.h" #include "afr-self-heal.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "protocol-common.h" #include "afr-messages.h" -#include "events.h" +#include <glusterfs/events.h> enum { AFR_SELFHEAL_DATA_FULL = 0, diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index fb6952c10fd..ac2eab89a59 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -10,11 +10,11 @@ #include "afr.h" #include "afr-self-heal.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "afr-transaction.h" #include "afr-messages.h" -#include "syncop-utils.h" -#include "events.h" +#include <glusterfs/syncop-utils.h> +#include <glusterfs/events.h> static int afr_selfheal_entry_delete(xlator_t *this, inode_t *dir, const char *name, diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index ea2a7bfd52f..a661fcb5acc 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -10,9 +10,9 @@ #include "afr.h" #include "afr-self-heal.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "protocol-common.h" -#include "events.h" +#include <glusterfs/events.h> #define AFR_HEAL_ATTR (GF_SET_ATTR_UID | GF_SET_ATTR_GID | GF_SET_ATTR_MODE) diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c index aa20ad1b835..f3e5017189d 100644 --- a/xlators/cluster/afr/src/afr-self-heal-name.c +++ b/xlators/cluster/afr/src/afr-self-heal-name.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "events.h" +#include <glusterfs/events.h> #include "afr.h" #include "afr-self-heal.h" #include "afr-messages.h" diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index e2de77a9c45..8d6d383e872 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -12,9 +12,9 @@ #include "afr-self-heal.h" #include "afr-self-heald.h" #include "protocol-common.h" -#include "syncop-utils.h" +#include <glusterfs/syncop-utils.h> #include "afr-messages.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #define SHD_INODE_LRU_LIMIT 2048 #define AFR_EH_SPLIT_BRAIN_LIMIT 1024 diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index fb78c198d9c..c5f016d4a8e 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "byte-order.h" -#include "common-utils.h" -#include "timer.h" +#include <glusterfs/dict.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/timer.h> #include "afr.h" #include "afr-transaction.h" diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 6f8015380f0..f3173207320 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -11,13 +11,13 @@ #ifndef __AFR_H__ #define __AFR_H__ -#include "call-stub.h" -#include "compat-errno.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/compat-errno.h> #include "afr-mem-types.h" #include "libxlator.h" -#include "timer.h" -#include "syncop.h" +#include <glusterfs/timer.h> +#include <glusterfs/syncop.h> #include "afr-self-heald.h" #include "afr-messages.h" diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 24402399597..1d2487bd7c1 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -10,15 +10,15 @@ /* TODO: add NS locking */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "libxlator.h" #include "dht-common.h" #include "dht-lock.h" -#include "defaults.h" -#include "byte-order.h" -#include "quota-common-utils.h" -#include "upcall-utils.h" +#include <glusterfs/defaults.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/quota-common-utils.h> +#include <glusterfs/upcall-utils.h> #include <sys/time.h> #include <libgen.h> diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 580f57e6e25..6fb1c16d0d8 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -14,13 +14,13 @@ #include "dht-mem-types.h" #include "dht-messages.h" -#include "call-stub.h" +#include <glusterfs/call-stub.h> #include "libxlator.h" -#include "syncop.h" -#include "refcount.h" -#include "timer.h" +#include <glusterfs/syncop.h> +#include <glusterfs/refcount.h> +#include <glusterfs/timer.h> #include "protocol-common.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> #ifndef _DHT_H #define _DHT_H diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c index 148b4f01133..4d3905ab741 100644 --- a/xlators/cluster/dht/src/dht-diskusage.c +++ b/xlators/cluster/dht/src/dht-diskusage.c @@ -10,14 +10,14 @@ /* TODO: add NS locking */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-messages.h" -#include "defaults.h" +#include <glusterfs/defaults.h> #include <sys/time.h> -#include "events.h" +#include <glusterfs/events.h> int dht_du_info_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c index 2f15c0370cc..16ee6d2d405 100644 --- a/xlators/cluster/dht/src/dht-hashfn.c +++ b/xlators/cluster/dht/src/dht-hashfn.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" -#include "hashfn.h" +#include <glusterfs/hashfn.h> int dht_hash_compute_internal(int type, const char *name, uint32_t *hash_p) diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 22ce8bc4d4c..12e7a4fd2c2 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-lock.h" diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c index 544b9638104..35bd3fbd25e 100644 --- a/xlators/cluster/dht/src/dht-layout.c +++ b/xlators/cluster/dht/src/dht-layout.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "dht-messages.h" #include "unittest/unittest.h" diff --git a/xlators/cluster/dht/src/dht-linkfile.c b/xlators/cluster/dht/src/dht-linkfile.c index eb1695f7e05..e17c354bea6 100644 --- a/xlators/cluster/dht/src/dht-linkfile.c +++ b/xlators/cluster/dht/src/dht-linkfile.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" -#include "compat.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/compat.h> #include "dht-common.h" #include "dht-messages.h" diff --git a/xlators/cluster/dht/src/dht-lock.h b/xlators/cluster/dht/src/dht-lock.h index 802970adb3b..1cea8ae51ea 100644 --- a/xlators/cluster/dht/src/dht-lock.h +++ b/xlators/cluster/dht/src/dht-lock.h @@ -11,7 +11,7 @@ #ifndef _DHT_LOCK_H #define _DHT_LOCK_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "dht-common.h" void diff --git a/xlators/cluster/dht/src/dht-mem-types.h b/xlators/cluster/dht/src/dht-mem-types.h index c4430741ff7..33f9832395b 100644 --- a/xlators/cluster/dht/src/dht-mem-types.h +++ b/xlators/cluster/dht/src/dht-mem-types.h @@ -11,7 +11,7 @@ #ifndef __DHT_MEM_TYPES_H__ #define __DHT_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_dht_mem_types_ { gf_dht_mt_dht_du_t = gf_common_mt_end + 1, diff --git a/xlators/cluster/dht/src/dht-messages.h b/xlators/cluster/dht/src/dht-messages.h index 005ab57b505..afc7460151b 100644 --- a/xlators/cluster/dht/src/dht-messages.h +++ b/xlators/cluster/dht/src/dht-messages.h @@ -10,7 +10,7 @@ #ifndef _DHT_MESSAGES_H_ #define _DHT_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/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 41a587823a9..187244435d6 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -9,12 +9,12 @@ */ #include "dht-common.h" -#include "xlator.h" -#include "syscall.h" +#include <glusterfs/xlator.h> +#include <glusterfs/syscall.h> #include <signal.h> #include <fnmatch.h> #include <signal.h> -#include "events.h" +#include <glusterfs/events.h> #define GF_DISK_SECTOR_SIZE 512 #define DHT_REBALANCE_PID 4242 /* Change it if required */ diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index af342bdbe21..893b4513628 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -11,11 +11,11 @@ /* TODO: link(oldpath, newpath) fails if newpath already exists. DHT should * delete the newpath if it gets EEXISTS from link() call. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-lock.h" -#include "defaults.h" +#include <glusterfs/defaults.h> int dht_rename_unlock(call_frame_t *frame, xlator_t *this); diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index 0e57eab5f7f..e306943edda 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-messages.h" #include "dht-lock.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> #define DHT_SET_LAYOUT_RANGE(layout, i, srt, chunk, path) \ do { \ diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 0a7aa15e242..d258d26d156 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -9,7 +9,7 @@ */ /* TODO: add NS locking */ -#include "statedump.h" +#include <glusterfs/statedump.h> #include "dht-common.h" #include "dht-messages.h" diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 63ab926ca58..934eace1ad1 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "statedump.h" +#include <glusterfs/statedump.h> #include "dht-common.h" struct xlator_fops dht_pt_fops = { diff --git a/xlators/cluster/dht/src/tier-common.c b/xlators/cluster/dht/src/tier-common.c index b86ed673042..b22f4776ada 100644 --- a/xlators/cluster/dht/src/tier-common.c +++ b/xlators/cluster/dht/src/tier-common.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "libxlator.h" #include "dht-common.h" -#include "defaults.h" +#include <glusterfs/defaults.h> #include "tier-common.h" #include "tier.h" diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index 584f1dd76ba..a8cccaf019e 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -13,8 +13,8 @@ #include "dht-common.h" #include "tier.h" #include "tier-common.h" -#include "syscall.h" -#include "events.h" +#include <glusterfs/syscall.h> +#include <glusterfs/events.h> #include "tier-ctr-interface.h" /*Hard coded DB info*/ diff --git a/xlators/cluster/dht/src/tier.h b/xlators/cluster/dht/src/tier.h index f0ffdfcd769..a20b1db07e0 100644 --- a/xlators/cluster/dht/src/tier.h +++ b/xlators/cluster/dht/src/tier.h @@ -14,7 +14,7 @@ /******************************************************************************/ /* This is from dht-rebalancer.c as we don't have dht-rebalancer.h */ #include "dht-common.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include <signal.h> #include <fnmatch.h> #include <signal.h> diff --git a/xlators/cluster/dht/src/unittest/dht_layout_mock.c b/xlators/cluster/dht/src/unittest/dht_layout_mock.c index 49bf18b9fe6..771452963d1 100644 --- a/xlators/cluster/dht/src/unittest/dht_layout_mock.c +++ b/xlators/cluster/dht/src/unittest/dht_layout_mock.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 "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "dht-common.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> int dht_hash_compute(xlator_t *this, int type, const char *name, uint32_t *hash_p) diff --git a/xlators/cluster/dht/src/unittest/dht_layout_unittest.c b/xlators/cluster/dht/src/unittest/dht_layout_unittest.c index 72890070835..c94a1d0a2e1 100644 --- a/xlators/cluster/dht/src/unittest/dht_layout_unittest.c +++ b/xlators/cluster/dht/src/unittest/dht_layout_unittest.c @@ -9,8 +9,8 @@ */ #include "dht-common.h" -#include "logging.h" -#include "xlator.h" +#include <glusterfs/logging.h> +#include <glusterfs/xlator.h> #include <inttypes.h> #include <stdarg.h> diff --git a/xlators/cluster/ec/src/ec-code.c b/xlators/cluster/ec/src/ec-code.c index b3338248569..03162ae05a9 100644 --- a/xlators/cluster/ec/src/ec-code.c +++ b/xlators/cluster/ec/src/ec-code.c @@ -14,7 +14,7 @@ #include <sys/stat.h> #include <ctype.h> -#include "syscall.h" +#include <glusterfs/syscall.h> #include "ec-mem-types.h" #include "ec-code.h" diff --git a/xlators/cluster/ec/src/ec-code.h b/xlators/cluster/ec/src/ec-code.h index 355209c3944..75fb35d93e3 100644 --- a/xlators/cluster/ec/src/ec-code.h +++ b/xlators/cluster/ec/src/ec-code.h @@ -11,8 +11,8 @@ #ifndef __EC_CODE_H__ #define __EC_CODE_H__ -#include "xlator.h" -#include "list.h" +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> #include "ec-types.h" #include "ec-galois.h" diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index 454c2c72c95..c5af2ab5e39 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -11,14 +11,14 @@ #include <fnmatch.h> #include "libxlator.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "ec-types.h" #include "ec-helpers.h" #include "ec-common.h" #include "ec-combine.h" #include "ec-messages.h" -#include "quota-common-utils.h" +#include <glusterfs/quota-common-utils.h> #define EC_QUOTA_PREFIX "trusted.glusterfs.quota." diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 737f7fda882..8d656702e12 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "byte-order.h" -#include "hashfn.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/hashfn.h> #include "ec-mem-types.h" #include "ec-types.h" diff --git a/xlators/cluster/ec/src/ec-common.h b/xlators/cluster/ec/src/ec-common.h index bf41c0086f8..115e1475b50 100644 --- a/xlators/cluster/ec/src/ec-common.h +++ b/xlators/cluster/ec/src/ec-common.h @@ -11,7 +11,7 @@ #ifndef __EC_COMMON_H__ #define __EC_COMMON_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ec-data.h" diff --git a/xlators/cluster/ec/src/ec-dir-read.c b/xlators/cluster/ec/src/ec-dir-read.c index ec4cefb1e78..c9db7010a0f 100644 --- a/xlators/cluster/ec/src/ec-dir-read.c +++ b/xlators/cluster/ec/src/ec-dir-read.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "ec.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-dir-write.c b/xlators/cluster/ec/src/ec-dir-write.c index f5c38e80dd7..e24667feedc 100644 --- a/xlators/cluster/ec/src/ec-dir-write.c +++ b/xlators/cluster/ec/src/ec-dir-write.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "ec.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-fops.h b/xlators/cluster/ec/src/ec-fops.h index 2858d829c73..2abef0d17b3 100644 --- a/xlators/cluster/ec/src/ec-fops.h +++ b/xlators/cluster/ec/src/ec-fops.h @@ -11,7 +11,7 @@ #ifndef __EC_FOPS_H__ #define __EC_FOPS_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ec-types.h" #include "ec-common.h" diff --git a/xlators/cluster/ec/src/ec-galois.c b/xlators/cluster/ec/src/ec-galois.c index 8cb4dc2e4e3..ee7662f52ce 100644 --- a/xlators/cluster/ec/src/ec-galois.c +++ b/xlators/cluster/ec/src/ec-galois.c @@ -10,8 +10,8 @@ #include <string.h> -#include "mem-pool.h" -#include "list.h" +#include <glusterfs/mem-pool.h> +#include <glusterfs/list.h> #include "ec-mem-types.h" #include "ec-gf8.h" diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c index 2fd10526494..175e88ac94b 100644 --- a/xlators/cluster/ec/src/ec-generic.c +++ b/xlators/cluster/ec/src/ec-generic.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "byte-order.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/byte-order.h> #include "ec.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c index 9eb5b856932..eaf80e023e3 100644 --- a/xlators/cluster/ec/src/ec-heal.c +++ b/xlators/cluster/ec/src/ec-heal.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "compat-errno.h" -#include "byte-order.h" -#include "syncop.h" -#include "syncop-utils.h" -#include "cluster-syncop.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/syncop.h> +#include <glusterfs/syncop-utils.h> +#include <glusterfs/cluster-syncop.h> #include "ec.h" #include "ec-mem-types.h" diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c index 130790c66ac..cba111a3e8f 100644 --- a/xlators/cluster/ec/src/ec-heald.c +++ b/xlators/cluster/ec/src/ec-heald.c @@ -8,15 +8,15 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat-errno.h> #include "ec.h" #include "ec-messages.h" #include "ec-heald.h" #include "ec-mem-types.h" -#include "syncop.h" -#include "syncop-utils.h" +#include <glusterfs/syncop.h> +#include <glusterfs/syncop-utils.h> #include "protocol-common.h" #define NTH_INDEX_HEALER(this, n) \ diff --git a/xlators/cluster/ec/src/ec-heald.h b/xlators/cluster/ec/src/ec-heald.h index 4d141d767e5..2eda2a74f54 100644 --- a/xlators/cluster/ec/src/ec-heald.h +++ b/xlators/cluster/ec/src/ec-heald.h @@ -11,7 +11,7 @@ #ifndef __EC_HEALD_H__ #define __EC_HEALD_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ec-types.h" diff --git a/xlators/cluster/ec/src/ec-helpers.c b/xlators/cluster/ec/src/ec-helpers.c index dec39b9d2aa..e6b0359bd6f 100644 --- a/xlators/cluster/ec/src/ec-helpers.c +++ b/xlators/cluster/ec/src/ec-helpers.c @@ -10,7 +10,7 @@ #include <libgen.h> -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "ec.h" #include "ec-mem-types.h" diff --git a/xlators/cluster/ec/src/ec-inode-read.c b/xlators/cluster/ec/src/ec-inode-read.c index c02d5401439..55e59345ab0 100644 --- a/xlators/cluster/ec/src/ec-inode-read.c +++ b/xlators/cluster/ec/src/ec-inode-read.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "ec.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c index b915a992a00..e7b34e67e10 100644 --- a/xlators/cluster/ec/src/ec-inode-write.c +++ b/xlators/cluster/ec/src/ec-inode-write.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "ec.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-locks.c b/xlators/cluster/ec/src/ec-locks.c index 58c9acb6ded..5412ea6b78e 100644 --- a/xlators/cluster/ec/src/ec-locks.c +++ b/xlators/cluster/ec/src/ec-locks.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "ec-helpers.h" #include "ec-common.h" diff --git a/xlators/cluster/ec/src/ec-mem-types.h b/xlators/cluster/ec/src/ec-mem-types.h index 7af8fe2ef49..3252c4c1c58 100644 --- a/xlators/cluster/ec/src/ec-mem-types.h +++ b/xlators/cluster/ec/src/ec-mem-types.h @@ -11,7 +11,7 @@ #ifndef __EC_MEM_TYPES_H__ #define __EC_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_ec_mem_types_ { ec_mt_ec_t = gf_common_mt_end + 1, diff --git a/xlators/cluster/ec/src/ec-messages.h b/xlators/cluster/ec/src/ec-messages.h index 5f673d69aa4..7c2880851a8 100644 --- a/xlators/cluster/ec/src/ec-messages.h +++ b/xlators/cluster/ec/src/ec-messages.h @@ -11,7 +11,7 @@ #ifndef _EC_MESSAGES_H_ #define _EC_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/cluster/ec/src/ec-method.h b/xlators/cluster/ec/src/ec-method.h index ca33f4ffdce..2489fc84226 100644 --- a/xlators/cluster/ec/src/ec-method.h +++ b/xlators/cluster/ec/src/ec-method.h @@ -11,7 +11,7 @@ #ifndef __EC_METHOD_H__ #define __EC_METHOD_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ec-types.h" #include "ec-galois.h" diff --git a/xlators/cluster/ec/src/ec-types.h b/xlators/cluster/ec/src/ec-types.h index 80d9c0d4014..f3d63ca09ce 100644 --- a/xlators/cluster/ec/src/ec-types.h +++ b/xlators/cluster/ec/src/ec-types.h @@ -11,10 +11,10 @@ #ifndef __EC_TYPES_H__ #define __EC_TYPES_H__ -#include "xlator.h" -#include "timer.h" +#include <glusterfs/xlator.h> +#include <glusterfs/timer.h> #include "libxlator.h" -#include "atomic.h" +#include <glusterfs/atomic.h> #define EC_GF_MAX_REGS 16 diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c index b56dd9ada3e..d6336953343 100644 --- a/xlators/cluster/ec/src/ec.c +++ b/xlators/cluster/ec/src/ec.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" -#include "statedump.h" -#include "compat-errno.h" -#include "upcall-utils.h" +#include <glusterfs/defaults.h> +#include <glusterfs/statedump.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/upcall-utils.h> #include "ec.h" #include "ec-messages.h" @@ -23,7 +23,7 @@ #include "ec-method.h" #include "ec-code.h" #include "ec-heald.h" -#include "events.h" +#include <glusterfs/events.h> static char *ec_read_policies[EC_READ_POLICY_MAX + 1] = { [EC_ROUND_ROBIN] = "round-robin", diff --git a/xlators/cluster/stripe/src/stripe-helpers.c b/xlators/cluster/stripe/src/stripe-helpers.c index c3743723d1d..35342378985 100644 --- a/xlators/cluster/stripe/src/stripe-helpers.c +++ b/xlators/cluster/stripe/src/stripe-helpers.c @@ -11,9 +11,9 @@ #include <fnmatch.h> #include "stripe.h" -#include "byte-order.h" -#include "mem-types.h" -#include "logging.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/mem-types.h> +#include <glusterfs/logging.h> void stripe_local_wipe(stripe_local_t *local) diff --git a/xlators/cluster/stripe/src/stripe-mem-types.h b/xlators/cluster/stripe/src/stripe-mem-types.h index dcbef31212b..3ca6ecc7a41 100644 --- a/xlators/cluster/stripe/src/stripe-mem-types.h +++ b/xlators/cluster/stripe/src/stripe-mem-types.h @@ -11,7 +11,7 @@ #ifndef __STRIPE_MEM_TYPES_H__ #define __STRIPE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_stripe_mem_types_ { gf_stripe_mt_iovec = gf_common_mt_end + 1, diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index 6010c1ed6c3..557a8185352 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -26,8 +26,8 @@ #include <fnmatch.h> #include "stripe.h" #include "libxlator.h" -#include "byte-order.h" -#include "statedump.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/statedump.h> struct volume_options options[]; diff --git a/xlators/cluster/stripe/src/stripe.h b/xlators/cluster/stripe/src/stripe.h index 103c96491ff..88c24b682b8 100644 --- a/xlators/cluster/stripe/src/stripe.h +++ b/xlators/cluster/stripe/src/stripe.h @@ -11,12 +11,12 @@ #ifndef _STRIPE_H_ #define _STRIPE_H_ -#include "xlator.h" -#include "logging.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> #include "stripe-mem-types.h" #include "libxlator.h" #include <fnmatch.h> diff --git a/xlators/debug/delay-gen/src/delay-gen-mem-types.h b/xlators/debug/delay-gen/src/delay-gen-mem-types.h index 63a15a70da3..c89a9217193 100644 --- a/xlators/debug/delay-gen/src/delay-gen-mem-types.h +++ b/xlators/debug/delay-gen/src/delay-gen-mem-types.h @@ -11,7 +11,7 @@ #ifndef __DELAY_GEN_MEM_TYPES_H__ #define __DELAY_GEN_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_delay_gen_mem_types_ { gf_delay_gen_mt_dg_t = gf_common_mt_end + 1, diff --git a/xlators/debug/delay-gen/src/delay-gen-messages.h b/xlators/debug/delay-gen/src/delay-gen-messages.h index a9046ca14bf..bc98cec2885 100644 --- a/xlators/debug/delay-gen/src/delay-gen-messages.h +++ b/xlators/debug/delay-gen/src/delay-gen-messages.h @@ -11,7 +11,7 @@ #ifndef __DELAY_GEN_MESSAGES_H__ #define __DELAY_GEN_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/debug/delay-gen/src/delay-gen.h b/xlators/debug/delay-gen/src/delay-gen.h index 5e4d179f0b4..afa95e5eb2d 100644 --- a/xlators/debug/delay-gen/src/delay-gen.h +++ b/xlators/debug/delay-gen/src/delay-gen.h @@ -13,9 +13,9 @@ #include "delay-gen-mem-types.h" #include "delay-gen-messages.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> typedef struct { int enable[GF_FOP_MAXVALUE]; diff --git a/xlators/debug/error-gen/src/error-gen-mem-types.h b/xlators/debug/error-gen/src/error-gen-mem-types.h index 2facd6b27cb..b9b713af8fc 100644 --- a/xlators/debug/error-gen/src/error-gen-mem-types.h +++ b/xlators/debug/error-gen/src/error-gen-mem-types.h @@ -11,7 +11,7 @@ #ifndef __ERROR_GEN_MEM_TYPES_H__ #define __ERROR_GEN_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_error_gen_mem_types_ { gf_error_gen_mt_eg_t = gf_common_mt_end + 1, diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c index c6595b4c0e4..3d271b2ef21 100644 --- a/xlators/debug/error-gen/src/error-gen.c +++ b/xlators/debug/error-gen/src/error-gen.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 "xlator.h" +#include <glusterfs/xlator.h> #include "error-gen.h" -#include "statedump.h" -#include "defaults.h" +#include <glusterfs/statedump.h> +#include <glusterfs/defaults.h> /* * The user can specify an error probability as a float percentage, but we diff --git a/xlators/debug/io-stats/src/io-stats-mem-types.h b/xlators/debug/io-stats/src/io-stats-mem-types.h index bc25fd2ca4e..51d38d8b97c 100644 --- a/xlators/debug/io-stats/src/io-stats-mem-types.h +++ b/xlators/debug/io-stats/src/io-stats-mem-types.h @@ -11,7 +11,7 @@ #ifndef __IO_STATS_MEM_TYPES_H__ #define __IO_STATS_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> extern const char *__progname; diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index 249ef5093b4..71eae7bc7ed 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -7,8 +7,8 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "syscall.h" +#include <glusterfs/xlator.h> +#include <glusterfs/syscall.h> /** * xlators/debug/io_stats : @@ -28,18 +28,18 @@ #include <fnmatch.h> #include <errno.h> -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "io-stats-mem-types.h" #include <stdarg.h> -#include "defaults.h" -#include "logging.h" +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> #include "cli1-xdr.h" -#include "statedump.h" -#include "syncop.h" +#include <glusterfs/statedump.h> +#include <glusterfs/syncop.h> #include <pwd.h> #include <grp.h> -#include "upcall-utils.h" +#include <glusterfs/upcall-utils.h> #define MAX_LIST_MEMBERS 100 #define DEFAULT_PWD_BUF_SZ 16384 diff --git a/xlators/debug/sink/src/sink.c b/xlators/debug/sink/src/sink.c index fbbdd3a4847..965efd811ae 100644 --- a/xlators/debug/sink/src/sink.c +++ b/xlators/debug/sink/src/sink.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> int32_t init(xlator_t *this) diff --git a/xlators/debug/trace/src/trace-mem-types.h b/xlators/debug/trace/src/trace-mem-types.h index cf05a77b9f1..18a7e0414a6 100644 --- a/xlators/debug/trace/src/trace-mem-types.h +++ b/xlators/debug/trace/src/trace-mem-types.h @@ -11,7 +11,7 @@ #ifndef __TRACE_MEM_TYPES_H__ #define __TRACE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_trace_mem_types_ { gf_trace_mt_trace_conf_t = gf_common_mt_end + 1, diff --git a/xlators/debug/trace/src/trace.h b/xlators/debug/trace/src/trace.h index cd73e0f34ed..b16304799da 100644 --- a/xlators/debug/trace/src/trace.h +++ b/xlators/debug/trace/src/trace.h @@ -10,14 +10,14 @@ #include <time.h> #include <errno.h> -#include "glusterfs.h" -#include "xlator.h" -#include "common-utils.h" -#include "event-history.h" -#include "logging.h" -#include "circ-buff.h" -#include "statedump.h" -#include "options.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/event-history.h> +#include <glusterfs/logging.h> +#include <glusterfs/circ-buff.h> +#include <glusterfs/statedump.h> +#include <glusterfs/options.h> #define TRACE_DEFAULT_HISTORY_SIZE 1024 diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c index 8e9c4940abd..bdc37c500a3 100644 --- a/xlators/encryption/crypt/src/atom.c +++ b/xlators/encryption/crypt/src/atom.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/crypt-mem-types.h b/xlators/encryption/crypt/src/crypt-mem-types.h index 7e9fb90ed43..e756ea4a23c 100644 --- a/xlators/encryption/crypt/src/crypt-mem-types.h +++ b/xlators/encryption/crypt/src/crypt-mem-types.h @@ -11,7 +11,7 @@ #ifndef __CRYPT_MEM_TYPES_H__ #define __CRYPT_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_crypt_mem_types_ { gf_crypt_mt_priv = gf_common_mt_end + 1, diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 02c4028c087..02253642cc9 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -10,10 +10,10 @@ #include <ctype.h> #include <sys/uio.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/defaults.h> #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h index 390eee831b1..c1216a2cdb0 100644 --- a/xlators/encryption/crypt/src/crypt.h +++ b/xlators/encryption/crypt/src/crypt.h @@ -18,7 +18,7 @@ #include <openssl/cmac.h> #include <openssl/modes.h> #include "crypt-mem-types.h" -#include "compat.h" +#include <glusterfs/compat.h> #define CRYPT_XLATOR_ID (0) diff --git a/xlators/encryption/crypt/src/data.c b/xlators/encryption/crypt/src/data.c index 8e8701b6bf2..93288b1a414 100644 --- a/xlators/encryption/crypt/src/data.c +++ b/xlators/encryption/crypt/src/data.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/keys.c b/xlators/encryption/crypt/src/keys.c index a9357005a36..92a4d471f58 100644 --- a/xlators/encryption/crypt/src/keys.c +++ b/xlators/encryption/crypt/src/keys.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/metadata.c b/xlators/encryption/crypt/src/metadata.c index 90c53a9f721..120ae62f777 100644 --- a/xlators/encryption/crypt/src/metadata.c +++ b/xlators/encryption/crypt/src/metadata.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "crypt-common.h" #include "crypt.h" #include "metadata.h" diff --git a/xlators/encryption/rot-13/src/rot-13.c b/xlators/encryption/rot-13/src/rot-13.c index acb918e8854..0f45ee31964 100644 --- a/xlators/encryption/rot-13/src/rot-13.c +++ b/xlators/encryption/rot-13/src/rot-13.c @@ -10,9 +10,9 @@ #include <ctype.h> #include <sys/uio.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> #include "rot-13.h" diff --git a/xlators/experimental/dht2/dht2-client/src/dht2-client-main.c b/xlators/experimental/dht2/dht2-client/src/dht2-client-main.c index 556385724a4..14a4c0e04fe 100644 --- a/xlators/experimental/dht2/dht2-client/src/dht2-client-main.c +++ b/xlators/experimental/dht2/dht2-client/src/dht2-client-main.c @@ -14,10 +14,10 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> int32_t dht2_client_init(xlator_t *this) diff --git a/xlators/experimental/dht2/dht2-common/src/dht2-common-map.c b/xlators/experimental/dht2/dht2-common/src/dht2-common-map.c index d959483b8a4..84ff27241d3 100644 --- a/xlators/experimental/dht2/dht2-common/src/dht2-common-map.c +++ b/xlators/experimental/dht2/dht2-common/src/dht2-common-map.c @@ -14,6 +14,6 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> diff --git a/xlators/experimental/dht2/dht2-server/src/dht2-server-main.c b/xlators/experimental/dht2/dht2-server/src/dht2-server-main.c index f051a44e99f..6f67e07ffdf 100644 --- a/xlators/experimental/dht2/dht2-server/src/dht2-server-main.c +++ b/xlators/experimental/dht2/dht2-server/src/dht2-server-main.c @@ -14,10 +14,10 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> int32_t dht2_server_init(xlator_t *this) diff --git a/xlators/experimental/fdl/src/recon.c b/xlators/experimental/fdl/src/recon.c index ec1bf37dad9..51c57d4ac22 100644 --- a/xlators/experimental/fdl/src/recon.c +++ b/xlators/experimental/fdl/src/recon.c @@ -4,9 +4,9 @@ #include <unistd.h> #include <sys/mman.h> -#include "glusterfs.h" -#include "fd.h" -#include "syncop.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/fd.h> +#include <glusterfs/syncop.h> #include "glfs-internal.h" #define GFAPI_SUCCESS 0 diff --git a/xlators/experimental/jbr-client/src/jbr-messages.h b/xlators/experimental/jbr-client/src/jbr-messages.h index ecbf569ec13..608e024f920 100644 --- a/xlators/experimental/jbr-client/src/jbr-messages.h +++ b/xlators/experimental/jbr-client/src/jbr-messages.h @@ -11,7 +11,7 @@ #ifndef _JBR_MESSAGES_H_ #define _JBR_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/experimental/jbr-client/src/jbrc.c b/xlators/experimental/jbr-client/src/jbrc.c index 28801ecc99f..5c58a1efa99 100644 --- a/xlators/experimental/jbr-client/src/jbrc.c +++ b/xlators/experimental/jbr-client/src/jbrc.c @@ -12,13 +12,13 @@ #include "config.h" #endif -#include "call-stub.h" -#include "defaults.h" -#include "timer.h" -#include "xlator.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/timer.h> +#include <glusterfs/xlator.h> #include "jbr-messages.h" #include "jbrc.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #define SCAR_LIMIT 20 #define HILITE(x) ("[1;33m" x "[0m") diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index 31df6ad5a1e..f5fb55fee18 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -14,16 +14,16 @@ #endif #include <fnmatch.h> -#include "call-stub.h" -#include "defaults.h" -#include "xlator.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/xlator.h> #include "glfs.h" #include "glfs-internal.h" -#include "run.h" -#include "common-utils.h" -#include "syncop.h" -#include "syscall.h" -#include "compat-errno.h" +#include <glusterfs/run.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/syncop.h> +#include <glusterfs/syscall.h> +#include <glusterfs/compat-errno.h> #include "fdl.h" #include "jbr-internal.h" diff --git a/xlators/experimental/posix2/common/src/posix2-common.c b/xlators/experimental/posix2/common/src/posix2-common.c index 14b51d538b2..06702528bec 100644 --- a/xlators/experimental/posix2/common/src/posix2-common.c +++ b/xlators/experimental/posix2/common/src/posix2-common.c @@ -13,6 +13,6 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> diff --git a/xlators/experimental/posix2/ds/src/posix2-ds-main.c b/xlators/experimental/posix2/ds/src/posix2-ds-main.c index 4e399a98ed4..0d3a026611e 100644 --- a/xlators/experimental/posix2/ds/src/posix2-ds-main.c +++ b/xlators/experimental/posix2/ds/src/posix2-ds-main.c @@ -14,10 +14,10 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> int32_t posix2_ds_init(xlator_t *this) diff --git a/xlators/experimental/posix2/mds/src/posix2-mds-main.c b/xlators/experimental/posix2/mds/src/posix2-mds-main.c index 58da05f2091..f2ec570917d 100644 --- a/xlators/experimental/posix2/mds/src/posix2-mds-main.c +++ b/xlators/experimental/posix2/mds/src/posix2-mds-main.c @@ -14,10 +14,10 @@ * The entire functionality including comments is TODO. */ -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> int32_t posix2_mds_init(xlator_t *this) diff --git a/xlators/features/arbiter/src/arbiter-mem-types.h b/xlators/features/arbiter/src/arbiter-mem-types.h index 0f77cfd05f4..05d18374c46 100644 --- a/xlators/features/arbiter/src/arbiter-mem-types.h +++ b/xlators/features/arbiter/src/arbiter-mem-types.h @@ -9,7 +9,7 @@ #ifndef __ARBITER_MEM_TYPES_H__ #define __ARBITER_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> typedef enum gf_arbiter_mem_types_ { gf_arbiter_mt_inode_ctx_t = gf_common_mt_end + 1, diff --git a/xlators/features/arbiter/src/arbiter.c b/xlators/features/arbiter/src/arbiter.c index 4af68f9ba52..fa2b3bf5a6c 100644 --- a/xlators/features/arbiter/src/arbiter.c +++ b/xlators/features/arbiter/src/arbiter.c @@ -10,9 +10,9 @@ #include "arbiter.h" #include "arbiter-mem-types.h" -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> static arbiter_inode_ctx_t * __arbiter_inode_ctx_get(inode_t *inode, xlator_t *this) diff --git a/xlators/features/arbiter/src/arbiter.h b/xlators/features/arbiter/src/arbiter.h index ce1c909f70f..546db7b751a 100644 --- a/xlators/features/arbiter/src/arbiter.h +++ b/xlators/features/arbiter/src/arbiter.h @@ -11,8 +11,8 @@ #ifndef _ARBITER_H #define _ARBITER_H -#include "locking.h" -#include "common-utils.h" +#include <glusterfs/locking.h> +#include <glusterfs/common-utils.h> typedef struct arbiter_inode_ctx_ { struct iatt iattbuf; diff --git a/xlators/features/barrier/src/barrier-mem-types.h b/xlators/features/barrier/src/barrier-mem-types.h index 93ccab633ce..71ed7898d9c 100644 --- a/xlators/features/barrier/src/barrier-mem-types.h +++ b/xlators/features/barrier/src/barrier-mem-types.h @@ -11,7 +11,7 @@ #ifndef __BARRIER_MEM_TYPES_H__ #define __BARRIER_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_barrier_mem_types_ { gf_barrier_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/barrier/src/barrier.c b/xlators/features/barrier/src/barrier.c index 1c5c5ffdc22..b40399d7f91 100644 --- a/xlators/features/barrier/src/barrier.c +++ b/xlators/features/barrier/src/barrier.c @@ -9,10 +9,10 @@ */ #include "barrier.h" -#include "defaults.h" -#include "call-stub.h" +#include <glusterfs/defaults.h> +#include <glusterfs/call-stub.h> -#include "statedump.h" +#include <glusterfs/statedump.h> void barrier_local_set_gfid(call_frame_t *frame, uuid_t gfid, xlator_t *this) diff --git a/xlators/features/barrier/src/barrier.h b/xlators/features/barrier/src/barrier.h index d11d71d151e..e5977084f21 100644 --- a/xlators/features/barrier/src/barrier.h +++ b/xlators/features/barrier/src/barrier.h @@ -12,9 +12,9 @@ #define __BARRIER_H__ #include "barrier-mem-types.h" -#include "xlator.h" -#include "timer.h" -#include "call-stub.h" +#include <glusterfs/xlator.h> +#include <glusterfs/timer.h> +#include <glusterfs/call-stub.h> #define BARRIER_FOP_CBK(fop_name, label, frame, this, params...) \ do { \ diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-bitd-messages.h b/xlators/features/bit-rot/src/bitd/bit-rot-bitd-messages.h index 6f59933a31d..3d40089dc95 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot-bitd-messages.h +++ b/xlators/features/bit-rot/src/bitd/bit-rot-bitd-messages.h @@ -11,7 +11,7 @@ #ifndef _BITROT_BITD_MESSAGES_H_ #define _BITROT_BITD_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/features/bit-rot/src/bitd/bit-rot-scrub.c b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c index 63903b0d235..2e20e1f9572 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c @@ -12,15 +12,15 @@ #include <ctype.h> #include <sys/uio.h> -#include "glusterfs.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include "bit-rot-scrub.h" #include <pthread.h> #include "bit-rot-bitd-messages.h" #include "bit-rot-scrub-status.h" -#include "events.h" +#include <glusterfs/events.h> struct br_scrubbers { pthread_t scrubthread; diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.h b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.h index 7a3c14abb93..4e5f67bc021 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.h +++ b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.h @@ -11,7 +11,7 @@ #ifndef __BIT_ROT_SCRUB_H__ #define __BIT_ROT_SCRUB_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "bit-rot.h" void * diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-ssm.h b/xlators/features/bit-rot/src/bitd/bit-rot-ssm.h index f3fbe2928b7..37b45a42eac 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot-ssm.h +++ b/xlators/features/bit-rot/src/bitd/bit-rot-ssm.h @@ -11,7 +11,7 @@ #ifndef __BIT_ROT_SSM_H__ #define __BIT_ROT_SSM_H__ -#include "xlator.h" +#include <glusterfs/xlator.h> typedef enum br_scrub_state { BR_SCRUB_STATE_INACTIVE = 0, diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c index 8ea89257836..f45d438ea07 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot.c @@ -11,10 +11,10 @@ #include <ctype.h> #include <sys/uio.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "compat-errno.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/compat-errno.h> #include "bit-rot.h" #include "bit-rot-scrub.h" diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.h b/xlators/features/bit-rot/src/bitd/bit-rot.h index 962b4d717e6..a4d4fd74198 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.h +++ b/xlators/features/bit-rot/src/bitd/bit-rot.h @@ -11,17 +11,17 @@ #ifndef __BIT_ROT_H__ #define __BIT_ROT_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" -#include "syncop.h" -#include "syncop-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/syncop.h> +#include <glusterfs/syncop-utils.h> #include "changelog.h" #include "timer-wheel.h" -#include "throttle-tbf.h" +#include <glusterfs/throttle-tbf.h> #include "bit-rot-ssm.h" #include "bit-rot-common.h" diff --git a/xlators/features/bit-rot/src/stub/bit-rot-common.h b/xlators/features/bit-rot/src/stub/bit-rot-common.h index ef683ac7f9f..20561aa7764 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-common.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-common.h @@ -11,7 +11,7 @@ #ifndef __BIT_ROT_COMMON_H__ #define __BIT_ROT_COMMON_H__ -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "bit-rot-object-version.h" #define BR_VXATTR_VERSION (1 << 0) diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub-mem-types.h b/xlators/features/bit-rot/src/stub/bit-rot-stub-mem-types.h index a3e7b03291e..40bcda110e6 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub-mem-types.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub-mem-types.h @@ -11,7 +11,7 @@ #ifndef _BR_MEM_TYPES_H #define _BR_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum br_mem_types { gf_br_stub_mt_private_t = gf_common_mt_end + 1, diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub-messages.h b/xlators/features/bit-rot/src/stub/bit-rot-stub-messages.h index 0e22f74f9cf..7f07f2929ad 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub-messages.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub-messages.h @@ -11,7 +11,7 @@ #ifndef _BITROT_STUB_MESSAGES_H_ #define _BITROT_STUB_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/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index 0fc2b651b2d..673a9d551ee 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -12,12 +12,12 @@ #include <sys/uio.h> #include <signal.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> #include "changelog.h" -#include "compat-errno.h" -#include "call-stub.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/call-stub.h> #include "bit-rot-stub.h" #include "bit-rot-stub-mem-types.h" diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.h b/xlators/features/bit-rot/src/stub/bit-rot-stub.h index 9e6492ebdd7..c688d92f26f 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.h @@ -10,20 +10,20 @@ #ifndef __BIT_ROT_STUB_H__ #define __BIT_ROT_STUB_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" -#include "call-stub.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/call-stub.h> #include "bit-rot-stub-mem-types.h" -#include "syscall.h" -#include "common-utils.h" +#include <glusterfs/syscall.h> +#include <glusterfs/common-utils.h> #include "bit-rot-common.h" #include "bit-rot-stub-messages.h" #include "glusterfs3-xdr.h" -#include "syncop.h" -#include "syncop-utils.h" +#include <glusterfs/syncop.h> +#include <glusterfs/syncop-utils.h> #define BAD_OBJECT_THREAD_STACK_SIZE ((size_t)(1024 * 1024)) #define BR_STUB_DUMP_STR_SIZE 65536 diff --git a/xlators/features/changelog/lib/src/changelog-lib-messages.h b/xlators/features/changelog/lib/src/changelog-lib-messages.h index 32b3497d89d..7695944b676 100644 --- a/xlators/features/changelog/lib/src/changelog-lib-messages.h +++ b/xlators/features/changelog/lib/src/changelog-lib-messages.h @@ -11,7 +11,7 @@ #ifndef _CHANGELOG_LIB_MESSAGES_H_ #define _CHANGELOG_LIB_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/features/changelog/lib/src/gf-changelog-api.c b/xlators/features/changelog/lib/src/gf-changelog-api.c index 1b6e932596d..219ce7d560a 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-api.c +++ b/xlators/features/changelog/lib/src/gf-changelog-api.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "compat-uuid.h" -#include "globals.h" -#include "glusterfs.h" -#include "syscall.h" +#include <glusterfs/compat-uuid.h> +#include <glusterfs/globals.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> #include "gf-changelog-helpers.h" #include "gf-changelog-journal.h" diff --git a/xlators/features/changelog/lib/src/gf-changelog-helpers.c b/xlators/features/changelog/lib/src/gf-changelog-helpers.c index fd15ec68ab8..03dac5e4729 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-helpers.c +++ b/xlators/features/changelog/lib/src/gf-changelog-helpers.c @@ -11,7 +11,7 @@ #include "changelog-mem-types.h" #include "gf-changelog-helpers.h" #include "changelog-lib-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> ssize_t gf_changelog_read_path(int fd, char *buffer, size_t bufsize) diff --git a/xlators/features/changelog/lib/src/gf-changelog-helpers.h b/xlators/features/changelog/lib/src/gf-changelog-helpers.h index cfb26a0081e..afa0549bdad 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-helpers.h +++ b/xlators/features/changelog/lib/src/gf-changelog-helpers.h @@ -14,9 +14,9 @@ #include <unistd.h> #include <dirent.h> #include <limits.h> -#include "locking.h" +#include <glusterfs/locking.h> -#include <xlator.h> +#include <glusterfs/xlator.h> #include "changelog.h" diff --git a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c index ef46bf50c97..d2ac7efd7c7 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c +++ b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "compat-uuid.h" -#include "globals.h" -#include "glusterfs.h" -#include "syscall.h" -#include "compat-errno.h" +#include <glusterfs/compat-uuid.h> +#include <glusterfs/globals.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> +#include <glusterfs/compat-errno.h> #include "gf-changelog-helpers.h" diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c index 132e8511be4..91f189d13ab 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c +++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c @@ -15,7 +15,7 @@ #include "changelog-rpc-common.h" #include "changelog-lib-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> /** * Reverse socket: actual data transfer handler. Connection diff --git a/xlators/features/changelog/lib/src/gf-changelog-rpc.h b/xlators/features/changelog/lib/src/gf-changelog-rpc.h index 975307b99d3..5c82d6f1c08 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-rpc.h +++ b/xlators/features/changelog/lib/src/gf-changelog-rpc.h @@ -11,7 +11,7 @@ #ifndef __GF_CHANGELOG_RPC_H #define __GF_CHANGELOG_RPC_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "gf-changelog-helpers.h" #include "changelog-rpc-common.h" diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c index 42e20915922..7ed9e553e68 100644 --- a/xlators/features/changelog/lib/src/gf-changelog.c +++ b/xlators/features/changelog/lib/src/gf-changelog.c @@ -22,11 +22,11 @@ #endif #include <string.h> -#include "globals.h" -#include "glusterfs.h" -#include "logging.h" -#include "defaults.h" -#include "syncop.h" +#include <glusterfs/globals.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/defaults.h> +#include <glusterfs/syncop.h> #include "gf-changelog-rpc.h" #include "gf-changelog-helpers.h" diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c index c8a31ebbd73..3e384ea0784 100644 --- a/xlators/features/changelog/lib/src/gf-history-changelog.c +++ b/xlators/features/changelog/lib/src/gf-history-changelog.c @@ -8,10 +8,10 @@ #endif #include <string.h> -#include "globals.h" -#include "glusterfs.h" -#include "logging.h" -#include "syscall.h" +#include <glusterfs/globals.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/syscall.h> #include "gf-changelog-helpers.h" #include "gf-changelog-journal.h" diff --git a/xlators/features/changelog/src/changelog-barrier.c b/xlators/features/changelog/src/changelog-barrier.c index e8d742404df..be7384ecd0f 100644 --- a/xlators/features/changelog/src/changelog-barrier.c +++ b/xlators/features/changelog/src/changelog-barrier.c @@ -10,7 +10,7 @@ #include "changelog-helpers.h" #include "changelog-messages.h" -#include "call-stub.h" +#include <glusterfs/call-stub.h> /* Enqueue a stub*/ void diff --git a/xlators/features/changelog/src/changelog-encoders.h b/xlators/features/changelog/src/changelog-encoders.h index ca42c4c4fe0..26252696d56 100644 --- a/xlators/features/changelog/src/changelog-encoders.h +++ b/xlators/features/changelog/src/changelog-encoders.h @@ -11,8 +11,8 @@ #ifndef _CHANGELOG_ENCODERS_H #define _CHANGELOG_ENCODERS_H -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "changelog-helpers.h" diff --git a/xlators/features/changelog/src/changelog-ev-handle.h b/xlators/features/changelog/src/changelog-ev-handle.h index 7e543a0edb3..53119c5e209 100644 --- a/xlators/features/changelog/src/changelog-ev-handle.h +++ b/xlators/features/changelog/src/changelog-ev-handle.h @@ -11,11 +11,11 @@ #ifndef __CHANGELOG_EV_HANDLE_H #define __CHANGELOG_EV_HANDLE_H -#include "list.h" -#include "xlator.h" +#include <glusterfs/list.h> +#include <glusterfs/xlator.h> #include "rpc-clnt.h" -#include "rot-buffs.h" +#include <glusterfs/rot-buffs.h> struct changelog_clnt; diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index 9ff9115c40d..0be8f411164 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "logging.h" -#include "iobuf.h" -#include "syscall.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> +#include <glusterfs/iobuf.h> +#include <glusterfs/syscall.h> #include "changelog-helpers.h" #include "changelog-encoders.h" diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h index 10d457e8cf5..1b8fcb8675a 100644 --- a/xlators/features/changelog/src/changelog-helpers.h +++ b/xlators/features/changelog/src/changelog-helpers.h @@ -11,14 +11,14 @@ #ifndef _CHANGELOG_HELPERS_H #define _CHANGELOG_HELPERS_H -#include "locking.h" -#include "timer.h" +#include <glusterfs/locking.h> +#include <glusterfs/timer.h> #include "pthread.h" -#include "iobuf.h" -#include "rot-buffs.h" +#include <glusterfs/iobuf.h> +#include <glusterfs/rot-buffs.h> #include "changelog-misc.h" -#include "call-stub.h" +#include <glusterfs/call-stub.h> #include "rpcsvc.h" #include "changelog-ev-handle.h" diff --git a/xlators/features/changelog/src/changelog-mem-types.h b/xlators/features/changelog/src/changelog-mem-types.h index 1e3786c6298..a2d8a9cbe93 100644 --- a/xlators/features/changelog/src/changelog-mem-types.h +++ b/xlators/features/changelog/src/changelog-mem-types.h @@ -11,7 +11,7 @@ #ifndef _CHANGELOG_MEM_TYPES_H #define _CHANGELOG_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_changelog_mem_types { gf_changelog_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/changelog/src/changelog-messages.h b/xlators/features/changelog/src/changelog-messages.h index dbf133ec836..9edd9ae60ec 100644 --- a/xlators/features/changelog/src/changelog-messages.h +++ b/xlators/features/changelog/src/changelog-messages.h @@ -11,7 +11,7 @@ #ifndef _CHANGELOG_MESSAGES_H_ #define _CHANGELOG_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/features/changelog/src/changelog-misc.h b/xlators/features/changelog/src/changelog-misc.h index 04d1bdeba03..e2addc09414 100644 --- a/xlators/features/changelog/src/changelog-misc.h +++ b/xlators/features/changelog/src/changelog-misc.h @@ -11,8 +11,8 @@ #ifndef _CHANGELOG_MISC_H #define _CHANGELOG_MISC_H -#include "glusterfs.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/common-utils.h> #define CHANGELOG_MAX_TYPE 4 #define CHANGELOG_FILE_NAME "CHANGELOG" diff --git a/xlators/features/changelog/src/changelog-rpc-common.c b/xlators/features/changelog/src/changelog-rpc-common.c index 91d6581836a..89a5ab30a68 100644 --- a/xlators/features/changelog/src/changelog-rpc-common.c +++ b/xlators/features/changelog/src/changelog-rpc-common.c @@ -11,7 +11,7 @@ #include "changelog-rpc-common.h" #include "changelog-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> /** ***************************************************** Client Interface diff --git a/xlators/features/changelog/src/changelog-rpc-common.h b/xlators/features/changelog/src/changelog-rpc-common.h index 2d3f06e60c0..4d9aa2c694b 100644 --- a/xlators/features/changelog/src/changelog-rpc-common.h +++ b/xlators/features/changelog/src/changelog-rpc-common.h @@ -13,8 +13,8 @@ #include "rpcsvc.h" #include "rpc-clnt.h" -#include "gf-event.h" -#include "call-stub.h" +#include <glusterfs/gf-event.h> +#include <glusterfs/call-stub.h> #include "changelog-xdr.h" #include "xdr-generic.h" diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c index 828f85e8e45..394fae44e3e 100644 --- a/xlators/features/changelog/src/changelog-rpc.c +++ b/xlators/features/changelog/src/changelog-rpc.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "syscall.h" +#include <glusterfs/syscall.h> #include "changelog-rpc.h" #include "changelog-mem-types.h" #include "changelog-ev-handle.h" diff --git a/xlators/features/changelog/src/changelog-rpc.h b/xlators/features/changelog/src/changelog-rpc.h index 8002cea5091..b1707565249 100644 --- a/xlators/features/changelog/src/changelog-rpc.h +++ b/xlators/features/changelog/src/changelog-rpc.h @@ -11,7 +11,7 @@ #ifndef __CHANGELOG_RPC_H #define __CHANGELOG_RPC_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "changelog-helpers.h" /* one time */ diff --git a/xlators/features/changelog/src/changelog-rt.c b/xlators/features/changelog/src/changelog-rt.c index 968c76b8b20..841545ae359 100644 --- a/xlators/features/changelog/src/changelog-rt.c +++ b/xlators/features/changelog/src/changelog-rt.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "logging.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> #include "changelog-rt.h" #include "changelog-mem-types.h" diff --git a/xlators/features/changelog/src/changelog-rt.h b/xlators/features/changelog/src/changelog-rt.h index df0d5b03487..28b9827d85b 100644 --- a/xlators/features/changelog/src/changelog-rt.h +++ b/xlators/features/changelog/src/changelog-rt.h @@ -11,8 +11,8 @@ #ifndef _CHANGELOG_RT_H #define _CHANGELOG_RT_H -#include "locking.h" -#include "timer.h" +#include <glusterfs/locking.h> +#include <glusterfs/timer.h> #include "pthread.h" #include "changelog-helpers.h" diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c index 35a523316ed..933d28a17f8 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" -#include "syscall.h" -#include "logging.h" -#include "iobuf.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/syscall.h> +#include <glusterfs/logging.h> +#include <glusterfs/iobuf.h> #include "changelog-rt.h" diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.c b/xlators/features/changetimerecorder/src/changetimerecorder.c index 3c63c43ee3d..1d8068c4f4e 100644 --- a/xlators/features/changetimerecorder/src/changetimerecorder.c +++ b/xlators/features/changetimerecorder/src/changetimerecorder.c @@ -13,7 +13,7 @@ #include "gfdb_sqlite3.h" #include "ctr-helper.h" #include "ctr-messages.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "changetimerecorder.h" #include "tier-ctr-interface.h" diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.h b/xlators/features/changetimerecorder/src/changetimerecorder.h index 2a8bbd18c5b..0150a1c91bc 100644 --- a/xlators/features/changetimerecorder/src/changetimerecorder.h +++ b/xlators/features/changetimerecorder/src/changetimerecorder.h @@ -11,10 +11,10 @@ #ifndef __CTR_H #define __CTR_H -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include "ctr_mem_types.h" #include "ctr-helper.h" diff --git a/xlators/features/changetimerecorder/src/ctr-helper.h b/xlators/features/changetimerecorder/src/ctr-helper.h index 3268c9d2fb9..517fbb0b7de 100644 --- a/xlators/features/changetimerecorder/src/ctr-helper.h +++ b/xlators/features/changetimerecorder/src/ctr-helper.h @@ -11,14 +11,14 @@ #ifndef __CTR_HELPER_H #define __CTR_HELPER_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ctr_mem_types.h" -#include "iatt.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/iatt.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include <time.h> #include <sys/time.h> #include <pthread.h> diff --git a/xlators/features/changetimerecorder/src/ctr-messages.h b/xlators/features/changetimerecorder/src/ctr-messages.h index 105d2265430..23adf0aec09 100644 --- a/xlators/features/changetimerecorder/src/ctr-messages.h +++ b/xlators/features/changetimerecorder/src/ctr-messages.h @@ -11,7 +11,7 @@ #ifndef _CTR_MESSAGES_H_ #define _CTR_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/features/changetimerecorder/src/ctr-xlator-ctx.h b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.h index 584d3b79ba4..4e3bf7e2798 100644 --- a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.h +++ b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.h @@ -11,14 +11,14 @@ #ifndef __CTR_XLATOR_CTX_H #define __CTR_XLATOR_CTX_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "ctr_mem_types.h" -#include "iatt.h" -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "locking.h" -#include "common-utils.h" +#include <glusterfs/iatt.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/locking.h> +#include <glusterfs/common-utils.h> #include <time.h> #include <sys/time.h> diff --git a/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.c b/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.c index 6bb68cd170c..ee63f983980 100644 --- a/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.c +++ b/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.c @@ -20,11 +20,11 @@ #include <dlfcn.h> -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "cloudsync.h" #include "cloudsync-common.h" -#include "call-stub.h" +#include <glusterfs/call-stub.h> #pragma generate diff --git a/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.h b/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.h index 2db2a9c88c7..d922c77d8aa 100644 --- a/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.h +++ b/xlators/features/cloudsync/src/cloudsync-autogen-fops-tmpl.h @@ -15,7 +15,7 @@ #ifndef _CLOUDSYNC_AUTOGEN_FOPS_H #define _CLOUDSYNC_AUTOGEN_FOPS_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "cloudsync.h" #include "cloudsync-common.h" diff --git a/xlators/features/cloudsync/src/cloudsync-common.h b/xlators/features/cloudsync/src/cloudsync-common.h index 0be6a446456..7b3520ce9be 100644 --- a/xlators/features/cloudsync/src/cloudsync-common.h +++ b/xlators/features/cloudsync/src/cloudsync-common.h @@ -10,10 +10,10 @@ #ifndef _CLOUDSYNC_COMMON_H #define _CLOUDSYNC_COMMON_H -#include "glusterfs.h" -#include "call-stub.h" -#include "xlator.h" -#include "syncop.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syncop.h> #include "cloudsync-mem-types.h" #include "cloudsync-messages.h" diff --git a/xlators/features/cloudsync/src/cloudsync-mem-types.h b/xlators/features/cloudsync/src/cloudsync-mem-types.h index 46d4f3aa2a1..9e6837a1d3d 100644 --- a/xlators/features/cloudsync/src/cloudsync-mem-types.h +++ b/xlators/features/cloudsync/src/cloudsync-mem-types.h @@ -11,7 +11,7 @@ #ifndef __CLOUDSYNC_MEM_TYPES_H__ #define __CLOUDSYNC_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum cs_mem_types_ { gf_cs_mt_cs_private_t = gf_common_mt_end + 1, gf_cs_mt_cs_remote_stores_t, diff --git a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3-mem-types.h b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3-mem-types.h index 0aaab1fe955..7ccfcc9f4b6 100644 --- a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3-mem-types.h +++ b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3-mem-types.h @@ -11,7 +11,7 @@ #ifndef __LIBAWS_MEM_TYPES_H__ #define __LIBAWS_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum libaws_mem_types_ { gf_libaws_mt_aws_private_t = gf_common_mt_end + 1, gf_libaws_mt_end diff --git a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c index e2bbb680f6c..7680260988b 100644 --- a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c +++ b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c @@ -15,8 +15,8 @@ #include <openssl/buffer.h> #include <openssl/crypto.h> #include <curl/curl.h> -#include "xlator.h" -#include "glusterfs.h" +#include <glusterfs/xlator.h> +#include <glusterfs/glusterfs.h> #include "libcloudsyncs3.h" #include "cloudsync-common.h" diff --git a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.h b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.h index b1a95f8cbf9..85ae669486b 100644 --- a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.h +++ b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.h @@ -10,10 +10,10 @@ #ifndef _LIBAWS_H #define _LIBAWS_H -#include "glusterfs.h" -#include "call-stub.h" -#include "xlator.h" -#include "syncop.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syncop.h> #include <curl/curl.h> #include "cloudsync-common.h" #include "libcloudsyncs3-mem-types.h" diff --git a/xlators/features/cloudsync/src/cloudsync.c b/xlators/features/cloudsync/src/cloudsync.c index 918ed786b6b..fbdcdf72b5b 100644 --- a/xlators/features/cloudsync/src/cloudsync.c +++ b/xlators/features/cloudsync/src/cloudsync.c @@ -8,12 +8,12 @@ * cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "cloudsync.h" #include "cloudsync-common.h" -#include "call-stub.h" +#include <glusterfs/call-stub.h> #include "cloudsync-autogen-fops.h" #include <dlfcn.h> diff --git a/xlators/features/cloudsync/src/cloudsync.h b/xlators/features/cloudsync/src/cloudsync.h index 7c70c744d2b..dbdb207ddea 100644 --- a/xlators/features/cloudsync/src/cloudsync.h +++ b/xlators/features/cloudsync/src/cloudsync.h @@ -11,11 +11,11 @@ #ifndef __CLOUDSYNC_H__ #define __CLOUDSYNC_H__ -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" -#include "syncop.h" -#include "call-stub.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/syncop.h> +#include <glusterfs/call-stub.h> #include "cloudsync-common.h" #include "cloudsync-autogen-fops.h" diff --git a/xlators/features/compress/src/cdc-helper.c b/xlators/features/compress/src/cdc-helper.c index 71f446d51cd..f973ff56cf5 100644 --- a/xlators/features/compress/src/cdc-helper.c +++ b/xlators/features/compress/src/cdc-helper.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "logging.h" -#include "syscall.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/syscall.h> #include "cdc.h" #include "cdc-mem-types.h" diff --git a/xlators/features/compress/src/cdc-mem-types.h b/xlators/features/compress/src/cdc-mem-types.h index 56a5a05ee8c..928afdd2efe 100644 --- a/xlators/features/compress/src/cdc-mem-types.h +++ b/xlators/features/compress/src/cdc-mem-types.h @@ -11,7 +11,7 @@ #ifndef __CDC_MEM_TYPES_H #define __CDC_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_cdc_mem_types { gf_cdc_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/compress/src/cdc.c b/xlators/features/compress/src/cdc.c index adace6bcca8..19e56b0daa5 100644 --- a/xlators/features/compress/src/cdc.c +++ b/xlators/features/compress/src/cdc.c @@ -10,9 +10,9 @@ #include <sys/uio.h> -#include "xlator.h" -#include "defaults.h" -#include "logging.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> #include "cdc.h" #include "cdc-mem-types.h" diff --git a/xlators/features/compress/src/cdc.h b/xlators/features/compress/src/cdc.h index 764f2028c75..cb87b06a989 100644 --- a/xlators/features/compress/src/cdc.h +++ b/xlators/features/compress/src/cdc.h @@ -15,7 +15,7 @@ #include "zlib.h" #endif -#include "xlator.h" +#include <glusterfs/xlator.h> #ifndef MAX_IOVEC #define MAX_IOVEC 16 diff --git a/xlators/features/gfid-access/src/gfid-access-mem-types.h b/xlators/features/gfid-access/src/gfid-access-mem-types.h index ee7fd794da8..1c4d0b93de2 100644 --- a/xlators/features/gfid-access/src/gfid-access-mem-types.h +++ b/xlators/features/gfid-access/src/gfid-access-mem-types.h @@ -11,7 +11,7 @@ #ifndef _GFID_ACCESS_MEM_TYPES_H #define _GFID_ACCESS_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_changelog_mem_types { gf_gfid_access_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/gfid-access/src/gfid-access.c b/xlators/features/gfid-access/src/gfid-access.c index 0cf7870856b..450f108d16e 100644 --- a/xlators/features/gfid-access/src/gfid-access.c +++ b/xlators/features/gfid-access/src/gfid-access.c @@ -8,9 +8,9 @@ cases as published by the Free Software Foundation. */ #include "gfid-access.h" -#include "inode.h" -#include "byte-order.h" -#include "statedump.h" +#include <glusterfs/inode.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/statedump.h> int ga_valid_inode_loc_copy(loc_t *dst, loc_t *src, xlator_t *this) diff --git a/xlators/features/gfid-access/src/gfid-access.h b/xlators/features/gfid-access/src/gfid-access.h index 68ebe539564..b1e255e56c0 100644 --- a/xlators/features/gfid-access/src/gfid-access.h +++ b/xlators/features/gfid-access/src/gfid-access.h @@ -10,11 +10,11 @@ #ifndef __GFID_ACCESS_H__ #define __GFID_ACCESS_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "gfid-access-mem-types.h" #define UUID_CANONICAL_FORM_LEN 36 diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c index d1a111eab4a..e2241b49ad3 100644 --- a/xlators/features/glupy/src/glupy.c +++ b/xlators/features/glupy/src/glupy.c @@ -13,10 +13,10 @@ #include <sys/uio.h> #include <Python.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/defaults.h> #include "glupy.h" diff --git a/xlators/features/glupy/src/glupy.h b/xlators/features/glupy/src/glupy.h index 851b02154d2..ca3ac170451 100644 --- a/xlators/features/glupy/src/glupy.h +++ b/xlators/features/glupy/src/glupy.h @@ -11,7 +11,7 @@ #ifndef __GLUPY_H__ #define __GLUPY_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum { GLUPY_LOOKUP = 0, diff --git a/xlators/features/index/src/index-mem-types.h b/xlators/features/index/src/index-mem-types.h index a663d76023d..7455e8bbe68 100644 --- a/xlators/features/index/src/index-mem-types.h +++ b/xlators/features/index/src/index-mem-types.h @@ -11,7 +11,7 @@ #ifndef __QUIESCE_MEM_TYPES_H__ #define __QUIESCE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_index_mem_types_ { gf_index_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/index/src/index-messages.h b/xlators/features/index/src/index-messages.h index 3495fb080f0..364f17cd34e 100644 --- a/xlators/features/index/src/index-messages.h +++ b/xlators/features/index/src/index-messages.h @@ -11,7 +11,7 @@ #ifndef _INDEX_MESSAGES_H_ #define _INDEX_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/features/index/src/index.c b/xlators/features/index/src/index.c index c487e8a5726..6099115d6e7 100644 --- a/xlators/features/index/src/index.c +++ b/xlators/features/index/src/index.c @@ -8,11 +8,11 @@ cases as published by the Free Software Foundation. */ #include "index.h" -#include "options.h" +#include <glusterfs/options.h> #include "glusterfs3-xdr.h" -#include "syscall.h" -#include "syncop.h" -#include "common-utils.h" +#include <glusterfs/syscall.h> +#include <glusterfs/syncop.h> +#include <glusterfs/common-utils.h> #include "index-messages.h" #include <ftw.h> #include <libgen.h> /* for dirname() */ diff --git a/xlators/features/index/src/index.h b/xlators/features/index/src/index.h index 149cfd415b3..a2b6e6e2570 100644 --- a/xlators/features/index/src/index.h +++ b/xlators/features/index/src/index.h @@ -11,11 +11,11 @@ #ifndef __INDEX_H__ #define __INDEX_H__ -#include "xlator.h" -#include "call-stub.h" -#include "defaults.h" -#include "byte-order.h" -#include "common-utils.h" +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> #include "index-mem-types.h" #define INDEX_THREAD_STACK_SIZE ((size_t)(1024 * 1024)) diff --git a/xlators/features/leases/src/leases-mem-types.h b/xlators/features/leases/src/leases-mem-types.h index 3a646cbc316..25664b44156 100644 --- a/xlators/features/leases/src/leases-mem-types.h +++ b/xlators/features/leases/src/leases-mem-types.h @@ -11,7 +11,7 @@ #ifndef __LEASES_MEM_TYPES_H__ #define __LEASES_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_leases_mem_types_ { gf_leases_mt_private_t = gf_common_mt_end + 1, diff --git a/xlators/features/leases/src/leases-messages.h b/xlators/features/leases/src/leases-messages.h index 81a517f63cd..da696b832de 100644 --- a/xlators/features/leases/src/leases-messages.h +++ b/xlators/features/leases/src/leases-messages.h @@ -11,7 +11,7 @@ #ifndef _LEASES_MESSAGES_H_ #define _LEASES_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/features/leases/src/leases.h b/xlators/features/leases/src/leases.h index 6ac712b0bb0..9749fd903e1 100644 --- a/xlators/features/leases/src/leases.h +++ b/xlators/features/leases/src/leases.h @@ -16,15 +16,15 @@ #include "config.h" #endif -#include "common-utils.h" -#include "glusterfs.h" -#include "xlator.h" -#include "call-stub.h" -#include "logging.h" -#include "client_t.h" -#include "lkowner.h" -#include "locking.h" -#include "upcall-utils.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/logging.h> +#include <glusterfs/client_t.h> +#include <glusterfs/lkowner.h> +#include <glusterfs/locking.h> +#include <glusterfs/upcall-utils.h> #include "timer-wheel.h" #include "leases-mem-types.h" #include "leases-messages.h" diff --git a/xlators/features/locks/src/clear.c b/xlators/features/locks/src/clear.c index 0966ee753d6..fbd17942c6c 100644 --- a/xlators/features/locks/src/clear.c +++ b/xlators/features/locks/src/clear.c @@ -12,15 +12,15 @@ #include <limits.h> #include <pthread.h> -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include "locks.h" #include "common.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include "clear.h" int diff --git a/xlators/features/locks/src/clear.h b/xlators/features/locks/src/clear.h index 08662746f98..5d89a1da728 100644 --- a/xlators/features/locks/src/clear.h +++ b/xlators/features/locks/src/clear.h @@ -10,9 +10,9 @@ #ifndef __CLEAR_H__ #define __CLEAR_H__ -#include "compat-errno.h" -#include "stack.h" -#include "call-stub.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/stack.h> +#include <glusterfs/call-stub.h> #include "locks.h" typedef enum { diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 5ad5415ed79..57599eedb88 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -12,11 +12,11 @@ #include <limits.h> #include <pthread.h> -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include "locks.h" #include "common.h" diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h index c3d0e361933..af08c2b3774 100644 --- a/xlators/features/locks/src/common.h +++ b/xlators/features/locks/src/common.h @@ -10,7 +10,7 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include "lkowner.h" +#include <glusterfs/lkowner.h> /*dump locks format strings */ #define RANGE_FMT "type=%s, whence=%hd, start=%llu, len=%llu" #define ENTRY_FMT "type=%s on basename=%s" diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index 60e7bed2a44..d4135542cc9 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -7,13 +7,13 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" -#include "list.h" -#include "upcall-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/list.h> +#include <glusterfs/upcall-utils.h> #include "locks.h" #include "clear.h" diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index b8e005038d8..19b6f739f28 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -7,13 +7,13 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" -#include "list.h" -#include "upcall-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/list.h> +#include <glusterfs/upcall-utils.h> #include "locks.h" #include "clear.h" diff --git a/xlators/features/locks/src/locks-mem-types.h b/xlators/features/locks/src/locks-mem-types.h index bec7db2d58e..a76605027b3 100644 --- a/xlators/features/locks/src/locks-mem-types.h +++ b/xlators/features/locks/src/locks-mem-types.h @@ -11,7 +11,7 @@ #ifndef __LOCKS_MEM_TYPES_H__ #define __LOCKS_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_locks_mem_types_ { gf_locks_mt_pl_dom_list_t = gf_common_mt_end + 1, diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h index cf2849fc251..0b5671bce24 100644 --- a/xlators/features/locks/src/locks.h +++ b/xlators/features/locks/src/locks.h @@ -10,13 +10,13 @@ #ifndef __POSIX_LOCKS_H__ #define __POSIX_LOCKS_H__ -#include "compat-errno.h" -#include "stack.h" -#include "call-stub.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/stack.h> +#include <glusterfs/call-stub.h> #include "locks-mem-types.h" -#include "client_t.h" +#include <glusterfs/client_t.h> -#include "lkowner.h" +#include <glusterfs/lkowner.h> typedef enum { MLK_NONE, diff --git a/xlators/features/locks/src/pl-messages.h b/xlators/features/locks/src/pl-messages.h index a99e1bbce43..e2d3d7ca974 100644 --- a/xlators/features/locks/src/pl-messages.h +++ b/xlators/features/locks/src/pl-messages.h @@ -11,7 +11,7 @@ #ifndef _PL_MESSAGES_H_ #define _PL_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/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index af162c5284c..8112b1ec6ba 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -12,18 +12,18 @@ #include <limits.h> #include <pthread.h> -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> #include "locks.h" #include "common.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include "clear.h" -#include "defaults.h" -#include "syncop.h" +#include <glusterfs/defaults.h> +#include <glusterfs/syncop.h> #include "pl-messages.h" #ifndef LLONG_MAX diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c index 8b080dba030..2e985474634 100644 --- a/xlators/features/locks/src/reservelk.c +++ b/xlators/features/locks/src/reservelk.c @@ -7,12 +7,12 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" -#include "list.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/list.h> #include "locks.h" #include "common.h" diff --git a/xlators/features/locks/tests/unit-test.c b/xlators/features/locks/tests/unit-test.c index c4759bd4a5f..d285b12b5aa 100644 --- a/xlators/features/locks/tests/unit-test.c +++ b/xlators/features/locks/tests/unit-test.c @@ -7,12 +7,12 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" -#include "list.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/list.h> #include "locks.h" #include "common.h" diff --git a/xlators/features/marker/src/marker-common.h b/xlators/features/marker/src/marker-common.h index 449d55b5ef0..1b15561ec0b 100644 --- a/xlators/features/marker/src/marker-common.h +++ b/xlators/features/marker/src/marker-common.h @@ -10,7 +10,7 @@ #ifndef _MARKER_COMMON_H #define _MARKER_COMMON_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "marker.h" int32_t diff --git a/xlators/features/marker/src/marker-mem-types.h b/xlators/features/marker/src/marker-mem-types.h index 0b50668a023..aedfdb4a1b7 100644 --- a/xlators/features/marker/src/marker-mem-types.h +++ b/xlators/features/marker/src/marker-mem-types.h @@ -10,7 +10,7 @@ #ifndef __MARKER_MEM_TYPES_H__ #define __MARKER_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_marker_mem_types_ { /* Those are used by ALLOCATE_OR_GOTO macro */ diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c index 694493c778c..6edb285b180 100644 --- a/xlators/features/marker/src/marker-quota-helper.c +++ b/xlators/features/marker/src/marker-quota-helper.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 "locking.h" +#include <glusterfs/locking.h> #include "marker-quota.h" #include "marker-common.h" #include "marker-quota-helper.h" diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 0fc7ba66ee0..530a6ff75fe 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -7,16 +7,16 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "libxlator.h" -#include "common-utils.h" -#include "byte-order.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/byte-order.h> #include "marker-quota.h" #include "marker-quota-helper.h" -#include "syncop.h" -#include "quota-common-utils.h" +#include <glusterfs/syncop.h> +#include <glusterfs/quota-common-utils.h> int mq_loc_copy(loc_t *dst, loc_t *src) diff --git a/xlators/features/marker/src/marker-quota.h b/xlators/features/marker/src/marker-quota.h index 7e24f1bc4f7..e6271d77084 100644 --- a/xlators/features/marker/src/marker-quota.h +++ b/xlators/features/marker/src/marker-quota.h @@ -10,11 +10,11 @@ #ifndef _MARKER_QUOTA_H #define _MARKER_QUOTA_H -#include "xlator.h" +#include <glusterfs/xlator.h> #include "marker-mem-types.h" -#include "refcount.h" -#include "quota-common-utils.h" -#include "call-stub.h" +#include <glusterfs/refcount.h> +#include <glusterfs/quota-common-utils.h> +#include <glusterfs/call-stub.h> #define QUOTA_XATTR_PREFIX "trusted.glusterfs" #define QUOTA_DIRTY_KEY "trusted.glusterfs.quota.dirty" diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 2d3177c7ec3..ed3fce0b10a 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -7,17 +7,17 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "libxlator.h" #include "marker.h" #include "marker-mem-types.h" #include "marker-quota.h" #include "marker-quota-helper.h" #include "marker-common.h" -#include "byte-order.h" -#include "syncop.h" -#include "syscall.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/syncop.h> +#include <glusterfs/syscall.h> #include <fnmatch.h> diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index 3b6f4ec8b72..4821094c14b 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -11,10 +11,10 @@ #define _MARKER_H #include "marker-quota.h" -#include "xlator.h" -#include "defaults.h" -#include "compat-uuid.h" -#include "call-stub.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/compat-uuid.h> +#include <glusterfs/call-stub.h> #define MARKER_XATTR_PREFIX "trusted.glusterfs" #define XTIME "xtime" diff --git a/xlators/features/namespace/src/namespace.c b/xlators/features/namespace/src/namespace.c index 79812aa330f..e56cf248076 100644 --- a/xlators/features/namespace/src/namespace.c +++ b/xlators/features/namespace/src/namespace.c @@ -15,10 +15,10 @@ #include <sys/types.h> -#include "defaults.h" -#include "glusterfs.h" -#include "hashfn.h" -#include "logging.h" +#include <glusterfs/defaults.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/logging.h> #include "namespace.h" /* Return codes for common path parsing functions. */ diff --git a/xlators/features/namespace/src/namespace.h b/xlators/features/namespace/src/namespace.h index 4c04cb3f471..3a9b84d6426 100644 --- a/xlators/features/namespace/src/namespace.h +++ b/xlators/features/namespace/src/namespace.h @@ -6,8 +6,8 @@ #include "config.h" #endif -#include "xlator.h" -#include "call-stub.h" +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> #define GF_NAMESPACE "namespace" diff --git a/xlators/features/quiesce/src/quiesce-mem-types.h b/xlators/features/quiesce/src/quiesce-mem-types.h index 914bfb22ed0..416456b13af 100644 --- a/xlators/features/quiesce/src/quiesce-mem-types.h +++ b/xlators/features/quiesce/src/quiesce-mem-types.h @@ -11,7 +11,7 @@ #ifndef __QUIESCE_MEM_TYPES_H__ #define __QUIESCE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_quiesce_mem_types_ { gf_quiesce_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/quiesce/src/quiesce-messages.h b/xlators/features/quiesce/src/quiesce-messages.h index 864a18147dc..32ffd409807 100644 --- a/xlators/features/quiesce/src/quiesce-messages.h +++ b/xlators/features/quiesce/src/quiesce-messages.h @@ -11,7 +11,7 @@ #ifndef __QUIESCE_MESSAGES_H__ #define __QUIESCE_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/features/quiesce/src/quiesce.c b/xlators/features/quiesce/src/quiesce.c index 41912b7e882..f1cc648ac4b 100644 --- a/xlators/features/quiesce/src/quiesce.c +++ b/xlators/features/quiesce/src/quiesce.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ #include "quiesce.h" -#include "defaults.h" -#include "call-stub.h" +#include <glusterfs/defaults.h> +#include <glusterfs/call-stub.h> /* TODO: */ /* Think about 'writev/_*_lk/setattr/xattrop/' fops to do re-transmittion */ diff --git a/xlators/features/quiesce/src/quiesce.h b/xlators/features/quiesce/src/quiesce.h index ed8f8fa2934..6ab2af40a56 100644 --- a/xlators/features/quiesce/src/quiesce.h +++ b/xlators/features/quiesce/src/quiesce.h @@ -13,8 +13,8 @@ #include "quiesce-mem-types.h" #include "quiesce-messages.h" -#include "xlator.h" -#include "timer.h" +#include <glusterfs/xlator.h> +#include <glusterfs/timer.h> #define GF_FOPS_EXPECTED_IN_PARALLEL 512 diff --git a/xlators/features/quota/src/quota-mem-types.h b/xlators/features/quota/src/quota-mem-types.h index 24b198eae35..782a7de96bb 100644 --- a/xlators/features/quota/src/quota-mem-types.h +++ b/xlators/features/quota/src/quota-mem-types.h @@ -10,7 +10,7 @@ #ifndef __QUOTA_MEM_TYPES_H__ #define __QUOTA_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_quota_mem_types_ { /* Those are used by QUOTA_ALLOC_OR_GOTO macro */ diff --git a/xlators/features/quota/src/quota-messages.h b/xlators/features/quota/src/quota-messages.h index 5129d2ee9ad..d434ed75e76 100644 --- a/xlators/features/quota/src/quota-messages.h +++ b/xlators/features/quota/src/quota-messages.h @@ -11,7 +11,7 @@ #ifndef _QUOTA_MESSAGES_H_ #define _QUOTA_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/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 9ad4f902d08..aec367d9978 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -10,12 +10,12 @@ #include <fnmatch.h> #include "quota.h" -#include "common-utils.h" -#include "defaults.h" -#include "statedump.h" -#include "quota-common-utils.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/defaults.h> +#include <glusterfs/statedump.h> +#include <glusterfs/quota-common-utils.h> #include "quota-messages.h" -#include "events.h" +#include <glusterfs/events.h> struct volume_options options[]; diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h index 8bcc3ec6176..a5a99cac090 100644 --- a/xlators/features/quota/src/quota.h +++ b/xlators/features/quota/src/quota.h @@ -10,25 +10,25 @@ #ifndef _QUOTA_H #define _QUOTA_H -#include "xlator.h" -#include "call-stub.h" -#include "defaults.h" -#include "common-utils.h" +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> #include "quota-mem-types.h" -#include "glusterfs.h" -#include "compat.h" -#include "logging.h" -#include "dict.h" -#include "gf-event.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/gf-event.h> #include "rpcsvc.h" #include "rpc-clnt.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "glusterfs3-xdr.h" #include "glusterfs3.h" #include "xdr-generic.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include "protocol-common.h" -#include "quota-common-utils.h" +#include <glusterfs/quota-common-utils.h> #include "quota-messages.h" #define DIRTY "dirty" diff --git a/xlators/features/quota/src/quotad-aggregator.h b/xlators/features/quota/src/quotad-aggregator.h index 02a0094102f..43f5ddd6e12 100644 --- a/xlators/features/quota/src/quotad-aggregator.h +++ b/xlators/features/quota/src/quotad-aggregator.h @@ -12,9 +12,9 @@ #define _QUOTAD_AGGREGATOR_H #include "quota.h" -#include "stack.h" +#include <glusterfs/stack.h> #include "glusterfs3-xdr.h" -#include "inode.h" +#include <glusterfs/inode.h> typedef struct { void *pool; diff --git a/xlators/features/quota/src/quotad.c b/xlators/features/quota/src/quotad.c index 5b0ab83673b..cfc74ff6985 100644 --- a/xlators/features/quota/src/quotad.c +++ b/xlators/features/quota/src/quotad.c @@ -9,7 +9,7 @@ */ #include "quota.h" #include "quotad-aggregator.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> int qd_notify(xlator_t *this, int32_t event, void *data, ...) diff --git a/xlators/features/read-only/src/read-only-common.c b/xlators/features/read-only/src/read-only-common.c index 39985169991..9640e7e3eee 100644 --- a/xlators/features/read-only/src/read-only-common.c +++ b/xlators/features/read-only/src/read-only-common.c @@ -9,7 +9,7 @@ */ #include "read-only.h" #include "read-only-mem-types.h" -#include "defaults.h" +#include <glusterfs/defaults.h> gf_boolean_t is_readonly_or_worm_enabled(call_frame_t *frame, xlator_t *this) diff --git a/xlators/features/read-only/src/read-only-common.h b/xlators/features/read-only/src/read-only-common.h index 32719da28f1..5561961ffa2 100644 --- a/xlators/features/read-only/src/read-only-common.h +++ b/xlators/features/read-only/src/read-only-common.h @@ -7,8 +7,8 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> gf_boolean_t is_readonly_or_worm_enabled(call_frame_t *frame, xlator_t *this); diff --git a/xlators/features/read-only/src/read-only-mem-types.h b/xlators/features/read-only/src/read-only-mem-types.h index 4baaeb41216..c67d6c02cd0 100644 --- a/xlators/features/read-only/src/read-only-mem-types.h +++ b/xlators/features/read-only/src/read-only-mem-types.h @@ -11,7 +11,7 @@ #ifndef __READONLY_MEM_TYPES_H__ #define __READONLY_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_read_only_mem_types_ { gf_read_only_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/read-only/src/read-only.c b/xlators/features/read-only/src/read-only.c index c92a9801196..b206d2f5545 100644 --- a/xlators/features/read-only/src/read-only.c +++ b/xlators/features/read-only/src/read-only.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 "defaults.h" +#include <glusterfs/defaults.h> #include "read-only-common.h" #include "read-only-mem-types.h" #include "read-only.h" diff --git a/xlators/features/read-only/src/read-only.h b/xlators/features/read-only/src/read-only.h index d74053a2a8f..7cd09d37bc8 100644 --- a/xlators/features/read-only/src/read-only.h +++ b/xlators/features/read-only/src/read-only.h @@ -12,7 +12,7 @@ #define __READONLY_H__ #include "read-only-mem-types.h" -#include "xlator.h" +#include <glusterfs/xlator.h> typedef struct { uint8_t worm : 1; diff --git a/xlators/features/read-only/src/worm-helper.c b/xlators/features/read-only/src/worm-helper.c index 3f882fe08d6..2cf6ba5d438 100644 --- a/xlators/features/read-only/src/worm-helper.c +++ b/xlators/features/read-only/src/worm-helper.c @@ -9,8 +9,8 @@ */ #include "read-only-mem-types.h" #include "read-only.h" -#include "xlator.h" -#include "syncop.h" +#include <glusterfs/xlator.h> +#include <glusterfs/syncop.h> #include "worm-helper.h" /*Function to check whether file is read-only. diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c index db128b75196..b891473f515 100644 --- a/xlators/features/read-only/src/worm.c +++ b/xlators/features/read-only/src/worm.c @@ -7,12 +7,12 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "read-only-common.h" #include "read-only-mem-types.h" #include "read-only.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "worm-helper.h" int32_t diff --git a/xlators/features/sdfs/src/sdfs-messages.h b/xlators/features/sdfs/src/sdfs-messages.h index cf866c8512a..3053efa8935 100644 --- a/xlators/features/sdfs/src/sdfs-messages.h +++ b/xlators/features/sdfs/src/sdfs-messages.h @@ -11,7 +11,7 @@ #ifndef _DFS_MESSAGES_H_ #define _DFS_MESSAGES_H_ -#include "glfs-message-id.h" +#include <glusterfs/glfs-message-id.h> /* file bit-rot-bitd-messages.h * brief SDFS log-message IDs and their descriptions diff --git a/xlators/features/sdfs/src/sdfs.h b/xlators/features/sdfs/src/sdfs.h index 986d7c2731c..dded5a2d7fc 100644 --- a/xlators/features/sdfs/src/sdfs.h +++ b/xlators/features/sdfs/src/sdfs.h @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "call-stub.h" +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> #include "sdfs-messages.h" -#include "atomic.h" +#include <glusterfs/atomic.h> #define SDFS_LOCK_COUNT_MAX 2 diff --git a/xlators/features/selinux/src/selinux-mem-types.h b/xlators/features/selinux/src/selinux-mem-types.h index a8c544fba52..553e59e5a9d 100644 --- a/xlators/features/selinux/src/selinux-mem-types.h +++ b/xlators/features/selinux/src/selinux-mem-types.h @@ -10,7 +10,7 @@ #ifndef __SELINUX_MEM_TYPES_H__ #define __SELINUX_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_selinux_mem_types_ { gf_selinux_mt_selinux_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/selinux/src/selinux-messages.h b/xlators/features/selinux/src/selinux-messages.h index 1f5739d8dc7..f49a54f956c 100644 --- a/xlators/features/selinux/src/selinux-messages.h +++ b/xlators/features/selinux/src/selinux-messages.h @@ -11,7 +11,7 @@ #ifndef _SELINUX_MESSAGES_H__ #define _SELINUX_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/features/selinux/src/selinux.c b/xlators/features/selinux/src/selinux.c index 91e74d1a3fc..d47521d55a7 100644 --- a/xlators/features/selinux/src/selinux.c +++ b/xlators/features/selinux/src/selinux.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "selinux.h" #include "selinux-messages.h" #include "selinux-mem-types.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> static int selinux_fgetxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this, diff --git a/xlators/features/selinux/src/selinux.h b/xlators/features/selinux/src/selinux.h index 787bff348f0..1bbdad3bb36 100644 --- a/xlators/features/selinux/src/selinux.h +++ b/xlators/features/selinux/src/selinux.h @@ -10,7 +10,7 @@ #ifndef __SELINUX_H__ #define __SELINUX_H__ -#include "common-utils.h" +#include <glusterfs/common-utils.h> #define SELINUX_XATTR "security.selinux" #define SELINUX_GLUSTER_XATTR "trusted.glusterfs.selinux" diff --git a/xlators/features/shard/src/shard-mem-types.h b/xlators/features/shard/src/shard-mem-types.h index 39a57ba6fd0..1fe7e2e2798 100644 --- a/xlators/features/shard/src/shard-mem-types.h +++ b/xlators/features/shard/src/shard-mem-types.h @@ -10,7 +10,7 @@ #ifndef __SHARD_MEM_TYPES_H__ #define __SHARD_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_shard_mem_types_ { gf_shard_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/shard/src/shard-messages.h b/xlators/features/shard/src/shard-messages.h index 89a96709219..2d0867eb136 100644 --- a/xlators/features/shard/src/shard-messages.h +++ b/xlators/features/shard/src/shard-messages.h @@ -11,7 +11,7 @@ #ifndef _SHARD_MESSAGES_H_ #define _SHARD_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/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index 5ffeaa63628..f0fd12785ac 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -12,9 +12,9 @@ #include "shard.h" #include "shard-mem-types.h" -#include "byte-order.h" -#include "defaults.h" -#include "statedump.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/defaults.h> +#include <glusterfs/statedump.h> static gf_boolean_t __is_shard_dir(uuid_t gfid) diff --git a/xlators/features/shard/src/shard.h b/xlators/features/shard/src/shard.h index f877591faee..0dbb9399656 100644 --- a/xlators/features/shard/src/shard.h +++ b/xlators/features/shard/src/shard.h @@ -11,10 +11,10 @@ #ifndef __SHARD_H__ #define __SHARD_H__ -#include "xlator.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/compat-errno.h> #include "shard-messages.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #define GF_SHARD_DIR ".shard" #define GF_SHARD_REMOVE_ME_DIR ".remove_me" diff --git a/xlators/features/snapview-client/src/snapview-client-mem-types.h b/xlators/features/snapview-client/src/snapview-client-mem-types.h index aac0d571c41..3c3ab555a55 100644 --- a/xlators/features/snapview-client/src/snapview-client-mem-types.h +++ b/xlators/features/snapview-client/src/snapview-client-mem-types.h @@ -11,7 +11,7 @@ #ifndef _SVC_MEM_TYPES_H #define _SVC_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum svc_mem_types { gf_svc_mt_svc_private_t = gf_common_mt_end + 1, diff --git a/xlators/features/snapview-client/src/snapview-client-messages.h b/xlators/features/snapview-client/src/snapview-client-messages.h index b99578a6063..d5215dcecf9 100644 --- a/xlators/features/snapview-client/src/snapview-client-messages.h +++ b/xlators/features/snapview-client/src/snapview-client-messages.h @@ -11,7 +11,7 @@ #ifndef _SNAPVIEW_CLIENT_MESSAGES_H_ #define _SNAPVIEW_CLIENT_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/features/snapview-client/src/snapview-client.c b/xlators/features/snapview-client/src/snapview-client.c index c991f058dbd..a0c739f58af 100644 --- a/xlators/features/snapview-client/src/snapview-client.c +++ b/xlators/features/snapview-client/src/snapview-client.c @@ -9,8 +9,8 @@ */ #include "snapview-client.h" -#include "inode.h" -#include "byte-order.h" +#include <glusterfs/inode.h> +#include <glusterfs/byte-order.h> static void svc_local_free(svc_local_t *local) diff --git a/xlators/features/snapview-client/src/snapview-client.h b/xlators/features/snapview-client/src/snapview-client.h index d19a796f101..00caa0988c7 100644 --- a/xlators/features/snapview-client/src/snapview-client.h +++ b/xlators/features/snapview-client/src/snapview-client.h @@ -10,11 +10,11 @@ #ifndef __SNAP_VIEW_CLIENT_H__ #define __SNAP_VIEW_CLIENT_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "snapview-client-mem-types.h" #include "snapview-client-messages.h" diff --git a/xlators/features/snapview-server/src/snapview-server-helpers.c b/xlators/features/snapview-server/src/snapview-server-helpers.c index 6530901c5b8..5514a54f0d6 100644 --- a/xlators/features/snapview-server/src/snapview-server-helpers.c +++ b/xlators/features/snapview-server/src/snapview-server-helpers.c @@ -10,7 +10,7 @@ #include "snapview-server.h" #include "snapview-server-mem-types.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include "rpc-clnt.h" #include "xdr-generic.h" #include "protocol-common.h" diff --git a/xlators/features/snapview-server/src/snapview-server-mem-types.h b/xlators/features/snapview-server/src/snapview-server-mem-types.h index 504c7969bdc..63456b85323 100644 --- a/xlators/features/snapview-server/src/snapview-server-mem-types.h +++ b/xlators/features/snapview-server/src/snapview-server-mem-types.h @@ -11,7 +11,7 @@ #ifndef __SNAP_VIEW_MEM_TYPES_H #define __SNAP_VIEW_MEM_TYPES_H -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum snapview_mem_types { gf_svs_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/features/snapview-server/src/snapview-server-messages.h b/xlators/features/snapview-server/src/snapview-server-messages.h index 44cc1575405..8548015648a 100644 --- a/xlators/features/snapview-server/src/snapview-server-messages.h +++ b/xlators/features/snapview-server/src/snapview-server-messages.h @@ -11,7 +11,7 @@ #ifndef _SNAPVIEW_SERVER_MESSAGES_H_ #define _SNAPVIEW_SERVER_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/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c index 7a8e29ecdfc..3c48b067025 100644 --- a/xlators/features/snapview-server/src/snapview-server.c +++ b/xlators/features/snapview-server/src/snapview-server.c @@ -9,13 +9,13 @@ */ #include "snapview-server.h" #include "snapview-server-mem-types.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> -#include "xlator.h" +#include <glusterfs/xlator.h> #include "rpc-clnt.h" #include "xdr-generic.h" #include "protocol-common.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include <pthread.h> int diff --git a/xlators/features/snapview-server/src/snapview-server.h b/xlators/features/snapview-server/src/snapview-server.h index 6951d31449f..b25801901ed 100644 --- a/xlators/features/snapview-server/src/snapview-server.h +++ b/xlators/features/snapview-server/src/snapview-server.h @@ -10,26 +10,26 @@ #ifndef __SNAP_VIEW_H__ #define __SNAP_VIEW_H__ -#include "dict.h" -#include "defaults.h" -#include "mem-types.h" -#include "call-stub.h" -#include "byte-order.h" -#include "iatt.h" +#include <glusterfs/dict.h> +#include <glusterfs/defaults.h> +#include <glusterfs/mem-types.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/iatt.h> #include <ctype.h> #include <sys/uio.h> -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> #include "glfs.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> #include "glfs-handles.h" #include "glfs-internal.h" #include "glusterfs3-xdr.h" -#include "glusterfs-acl.h" -#include "syncop.h" -#include "list.h" -#include "timer.h" +#include <glusterfs/glusterfs-acl.h> +#include <glusterfs/syncop.h> +#include <glusterfs/list.h> +#include <glusterfs/timer.h> #include "rpc-clnt.h" #include "protocol-common.h" #include "xdr-generic.h" diff --git a/xlators/features/thin-arbiter/src/thin-arbiter-mem-types.h b/xlators/features/thin-arbiter/src/thin-arbiter-mem-types.h index 79b5ce0eee3..69562d2febc 100644 --- a/xlators/features/thin-arbiter/src/thin-arbiter-mem-types.h +++ b/xlators/features/thin-arbiter/src/thin-arbiter-mem-types.h @@ -9,7 +9,7 @@ #ifndef __THIN_ARBITER_MEM_TYPES_H__ #define __THIN_ARBITER_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> typedef enum gf_ta_mem_types_ { gf_ta_mt_local_t = gf_common_mt_end + 1, diff --git a/xlators/features/thin-arbiter/src/thin-arbiter-messages.h b/xlators/features/thin-arbiter/src/thin-arbiter-messages.h index f49b3eedadf..81d7491577a 100644 --- a/xlators/features/thin-arbiter/src/thin-arbiter-messages.h +++ b/xlators/features/thin-arbiter/src/thin-arbiter-messages.h @@ -11,7 +11,7 @@ #ifndef _TA_MESSAGES_H_ #define _TA_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/features/thin-arbiter/src/thin-arbiter.c b/xlators/features/thin-arbiter/src/thin-arbiter.c index 062e04132d6..e1bfaa803c8 100644 --- a/xlators/features/thin-arbiter/src/thin-arbiter.c +++ b/xlators/features/thin-arbiter/src/thin-arbiter.c @@ -11,11 +11,11 @@ #include "thin-arbiter.h" #include "thin-arbiter-messages.h" #include "thin-arbiter-mem-types.h" -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "byte-order.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> int ta_set_incoming_values(dict_t *dict, char *key, data_t *value, void *data) diff --git a/xlators/features/thin-arbiter/src/thin-arbiter.h b/xlators/features/thin-arbiter/src/thin-arbiter.h index af3d4b1af92..e5f914b84bf 100644 --- a/xlators/features/thin-arbiter/src/thin-arbiter.h +++ b/xlators/features/thin-arbiter/src/thin-arbiter.h @@ -11,12 +11,12 @@ #ifndef _THIN_ARBITER_H #define _THIN_ARBITER_H -#include "locking.h" -#include "common-utils.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" -#include "list.h" +#include <glusterfs/locking.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/list.h> #define THIN_ARBITER_SOURCE_XATTR "trusted.ta.source" #define THIN_ARBITER_SOURCE_SIZE 2 diff --git a/xlators/features/trash/src/trash-mem-types.h b/xlators/features/trash/src/trash-mem-types.h index 133f2edf99b..43353c8f095 100644 --- a/xlators/features/trash/src/trash-mem-types.h +++ b/xlators/features/trash/src/trash-mem-types.h @@ -10,7 +10,7 @@ #ifndef __TRASH_MEM_TYPES_H__ #define __TRASH_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_trash_mem_types_ { gf_trash_mt_trash_private_t = gf_common_mt_end + 1, diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index aa546d3394d..51dc6fac7ab 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -9,7 +9,7 @@ */ #include "trash.h" #include "trash-mem-types.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #define root_gfid \ (uuid_t) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h index 675f9f97350..6671617c2c6 100644 --- a/xlators/features/trash/src/trash.h +++ b/xlators/features/trash/src/trash.h @@ -10,11 +10,11 @@ #ifndef __TRASH_H__ #define __TRASH_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "inode.c" #include "fnmatch.h" diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c index 9d16e5f0ef8..46cf6f840f0 100644 --- a/xlators/features/upcall/src/upcall-internal.c +++ b/xlators/features/upcall/src/upcall-internal.c @@ -12,20 +12,20 @@ #include <fcntl.h> #include <limits.h> -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> -#include "statedump.h" -#include "syncop.h" +#include <glusterfs/statedump.h> +#include <glusterfs/syncop.h> #include "upcall.h" #include "upcall-mem-types.h" #include "glusterfs3-xdr.h" #include "protocol-common.h" -#include "defaults.h" +#include <glusterfs/defaults.h> /* * Check if any of the upcall options are enabled: diff --git a/xlators/features/upcall/src/upcall-mem-types.h b/xlators/features/upcall/src/upcall-mem-types.h index 079677ff79c..f9883d9d72c 100644 --- a/xlators/features/upcall/src/upcall-mem-types.h +++ b/xlators/features/upcall/src/upcall-mem-types.h @@ -11,7 +11,7 @@ #ifndef __UPCALL_MEM_TYPES_H__ #define __UPCALL_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_upcall_mem_types_ { gf_upcall_mt_conf_t = gf_common_mt_end + 1, diff --git a/xlators/features/upcall/src/upcall-messages.h b/xlators/features/upcall/src/upcall-messages.h index db5cac1e07d..4095a34c200 100644 --- a/xlators/features/upcall/src/upcall-messages.h +++ b/xlators/features/upcall/src/upcall-messages.h @@ -11,7 +11,7 @@ #ifndef _UPCALL_MESSAGES_H_ #define _UPCALL_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/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c index 5fdd4993003..f0d0cc48311 100644 --- a/xlators/features/upcall/src/upcall.c +++ b/xlators/features/upcall/src/upcall.c @@ -13,19 +13,19 @@ #include <limits.h> #include <pthread.h> -#include "glusterfs.h" -#include "compat.h" -#include "xlator.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/compat.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> -#include "statedump.h" +#include <glusterfs/statedump.h> #include "upcall.h" #include "upcall-mem-types.h" #include "glusterfs3-xdr.h" #include "protocol-common.h" -#include "defaults.h" +#include <glusterfs/defaults.h> static int32_t up_open_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, diff --git a/xlators/features/upcall/src/upcall.h b/xlators/features/upcall/src/upcall.h index 3797e62aac3..bcaf6b01086 100644 --- a/xlators/features/upcall/src/upcall.h +++ b/xlators/features/upcall/src/upcall.h @@ -10,12 +10,12 @@ #ifndef __UPCALL_H__ #define __UPCALL_H__ -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> #include "upcall-mem-types.h" -#include "client_t.h" +#include <glusterfs/client_t.h> #include "upcall-messages.h" #include "upcall-cache-invalidation.h" -#include "upcall-utils.h" +#include <glusterfs/upcall-utils.h> #define EXIT_IF_UPCALL_OFF(this, label) \ do { \ diff --git a/xlators/features/utime/src/utime-autogen-fops-tmpl.c b/xlators/features/utime/src/utime-autogen-fops-tmpl.c index b4be66eebd1..f2f35322926 100644 --- a/xlators/features/utime/src/utime-autogen-fops-tmpl.c +++ b/xlators/features/utime/src/utime-autogen-fops-tmpl.c @@ -18,11 +18,11 @@ #include "config.h" #endif -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/statedump.h> #include "utime-helpers.h" -#include "timespec.h" +#include <glusterfs/timespec.h> #pragma generate diff --git a/xlators/features/utime/src/utime-autogen-fops-tmpl.h b/xlators/features/utime/src/utime-autogen-fops-tmpl.h index e2e807cdf64..4e102ffed6c 100644 --- a/xlators/features/utime/src/utime-autogen-fops-tmpl.h +++ b/xlators/features/utime/src/utime-autogen-fops-tmpl.h @@ -15,7 +15,7 @@ #ifndef _UTIME_AUTOGEN_FOPS_H #define _UTIME_AUTOGEN_FOPS_H -#include "xlator.h" +#include <glusterfs/xlator.h> #pragma generate diff --git a/xlators/features/utime/src/utime-helpers.h b/xlators/features/utime/src/utime-helpers.h index b89867a3db3..f2dfeed3a41 100644 --- a/xlators/features/utime/src/utime-helpers.h +++ b/xlators/features/utime/src/utime-helpers.h @@ -12,9 +12,9 @@ #define _UTIME_HELPERS_H #include "glusterfs-fops.h" -#include "stack.h" -#include "xlator.h" -#include "timespec.h" +#include <glusterfs/stack.h> +#include <glusterfs/xlator.h> +#include <glusterfs/timespec.h> #include <time.h> void diff --git a/xlators/features/utime/src/utime-mem-types.h b/xlators/features/utime/src/utime-mem-types.h index fbd9aff0eca..ad1255f85f3 100644 --- a/xlators/features/utime/src/utime-mem-types.h +++ b/xlators/features/utime/src/utime-mem-types.h @@ -11,7 +11,7 @@ #ifndef __UTIME_MEM_TYPES_H__ #define __UTIME_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_utime_mem_types_ { utime_mt_utime_t = gf_common_mt_end + 1, diff --git a/xlators/features/utime/src/utime-messages.h b/xlators/features/utime/src/utime-messages.h index 7613c335d43..bac18aba460 100644 --- a/xlators/features/utime/src/utime-messages.h +++ b/xlators/features/utime/src/utime-messages.h @@ -11,7 +11,7 @@ #ifndef __UTIME_MESSAGES_H__ #define __UTIME_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/features/utime/src/utime.h b/xlators/features/utime/src/utime.h index 236183d4bcc..ba55eec00de 100644 --- a/xlators/features/utime/src/utime.h +++ b/xlators/features/utime/src/utime.h @@ -11,9 +11,9 @@ #ifndef __UTIME_H__ #define __UTIME_H__ -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "utime-autogen-fops.h" typedef struct utime_priv { diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index e8e22bb7830..e1a22b60340 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.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 "mem-types.h" +#include <glusterfs/mem-types.h> #include "libxlator.h" int marker_xtime_default_gauge[] = { diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h index 80224f9df38..d17a1e21891 100644 --- a/xlators/lib/src/libxlator.h +++ b/xlators/lib/src/libxlator.h @@ -10,12 +10,12 @@ #ifndef _LIBXLATOR_H #define _LIBXLATOR_H -#include "xlator.h" -#include "logging.h" -#include "defaults.h" -#include "common-utils.h" -#include "compat.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/logging.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> #define MARKER_XATTR_PREFIX "trusted.glusterfs" #define XTIME "xtime" diff --git a/xlators/meta/src/active-link.c b/xlators/meta/src/active-link.c index 6c060455887..7ee780d89e9 100644 --- a/xlators/meta/src/active-link.c +++ b/xlators/meta/src/active-link.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/cmdline-file.c b/xlators/meta/src/cmdline-file.c index 3d6a020ac6c..eb24e985af9 100644 --- a/xlators/meta/src/cmdline-file.c +++ b/xlators/meta/src/cmdline-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int cmdline_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/frames-file.c b/xlators/meta/src/frames-file.c index 1316aa71ce8..995d7680e9b 100644 --- a/xlators/meta/src/frames-file.c +++ b/xlators/meta/src/frames-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int frames_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/graph-dir.c b/xlators/meta/src/graph-dir.c index 606fea904be..a8f4787880d 100644 --- a/xlators/meta/src/graph-dir.c +++ b/xlators/meta/src/graph-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/graphs-dir.c b/xlators/meta/src/graphs-dir.c index 7c8f4276c03..a1ffbca7d5a 100644 --- a/xlators/meta/src/graphs-dir.c +++ b/xlators/meta/src/graphs-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/history-file.c b/xlators/meta/src/history-file.c index a78fe27a54a..7742a635fed 100644 --- a/xlators/meta/src/history-file.c +++ b/xlators/meta/src/history-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "statedump.h" +#include <glusterfs/strfd.h> +#include <glusterfs/statedump.h> static int history_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/logfile-link.c b/xlators/meta/src/logfile-link.c index 61cd4fee852..616a54518c0 100644 --- a/xlators/meta/src/logfile-link.c +++ b/xlators/meta/src/logfile-link.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/logging-dir.c b/xlators/meta/src/logging-dir.c index 590b5532b38..46e6f9e95dd 100644 --- a/xlators/meta/src/logging-dir.c +++ b/xlators/meta/src/logging-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/loglevel-file.c b/xlators/meta/src/loglevel-file.c index 3f3f2707dc0..eeeeeaa5907 100644 --- a/xlators/meta/src/loglevel-file.c +++ b/xlators/meta/src/loglevel-file.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" +#include <glusterfs/strfd.h> static int loglevel_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/mallinfo-file.c b/xlators/meta/src/mallinfo-file.c index d04fe9f4c1e..b4396d72189 100644 --- a/xlators/meta/src/mallinfo-file.c +++ b/xlators/meta/src/mallinfo-file.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "statedump.h" +#include <glusterfs/statedump.h> static int mallinfo_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/measure-file.c b/xlators/meta/src/measure-file.c index 1529608bb25..52e92e48590 100644 --- a/xlators/meta/src/measure-file.c +++ b/xlators/meta/src/measure-file.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" +#include <glusterfs/strfd.h> static int measure_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/meminfo-file.c b/xlators/meta/src/meminfo-file.c index d6122ae5013..d889dfb2ae8 100644 --- a/xlators/meta/src/meminfo-file.c +++ b/xlators/meta/src/meminfo-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "statedump.h" +#include <glusterfs/strfd.h> +#include <glusterfs/statedump.h> static int meminfo_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c index b39e9f21ff7..12dc5f484b6 100644 --- a/xlators/meta/src/meta-defaults.c +++ b/xlators/meta/src/meta-defaults.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "compat-errno.h" +#include <glusterfs/compat-errno.h> int meta_default_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, diff --git a/xlators/meta/src/meta-helpers.c b/xlators/meta/src/meta-helpers.c index d7d59c71296..8b3d7b2f2f2 100644 --- a/xlators/meta/src/meta-helpers.c +++ b/xlators/meta/src/meta-helpers.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/meta-hooks.h b/xlators/meta/src/meta-hooks.h index 2ee006f7876..7208641398a 100644 --- a/xlators/meta/src/meta-hooks.h +++ b/xlators/meta/src/meta-hooks.h @@ -10,7 +10,7 @@ #ifndef __META_HOOKS_H #define __META_HOOKS_H -#include "xlator.h" +#include <glusterfs/xlator.h> #define DECLARE_HOOK(name) \ int meta_##name##_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, \ diff --git a/xlators/meta/src/meta-mem-types.h b/xlators/meta/src/meta-mem-types.h index 0fdfea4fac6..033c306682f 100644 --- a/xlators/meta/src/meta-mem-types.h +++ b/xlators/meta/src/meta-mem-types.h @@ -11,7 +11,7 @@ #ifndef __META_MEM_TYPES_H__ #define __META_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_meta_mem_types_ { gf_meta_mt_priv_t = gf_common_mt_end + 1, diff --git a/xlators/meta/src/meta.c b/xlators/meta/src/meta.c index 9294bbdae0c..ab131d798ae 100644 --- a/xlators/meta/src/meta.c +++ b/xlators/meta/src/meta.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/meta.h b/xlators/meta/src/meta.h index 10609a9ec05..7f0cf28808a 100644 --- a/xlators/meta/src/meta.h +++ b/xlators/meta/src/meta.h @@ -10,7 +10,7 @@ #ifndef __META_H__ #define __META_H__ -#include "strfd.h" +#include <glusterfs/strfd.h> #define DEFAULT_META_DIR_NAME ".meta" diff --git a/xlators/meta/src/name-file.c b/xlators/meta/src/name-file.c index edba7142a69..5874a24d78a 100644 --- a/xlators/meta/src/name-file.c +++ b/xlators/meta/src/name-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int name_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/option-file.c b/xlators/meta/src/option-file.c index 132b28fa86a..ff55eca592f 100644 --- a/xlators/meta/src/option-file.c +++ b/xlators/meta/src/option-file.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/options-dir.c b/xlators/meta/src/options-dir.c index bf2d07a3701..d68a7eeaffc 100644 --- a/xlators/meta/src/options-dir.c +++ b/xlators/meta/src/options-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/private-file.c b/xlators/meta/src/private-file.c index 068c8ebf191..23ec319456b 100644 --- a/xlators/meta/src/private-file.c +++ b/xlators/meta/src/private-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "statedump.h" +#include <glusterfs/strfd.h> +#include <glusterfs/statedump.h> static int private_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/process_uuid-file.c b/xlators/meta/src/process_uuid-file.c index bbf2e19f86e..a24c1b57ab3 100644 --- a/xlators/meta/src/process_uuid-file.c +++ b/xlators/meta/src/process_uuid-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int process_uuid_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/profile-file.c b/xlators/meta/src/profile-file.c index 9eb5c050dbe..829dcb77451 100644 --- a/xlators/meta/src/profile-file.c +++ b/xlators/meta/src/profile-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "statedump.h" +#include <glusterfs/strfd.h> +#include <glusterfs/statedump.h> static int profile_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/root-dir.c b/xlators/meta/src/root-dir.c index 18d4fd6b8ec..80292bd3dda 100644 --- a/xlators/meta/src/root-dir.c +++ b/xlators/meta/src/root-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/subvolume-link.c b/xlators/meta/src/subvolume-link.c index 45d909daca2..5b1f752efd0 100644 --- a/xlators/meta/src/subvolume-link.c +++ b/xlators/meta/src/subvolume-link.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/subvolumes-dir.c b/xlators/meta/src/subvolumes-dir.c index e9582c53cf7..3cb170ea1f4 100644 --- a/xlators/meta/src/subvolumes-dir.c +++ b/xlators/meta/src/subvolumes-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/top-link.c b/xlators/meta/src/top-link.c index bfee742a1be..33f0d407411 100644 --- a/xlators/meta/src/top-link.c +++ b/xlators/meta/src/top-link.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/type-file.c b/xlators/meta/src/type-file.c index 00141275957..ece342a0b2a 100644 --- a/xlators/meta/src/type-file.c +++ b/xlators/meta/src/type-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int type_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/version-file.c b/xlators/meta/src/version-file.c index 7331684238c..36276fb810a 100644 --- a/xlators/meta/src/version-file.c +++ b/xlators/meta/src/version-file.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" -#include "lkowner.h" +#include <glusterfs/strfd.h> +#include <glusterfs/lkowner.h> static int version_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) diff --git a/xlators/meta/src/view-dir.c b/xlators/meta/src/view-dir.c index 313bf6d7124..30931061567 100644 --- a/xlators/meta/src/view-dir.c +++ b/xlators/meta/src/view-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" diff --git a/xlators/meta/src/volfile-file.c b/xlators/meta/src/volfile-file.c index 5242a14bb8c..b2e2562ab8b 100644 --- a/xlators/meta/src/volfile-file.c +++ b/xlators/meta/src/volfile-file.c @@ -8,12 +8,12 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" -#include "strfd.h" +#include <glusterfs/strfd.h> static int xldump_options(dict_t *this, char *key, data_t *value, void *strfd) diff --git a/xlators/meta/src/xlator-dir.c b/xlators/meta/src/xlator-dir.c index 1715cbb56a0..86189715790 100644 --- a/xlators/meta/src/xlator-dir.c +++ b/xlators/meta/src/xlator-dir.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "meta-mem-types.h" #include "meta.h" 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 diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 412c8ea158f..0173046c3c3 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -10,12 +10,12 @@ #include <sys/wait.h> #include "fuse-bridge.h" -#include "glusterfs.h" -#include "byte-order.h" -#include "compat-errno.h" -#include "glusterfs-acl.h" -#include "syscall.h" -#include "timespec.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/glusterfs-acl.h> +#include <glusterfs/syscall.h> +#include <glusterfs/timespec.h> #ifdef __NetBSD__ #undef open /* in perfuse.h, pulled from mount-gluster-compat.h */ diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index b997d9e0cbb..57380786f17 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -19,12 +19,12 @@ #include <sys/time.h> #include <fnmatch.h> -#include "glusterfs.h" -#include "logging.h" -#include "xlator.h" -#include "defaults.h" -#include "common-utils.h" -#include "statedump.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/statedump.h> #ifdef GF_DARWIN_HOST_OS #include "fuse_kernel_macfuse.h" @@ -35,10 +35,10 @@ #include "fuse-mount.h" #include "fuse-mem-types.h" -#include "list.h" -#include "dict.h" -#include "syncop.h" -#include "gidcache.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> +#include <glusterfs/syncop.h> +#include <glusterfs/gidcache.h> #if defined(GF_LINUX_HOST_OS) || defined(__FreeBSD__) || defined(__NetBSD__) #define FUSE_OP_HIGH (FUSE_LSEEK + 1) diff --git a/xlators/mount/fuse/src/fuse-mem-types.h b/xlators/mount/fuse/src/fuse-mem-types.h index c3c0028473a..4fd8e58c523 100644 --- a/xlators/mount/fuse/src/fuse-mem-types.h +++ b/xlators/mount/fuse/src/fuse-mem-types.h @@ -11,7 +11,7 @@ #ifndef __FUSE_MEM_TYPES_H__ #define __FUSE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_fuse_mem_types_ { gf_fuse_mt_iovec = gf_common_mt_end + 1, diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c index ff4bcfd8f4b..0eca45d8a3e 100644 --- a/xlators/nfs/server/src/acl3.c +++ b/xlators/nfs/server/src/acl3.c @@ -8,13 +8,13 @@ * cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "nfs.h" -#include "mem-pool.h" -#include "logging.h" +#include <glusterfs/mem-pool.h> +#include <glusterfs/logging.h> #include "nfs-fops.h" #include "nfs3.h" #include "nfs-mem-types.h" @@ -22,8 +22,8 @@ #include "nfs3-fh.h" #include "nfs-generics.h" #include "acl3.h" -#include "byte-order.h" -#include "compat-errno.h" +#include <glusterfs/byte-order.h> +#include <glusterfs/compat-errno.h> #include "nfs-messages.h" static int diff --git a/xlators/nfs/server/src/acl3.h b/xlators/nfs/server/src/acl3.h index 500d2ef6ae5..dead04b4273 100644 --- a/xlators/nfs/server/src/acl3.h +++ b/xlators/nfs/server/src/acl3.h @@ -11,7 +11,7 @@ #ifndef _ACL3_H #define _ACL3_H -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> #define ACL3_NULL 0 #define ACL3_GETACL 1 diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c index 248a90b0587..f8e5061dc54 100644 --- a/xlators/nfs/server/src/auth-cache.c +++ b/xlators/nfs/server/src/auth-cache.c @@ -11,7 +11,7 @@ cases as published by the Free Software Foundation. */ -#include "refcount.h" +#include <glusterfs/refcount.h> #include "auth-cache.h" #include "nfs3.h" #include "exports.h" diff --git a/xlators/nfs/server/src/auth-cache.h b/xlators/nfs/server/src/auth-cache.h index d48c6f64e43..4c9d09207f8 100644 --- a/xlators/nfs/server/src/auth-cache.h +++ b/xlators/nfs/server/src/auth-cache.h @@ -17,7 +17,7 @@ #include "nfs-mem-types.h" #include "exports.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "nfs3.h" struct auth_cache { diff --git a/xlators/nfs/server/src/exports.c b/xlators/nfs/server/src/exports.c index 342ad503a6a..26d3d926cdc 100644 --- a/xlators/nfs/server/src/exports.c +++ b/xlators/nfs/server/src/exports.c @@ -13,8 +13,8 @@ */ #include "exports.h" -#include "hashfn.h" -#include "parse-utils.h" +#include <glusterfs/hashfn.h> +#include <glusterfs/parse-utils.h> #include "nfs-messages.h" static void diff --git a/xlators/nfs/server/src/exports.h b/xlators/nfs/server/src/exports.h index d44e32e3f74..ad35ad8c3a0 100644 --- a/xlators/nfs/server/src/exports.h +++ b/xlators/nfs/server/src/exports.h @@ -16,7 +16,7 @@ #define _EXPORTS_H_ #include "nfs-mem-types.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "nfs.h" #define GF_EXP GF_NFS "-exports" diff --git a/xlators/nfs/server/src/mount3-auth.c b/xlators/nfs/server/src/mount3-auth.c index 37839c230e8..10e57c84cdb 100644 --- a/xlators/nfs/server/src/mount3-auth.c +++ b/xlators/nfs/server/src/mount3-auth.c @@ -38,7 +38,7 @@ #include "mount3-auth.h" #include "exports.h" #include "netgroups.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "nfs-messages.h" /** diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 3d5be6a6a6b..726dc293af6 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -9,27 +9,27 @@ */ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "mount3.h" #include "xdr-nfs3.h" #include "msg-nfs3.h" -#include "iobuf.h" +#include <glusterfs/iobuf.h> #include "nfs-common.h" #include "nfs3-fh.h" #include "nfs-fops.h" #include "nfs-inodes.h" #include "nfs-generics.h" -#include "locking.h" -#include "iatt.h" +#include <glusterfs/locking.h> +#include <glusterfs/iatt.h> #include "nfs-mem-types.h" #include "nfs.h" -#include "common-utils.h" -#include "store.h" +#include <glusterfs/common-utils.h> +#include <glusterfs/store.h> #include "glfs-internal.h" #include "glfs.h" #include "mount3-auth.h" -#include "hashfn.h" +#include <glusterfs/hashfn.h> #include "nfs-messages.h" #include <errno.h> diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index 9b0f73e3af7..b185df835ae 100644 --- a/xlators/nfs/server/src/mount3.h +++ b/xlators/nfs/server/src/mount3.h @@ -12,15 +12,15 @@ #define _MOUNT3_H_ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> #include "nfs.h" -#include "list.h" +#include <glusterfs/list.h> #include "xdr-nfs3.h" -#include "locking.h" +#include <glusterfs/locking.h> #include "nfs3-fh.h" -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "exports.h" #include "mount3-auth.h" #include "auth-cache.h" diff --git a/xlators/nfs/server/src/mount3udp_svc.c b/xlators/nfs/server/src/mount3udp_svc.c index d542e2951c3..d5e41691f3d 100644 --- a/xlators/nfs/server/src/mount3udp_svc.c +++ b/xlators/nfs/server/src/mount3udp_svc.c @@ -9,8 +9,8 @@ */ #include "xdr-nfs3.h" -#include "logging.h" -#include "mem-pool.h" +#include <glusterfs/logging.h> +#include <glusterfs/mem-pool.h> #include "nfs-mem-types.h" #include "nfs-messages.h" #include "mount3.h" diff --git a/xlators/nfs/server/src/netgroups.c b/xlators/nfs/server/src/netgroups.c index 092d4707205..f68a7f14a26 100644 --- a/xlators/nfs/server/src/netgroups.c +++ b/xlators/nfs/server/src/netgroups.c @@ -13,7 +13,7 @@ */ #include "netgroups.h" -#include "parse-utils.h" +#include <glusterfs/parse-utils.h> #include "nfs-messages.h" static void diff --git a/xlators/nfs/server/src/netgroups.h b/xlators/nfs/server/src/netgroups.h index 1bb666b9596..9c715f75d3c 100644 --- a/xlators/nfs/server/src/netgroups.h +++ b/xlators/nfs/server/src/netgroups.h @@ -16,7 +16,7 @@ #define _NETGROUPS_H #include "nfs-mem-types.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "nfs.h" #define GF_NG GF_NFS "-netgroup" diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index 2e8d401ba52..43bb3f3f78c 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -9,16 +9,16 @@ */ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "xdr-nfs3.h" #include "msg-nfs3.h" -#include "iobuf.h" +#include <glusterfs/iobuf.h> #include "nfs-common.h" #include "nfs-fops.h" #include "nfs-mem-types.h" #include "rpcsvc.h" -#include "iatt.h" +#include <glusterfs/iatt.h> #include "nfs-messages.h" #include <libgen.h> diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h index 46147757ef5..bd80d8b3be5 100644 --- a/xlators/nfs/server/src/nfs-common.h +++ b/xlators/nfs/server/src/nfs-common.h @@ -13,10 +13,10 @@ #include <unistd.h> -#include "xlator.h" +#include <glusterfs/xlator.h> #include "rpcsvc.h" -#include "iatt.h" -#include "compat-uuid.h" +#include <glusterfs/iatt.h> +#include <glusterfs/compat-uuid.h> // NFS_PATH_MAX hard-coded to 4096 as a work around for bug 2476. // nfs server crashes when path received is longer than PATH_MAX diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index e78cef7f0b4..896c67c9305 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -10,10 +10,10 @@ #include <pwd.h> -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" -#include "call-stub.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> +#include <glusterfs/call-stub.h> #include "nfs.h" #include "nfs-fops.h" #include "nfs-common.h" diff --git a/xlators/nfs/server/src/nfs-fops.h b/xlators/nfs/server/src/nfs-fops.h index 1f7c3b2d1f9..005cb788a45 100644 --- a/xlators/nfs/server/src/nfs-fops.h +++ b/xlators/nfs/server/src/nfs-fops.h @@ -11,10 +11,10 @@ #ifndef _NFS_FOPS_H_ #define _NFS_FOPS_H_ -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" -#include "call-stub.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> +#include <glusterfs/call-stub.h> #include "nfs.h" #include "nfs-common.h" #include "nfs-messages.h" diff --git a/xlators/nfs/server/src/nfs-generics.c b/xlators/nfs/server/src/nfs-generics.c index feadb4cfb3f..009991877cb 100644 --- a/xlators/nfs/server/src/nfs-generics.c +++ b/xlators/nfs/server/src/nfs-generics.c @@ -14,7 +14,7 @@ #include "nfs-fops.h" #include "nfs-inodes.h" #include "nfs-generics.h" -#include "xlator.h" +#include <glusterfs/xlator.h> int nfs_fstat(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd, diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h index f71b45a513d..07a79994a4b 100644 --- a/xlators/nfs/server/src/nfs-generics.h +++ b/xlators/nfs/server/src/nfs-generics.h @@ -12,7 +12,7 @@ #define _NFS_GENERICS_H_ #include "nfs.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include "nfs-fops.h" #include "nfs-inodes.h" diff --git a/xlators/nfs/server/src/nfs-inodes.c b/xlators/nfs/server/src/nfs-inodes.c index 9999e884ffa..6f34ca705ba 100644 --- a/xlators/nfs/server/src/nfs-inodes.c +++ b/xlators/nfs/server/src/nfs-inodes.c @@ -13,7 +13,7 @@ #include "nfs.h" #include "nfs-inodes.h" #include "nfs-fops.h" -#include "xlator.h" +#include <glusterfs/xlator.h> #include "nfs-messages.h" #include <libgen.h> diff --git a/xlators/nfs/server/src/nfs-inodes.h b/xlators/nfs/server/src/nfs-inodes.h index 7a874c8a4ce..e8efd1e127c 100644 --- a/xlators/nfs/server/src/nfs-inodes.h +++ b/xlators/nfs/server/src/nfs-inodes.h @@ -11,10 +11,10 @@ #ifndef _NFS_INODES_H_ #define _NFS_INODES_H_ -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" -#include "call-stub.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> +#include <glusterfs/call-stub.h> #include "nfs-fops.h" extern int diff --git a/xlators/nfs/server/src/nfs-mem-types.h b/xlators/nfs/server/src/nfs-mem-types.h index ea1d9323088..0a3c887eff1 100644 --- a/xlators/nfs/server/src/nfs-mem-types.h +++ b/xlators/nfs/server/src/nfs-mem-types.h @@ -11,7 +11,7 @@ #ifndef __NFS_MEM_TYPES_H__ #define __NFS_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_nfs_mem_types_ { gf_nfs_mt_mountentry = gf_common_mt_end + 1, diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h index b8fe99e45d3..04e15cbe78c 100644 --- a/xlators/nfs/server/src/nfs-messages.h +++ b/xlators/nfs/server/src/nfs-messages.h @@ -10,7 +10,7 @@ #ifndef _NFS_MESSAGES_H_ #define _NFS_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/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 6f55ed2f0e5..ceb4943bc93 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -12,23 +12,23 @@ * Every other protocol version gets initialized from here. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "nfs.h" -#include "mem-pool.h" -#include "logging.h" +#include <glusterfs/mem-pool.h> +#include <glusterfs/logging.h> #include "nfs-fops.h" #include "mount3.h" #include "nfs3.h" #include "nfs-mem-types.h" #include "nfs3-helpers.h" #include "nlm4.h" -#include "options.h" +#include <glusterfs/options.h> #include "acl3.h" #include "rpc-drc.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #include "rpcsvc.h" #include "nfs-messages.h" diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h index 531a269071c..e3daaed17a6 100644 --- a/xlators/nfs/server/src/nfs.h +++ b/xlators/nfs/server/src/nfs.h @@ -12,10 +12,10 @@ #define __NFS_H__ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" -#include "lkowner.h" -#include "gidcache.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/lkowner.h> +#include <glusterfs/gidcache.h> #define GF_NFS "nfs" diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c index c63f9328f57..d0c0a2f55b2 100644 --- a/xlators/nfs/server/src/nfs3-fh.c +++ b/xlators/nfs/server/src/nfs3-fh.c @@ -9,15 +9,15 @@ */ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "xdr-nfs3.h" #include "msg-nfs3.h" -#include "iobuf.h" +#include <glusterfs/iobuf.h> #include "nfs3-fh.h" #include "nfs-common.h" -#include "iatt.h" -#include "common-utils.h" +#include <glusterfs/iatt.h> +#include <glusterfs/common-utils.h> #include "nfs-messages.h" int diff --git a/xlators/nfs/server/src/nfs3-fh.h b/xlators/nfs/server/src/nfs3-fh.h index 442f6feeb25..cd7916b892d 100644 --- a/xlators/nfs/server/src/nfs3-fh.h +++ b/xlators/nfs/server/src/nfs3-fh.h @@ -11,11 +11,11 @@ #ifndef _NFS_FH_H_ #define _NFS_FH_H_ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "xdr-nfs3.h" -#include "iatt.h" +#include <glusterfs/iatt.h> #include <sys/types.h> -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> /* BIG FAT WARNING: The file handle code is tightly coupled to NFSv3 file * handles for now. This will change if and when we need v4. */ diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index 5cd3bb8cb93..8a58977b53c 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -10,18 +10,18 @@ #include <inttypes.h> -#include "xlator.h" +#include <glusterfs/xlator.h> #include "nfs3.h" #include "nfs3-fh.h" #include "msg-nfs3.h" -#include "rbthash.h" +#include <glusterfs/rbthash.h> #include "nfs-fops.h" #include "nfs-inodes.h" #include "nfs-generics.h" #include "nfs3-helpers.h" #include "nfs-mem-types.h" -#include "iatt.h" -#include "common-utils.h" +#include <glusterfs/iatt.h> +#include <glusterfs/common-utils.h> #include "nfs-messages.h" #include "mount3.h" #include <string.h> diff --git a/xlators/nfs/server/src/nfs3-helpers.h b/xlators/nfs/server/src/nfs3-helpers.h index 7c70c20b787..aead636c831 100644 --- a/xlators/nfs/server/src/nfs3-helpers.h +++ b/xlators/nfs/server/src/nfs3-helpers.h @@ -11,7 +11,7 @@ #ifndef _NFS3_HELPER_H_ #define _NFS3_HELPER_H_ -#include "xlator.h" +#include <glusterfs/xlator.h> #include "nfs3.h" #include "nfs3-fh.h" #include "msg-nfs3.h" diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index d8e41680008..1400c4ea30d 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -9,15 +9,15 @@ */ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "mount3.h" #include "xdr-nfs3.h" #include "msg-nfs3.h" -#include "iobuf.h" +#include <glusterfs/iobuf.h> #include "nfs3.h" -#include "mem-pool.h" -#include "logging.h" +#include <glusterfs/mem-pool.h> +#include <glusterfs/logging.h> #include "nfs-common.h" #include "nfs-fops.h" #include "nfs-inodes.h" diff --git a/xlators/nfs/server/src/nfs3.h b/xlators/nfs/server/src/nfs3.h index f6d98d9f308..cdb7e03a619 100644 --- a/xlators/nfs/server/src/nfs3.h +++ b/xlators/nfs/server/src/nfs3.h @@ -12,18 +12,18 @@ #define _NFS3_H_ #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> #include "nfs.h" #include "nfs3-fh.h" #include "nfs-common.h" #include "xdr-nfs3.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "nlm4.h" #include "acl3-xdr.h" #include "acl3.h" -#include "refcount.h" +#include <glusterfs/refcount.h> #include <sys/statvfs.h> #define GF_NFS3 GF_NFS "-nfsv3" diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c index 6fd952fd338..3ac0977fb22 100644 --- a/xlators/nfs/server/src/nlm4.c +++ b/xlators/nfs/server/src/nlm4.c @@ -8,14 +8,14 @@ cases as published by the Free Software Foundation. */ -#include "defaults.h" +#include <glusterfs/defaults.h> #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "nfs.h" -#include "mem-pool.h" -#include "logging.h" -#include "syscall.h" +#include <glusterfs/mem-pool.h> +#include <glusterfs/logging.h> +#include <glusterfs/syscall.h> #include "nfs-fops.h" #include "mount3.h" #include "nfs3.h" @@ -28,13 +28,13 @@ #include "nfs-generics.h" #include "rpc-clnt.h" #include "nsm-xdr.h" -#include "run.h" +#include <glusterfs/run.h> #include "nfs-messages.h" #include <unistd.h> #include <rpc/pmap_clnt.h> #include <rpc/rpc.h> #include <rpc/xdr.h> -#include <statedump.h> +#include <glusterfs/statedump.h> #define KILLALL_CMD "pkill" diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h index 4755c83f3dc..a22032cac69 100644 --- a/xlators/nfs/server/src/nlm4.h +++ b/xlators/nfs/server/src/nlm4.h @@ -14,17 +14,17 @@ #include <sys/types.h> #include <signal.h> #include "rpcsvc.h" -#include "dict.h" -#include "xlator.h" -#include "iobuf.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/iobuf.h> #include "nfs.h" -#include "list.h" +#include <glusterfs/list.h> #include "xdr-nfs3.h" -#include "locking.h" +#include <glusterfs/locking.h> #include "nfs3-fh.h" -#include "compat-uuid.h" +#include <glusterfs/compat-uuid.h> #include "nlm4-xdr.h" -#include "lkowner.h" +#include <glusterfs/lkowner.h> #define NLM4_NULL 0 #define NLM4_TEST 1 diff --git a/xlators/nfs/server/src/nlmcbk_svc.c b/xlators/nfs/server/src/nlmcbk_svc.c index 1d57f415e2c..d18b86ce8db 100644 --- a/xlators/nfs/server/src/nlmcbk_svc.c +++ b/xlators/nfs/server/src/nlmcbk_svc.c @@ -14,7 +14,7 @@ */ #include "nlm4.h" -#include "logging.h" +#include <glusterfs/logging.h> #include "nfs-messages.h" #include <stdio.h> #include <stdlib.h> diff --git a/xlators/performance/decompounder/src/decompounder-mem-types.h b/xlators/performance/decompounder/src/decompounder-mem-types.h index 8b3049ffb18..1a31f7c892c 100644 --- a/xlators/performance/decompounder/src/decompounder-mem-types.h +++ b/xlators/performance/decompounder/src/decompounder-mem-types.h @@ -11,7 +11,7 @@ #ifndef __DC_MEM_TYPES_H__ #define __DC_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_dc_mem_types_ { gf_dc_mt_rsp_t = gf_common_mt_end + 1, gf_dc_mt_end }; #endif diff --git a/xlators/performance/decompounder/src/decompounder-messages.h b/xlators/performance/decompounder/src/decompounder-messages.h index 60674f32e78..a93af5d69e4 100644 --- a/xlators/performance/decompounder/src/decompounder-messages.h +++ b/xlators/performance/decompounder/src/decompounder-messages.h @@ -11,7 +11,7 @@ #ifndef _DC_MESSAGES_H_ #define _DC_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/performance/decompounder/src/decompounder.c b/xlators/performance/decompounder/src/decompounder.c index 8bc390923e0..6fb7f534e3f 100644 --- a/xlators/performance/decompounder/src/decompounder.c +++ b/xlators/performance/decompounder/src/decompounder.c @@ -9,8 +9,8 @@ */ #include "decompounder.h" -#include "mem-types.h" -#include "compound-fop-utils.h" +#include <glusterfs/mem-types.h> +#include <glusterfs/compound-fop-utils.h> void dc_local_cleanup(dc_local_t *local) diff --git a/xlators/performance/decompounder/src/decompounder.h b/xlators/performance/decompounder/src/decompounder.h index 486d0caf369..b9b934d5112 100644 --- a/xlators/performance/decompounder/src/decompounder.h +++ b/xlators/performance/decompounder/src/decompounder.h @@ -11,9 +11,9 @@ #ifndef __DC_H__ #define __DC_H__ -#include "defaults.h" -#include "xlator.h" -#include "call-stub.h" +#include <glusterfs/defaults.h> +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> #include "decompounder-mem-types.h" #include "decompounder-messages.h" diff --git a/xlators/performance/io-cache/src/io-cache-messages.h b/xlators/performance/io-cache/src/io-cache-messages.h index 09c5439ca71..0f384cf0452 100644 --- a/xlators/performance/io-cache/src/io-cache-messages.h +++ b/xlators/performance/io-cache/src/io-cache-messages.h @@ -10,7 +10,7 @@ #ifndef _IO_CACHE_MESSAGES_H_ #define _IO_CACHE_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/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c index 31e3bb0df96..24fc1742899 100644 --- a/xlators/performance/io-cache/src/io-cache.c +++ b/xlators/performance/io-cache/src/io-cache.c @@ -9,13 +9,13 @@ */ #include <math.h> -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "io-cache.h" #include "ioc-mem-types.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include <assert.h> #include <sys/time.h> #include "io-cache-messages.h" diff --git a/xlators/performance/io-cache/src/io-cache.h b/xlators/performance/io-cache/src/io-cache.h index cc66fcea714..088e06ea917 100644 --- a/xlators/performance/io-cache/src/io-cache.h +++ b/xlators/performance/io-cache/src/io-cache.h @@ -12,16 +12,16 @@ #define __IO_CACHE_H #include <sys/types.h> -#include "compat-errno.h" - -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "common-utils.h" -#include "call-stub.h" -#include "rbthash.h" -#include "hashfn.h" +#include <glusterfs/compat-errno.h> + +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/rbthash.h> +#include <glusterfs/hashfn.h> #include <sys/time.h> #include <fnmatch.h> #include "io-cache-messages.h" diff --git a/xlators/performance/io-cache/src/ioc-mem-types.h b/xlators/performance/io-cache/src/ioc-mem-types.h index 3271840bb43..20c9a12021e 100644 --- a/xlators/performance/io-cache/src/ioc-mem-types.h +++ b/xlators/performance/io-cache/src/ioc-mem-types.h @@ -11,7 +11,7 @@ #ifndef __IOC_MT_H__ #define __IOC_MT_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_ioc_mem_types_ { gf_ioc_mt_iovec = gf_common_mt_end + 1, diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c index 19bd946b76d..4a9679cf0ce 100644 --- a/xlators/performance/io-cache/src/page.c +++ b/xlators/performance/io-cache/src/page.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "io-cache.h" #include "ioc-mem-types.h" #include <assert.h> diff --git a/xlators/performance/io-threads/src/io-threads-messages.h b/xlators/performance/io-threads/src/io-threads-messages.h index 25e08f4b687..9fb3426d7ca 100644 --- a/xlators/performance/io-threads/src/io-threads-messages.h +++ b/xlators/performance/io-threads/src/io-threads-messages.h @@ -10,7 +10,7 @@ #ifndef _IO_THREADS_MESSAGES_H_ #define _IO_THREADS_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/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c index 80d42ded5eb..cbad2f6e37f 100644 --- a/xlators/performance/io-threads/src/io-threads.c +++ b/xlators/performance/io-threads/src/io-threads.c @@ -8,20 +8,20 @@ cases as published by the Free Software Foundation. */ -#include "call-stub.h" -#include "defaults.h" -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "io-threads.h" #include <signal.h> #include <stdlib.h> #include <sys/time.h> #include <time.h> -#include "locking.h" +#include <glusterfs/locking.h> #include "io-threads-messages.h" -#include "timespec.h" +#include <glusterfs/timespec.h> void * iot_worker(void *arg); diff --git a/xlators/performance/io-threads/src/io-threads.h b/xlators/performance/io-threads/src/io-threads.h index 2980d18e74b..f54d2f4912d 100644 --- a/xlators/performance/io-threads/src/io-threads.h +++ b/xlators/performance/io-threads/src/io-threads.h @@ -11,18 +11,18 @@ #ifndef __IOT_H #define __IOT_H -#include "compat-errno.h" -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "common-utils.h" -#include "list.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/list.h> #include <stdlib.h> -#include "locking.h" +#include <glusterfs/locking.h> #include "iot-mem-types.h" #include <semaphore.h> -#include "statedump.h" +#include <glusterfs/statedump.h> struct iot_conf; diff --git a/xlators/performance/io-threads/src/iot-mem-types.h b/xlators/performance/io-threads/src/iot-mem-types.h index d6b5e7b6899..29565f34dd4 100644 --- a/xlators/performance/io-threads/src/iot-mem-types.h +++ b/xlators/performance/io-threads/src/iot-mem-types.h @@ -11,7 +11,7 @@ #ifndef __IOT_MEM_TYPES_H__ #define __IOT_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_iot_mem_types_ { gf_iot_mt_iot_conf_t = gf_common_mt_end + 1, diff --git a/xlators/performance/md-cache/src/md-cache-mem-types.h b/xlators/performance/md-cache/src/md-cache-mem-types.h index e6658577731..47a07005717 100644 --- a/xlators/performance/md-cache/src/md-cache-mem-types.h +++ b/xlators/performance/md-cache/src/md-cache-mem-types.h @@ -11,7 +11,7 @@ #ifndef __MDC_MEM_TYPES_H__ #define __MDC_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_mdc_mem_types_ { gf_mdc_mt_mdc_local_t = gf_common_mt_end + 1, diff --git a/xlators/performance/md-cache/src/md-cache-messages.h b/xlators/performance/md-cache/src/md-cache-messages.h index dfc321372ce..f367bad1991 100644 --- a/xlators/performance/md-cache/src/md-cache-messages.h +++ b/xlators/performance/md-cache/src/md-cache-messages.h @@ -10,7 +10,7 @@ #ifndef _MD_CACHE_MESSAGES_H_ #define _MD_CACHE_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/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c index 909857dd8ad..c876afad8c3 100644 --- a/xlators/performance/md-cache/src/md-cache.c +++ b/xlators/performance/md-cache/src/md-cache.c @@ -8,23 +8,23 @@ cases as published by the Free Software Foundation. */ -#include "timespec.h" -#include "glusterfs.h" -#include "defaults.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "syncop.h" +#include <glusterfs/timespec.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/defaults.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syncop.h> #include "md-cache-mem-types.h" -#include "compat-errno.h" -#include "glusterfs-acl.h" -#include "defaults.h" -#include "upcall-utils.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/glusterfs-acl.h> +#include <glusterfs/defaults.h> +#include <glusterfs/upcall-utils.h> #include <assert.h> #include <sys/time.h> #include "md-cache-messages.h" -#include "statedump.h" -#include "atomic.h" +#include <glusterfs/statedump.h> +#include <glusterfs/atomic.h> /* TODO: - cache symlink() link names and nuke symlink-cache diff --git a/xlators/performance/nl-cache/src/nl-cache-helper.c b/xlators/performance/nl-cache/src/nl-cache-helper.c index 279c023a5b1..f2c9bcdfb04 100644 --- a/xlators/performance/nl-cache/src/nl-cache-helper.c +++ b/xlators/performance/nl-cache/src/nl-cache-helper.c @@ -10,7 +10,7 @@ #include "nl-cache.h" #include "timer-wheel.h" -#include "statedump.h" +#include <glusterfs/statedump.h> /* Caching guidelines: * This xlator serves negative lookup(ENOENT lookups) from the cache, diff --git a/xlators/performance/nl-cache/src/nl-cache-mem-types.h b/xlators/performance/nl-cache/src/nl-cache-mem-types.h index fa8c7775ef7..93a17b3fd5a 100644 --- a/xlators/performance/nl-cache/src/nl-cache-mem-types.h +++ b/xlators/performance/nl-cache/src/nl-cache-mem-types.h @@ -11,7 +11,7 @@ #ifndef __NL_CACHE_MEM_TYPES_H__ #define __NL_CACHE_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_nlc_mem_types_ { gf_nlc_mt_nlc_conf_t = gf_common_mt_end + 1, diff --git a/xlators/performance/nl-cache/src/nl-cache-messages.h b/xlators/performance/nl-cache/src/nl-cache-messages.h index 17fd96de17c..222d709e133 100644 --- a/xlators/performance/nl-cache/src/nl-cache-messages.h +++ b/xlators/performance/nl-cache/src/nl-cache-messages.h @@ -11,7 +11,7 @@ #ifndef __NL_CACHE_MESSAGES_H__ #define __NL_CACHE_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/performance/nl-cache/src/nl-cache.c b/xlators/performance/nl-cache/src/nl-cache.c index 02d6df55349..78c29031ddb 100644 --- a/xlators/performance/nl-cache/src/nl-cache.c +++ b/xlators/performance/nl-cache/src/nl-cache.c @@ -9,8 +9,8 @@ */ #include "nl-cache.h" -#include "statedump.h" -#include "upcall-utils.h" +#include <glusterfs/statedump.h> +#include <glusterfs/upcall-utils.h> static void nlc_dentry_op(call_frame_t *frame, xlator_t *this, gf_boolean_t multilink) diff --git a/xlators/performance/nl-cache/src/nl-cache.h b/xlators/performance/nl-cache/src/nl-cache.h index 9c9682f6396..8b09972bb09 100644 --- a/xlators/performance/nl-cache/src/nl-cache.h +++ b/xlators/performance/nl-cache/src/nl-cache.h @@ -13,10 +13,10 @@ #include "nl-cache-mem-types.h" #include "nl-cache-messages.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" -#include "atomic.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/atomic.h> #define NLC_INVALID 0x0000 #define NLC_PE_FULL 0x0001 diff --git a/xlators/performance/open-behind/src/open-behind-mem-types.h b/xlators/performance/open-behind/src/open-behind-mem-types.h index b16a678cbf4..6c1ab2e19d2 100644 --- a/xlators/performance/open-behind/src/open-behind-mem-types.h +++ b/xlators/performance/open-behind/src/open-behind-mem-types.h @@ -11,7 +11,7 @@ #ifndef __OB_MEM_TYPES_H__ #define __OB_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_ob_mem_types_ { gf_ob_mt_fd_t = gf_common_mt_end + 1, diff --git a/xlators/performance/open-behind/src/open-behind-messages.h b/xlators/performance/open-behind/src/open-behind-messages.h index 09b4e8f0c28..f25082433f8 100644 --- a/xlators/performance/open-behind/src/open-behind-messages.h +++ b/xlators/performance/open-behind/src/open-behind-messages.h @@ -10,7 +10,7 @@ #ifndef _OPEN_BEHIND_MESSAGES_H_ #define _OPEN_BEHIND_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/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c index 6164b3b046d..0d1224fc438 100644 --- a/xlators/performance/open-behind/src/open-behind.c +++ b/xlators/performance/open-behind/src/open-behind.c @@ -9,12 +9,12 @@ */ #include "open-behind-mem-types.h" -#include "xlator.h" -#include "statedump.h" -#include "call-stub.h" -#include "defaults.h" +#include <glusterfs/xlator.h> +#include <glusterfs/statedump.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> #include "open-behind-messages.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> typedef struct ob_conf { gf_boolean_t use_anonymous_fd; /* use anonymous FDs wherever safe diff --git a/xlators/performance/quick-read/src/quick-read-mem-types.h b/xlators/performance/quick-read/src/quick-read-mem-types.h index 5783132c28a..e4aef8549ff 100644 --- a/xlators/performance/quick-read/src/quick-read-mem-types.h +++ b/xlators/performance/quick-read/src/quick-read-mem-types.h @@ -11,7 +11,7 @@ #ifndef __QR_MEM_TYPES_H__ #define __QR_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_qr_mem_types_ { gf_qr_mt_qr_inode_t = gf_common_mt_end + 1, diff --git a/xlators/performance/quick-read/src/quick-read-messages.h b/xlators/performance/quick-read/src/quick-read-messages.h index 745eabbc664..da9724a3c9c 100644 --- a/xlators/performance/quick-read/src/quick-read-messages.h +++ b/xlators/performance/quick-read/src/quick-read-messages.h @@ -10,7 +10,7 @@ #ifndef _QUICK_READ_MESSAGES_H_ #define _QUICK_READ_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/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index ea61a2ec302..ee91aca40a6 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -10,10 +10,10 @@ #include <math.h> #include "quick-read.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include "quick-read-messages.h" -#include "upcall-utils.h" -#include "atomic.h" +#include <glusterfs/upcall-utils.h> +#include <glusterfs/atomic.h> typedef struct qr_local { inode_t *inode; diff --git a/xlators/performance/quick-read/src/quick-read.h b/xlators/performance/quick-read/src/quick-read.h index ae99863b426..67850821b8e 100644 --- a/xlators/performance/quick-read/src/quick-read.h +++ b/xlators/performance/quick-read/src/quick-read.h @@ -11,16 +11,16 @@ #ifndef __QUICK_READ_H #define __QUICK_READ_H -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "list.h" -#include "compat.h" -#include "compat-errno.h" -#include "common-utils.h" -#include "call-stub.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/defaults.h> #include <libgen.h> #include <sys/time.h> #include <sys/types.h> diff --git a/xlators/performance/read-ahead/src/page.c b/xlators/performance/read-ahead/src/page.c index 87c9c2347f4..344026352f9 100644 --- a/xlators/performance/read-ahead/src/page.c +++ b/xlators/performance/read-ahead/src/page.c @@ -8,10 +8,10 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "read-ahead.h" #include <assert.h> #include "read-ahead-messages.h" diff --git a/xlators/performance/read-ahead/src/read-ahead-mem-types.h b/xlators/performance/read-ahead/src/read-ahead-mem-types.h index 239e574506a..f07cfc5bba5 100644 --- a/xlators/performance/read-ahead/src/read-ahead-mem-types.h +++ b/xlators/performance/read-ahead/src/read-ahead-mem-types.h @@ -11,7 +11,7 @@ #ifndef __RA_MEM_TYPES_H__ #define __RA_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_ra_mem_types_ { gf_ra_mt_ra_file_t = gf_common_mt_end + 1, diff --git a/xlators/performance/read-ahead/src/read-ahead-messages.h b/xlators/performance/read-ahead/src/read-ahead-messages.h index 500d3246946..0302b7a7122 100644 --- a/xlators/performance/read-ahead/src/read-ahead-messages.h +++ b/xlators/performance/read-ahead/src/read-ahead-messages.h @@ -10,7 +10,7 @@ #ifndef _READ_AHEAD_MESSAGES_H_ #define _READ_AHEAD_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/performance/read-ahead/src/read-ahead.c b/xlators/performance/read-ahead/src/read-ahead.c index 1822cdc0925..66be002bc37 100644 --- a/xlators/performance/read-ahead/src/read-ahead.c +++ b/xlators/performance/read-ahead/src/read-ahead.c @@ -15,12 +15,12 @@ - ensure efficient memory management in case of random seek */ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "read-ahead.h" -#include "statedump.h" +#include <glusterfs/statedump.h> #include <assert.h> #include <sys/time.h> #include "read-ahead-messages.h" diff --git a/xlators/performance/read-ahead/src/read-ahead.h b/xlators/performance/read-ahead/src/read-ahead.h index 4e99853cc32..e9432fb47cc 100644 --- a/xlators/performance/read-ahead/src/read-ahead.h +++ b/xlators/performance/read-ahead/src/read-ahead.h @@ -11,11 +11,11 @@ #ifndef __READ_AHEAD_H #define __READ_AHEAD_H -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/common-utils.h> #include "read-ahead-mem-types.h" struct ra_conf; diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h b/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h index e2462b48833..498ffae7f64 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h +++ b/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h @@ -11,7 +11,7 @@ #ifndef __RDA_MEM_TYPES_H__ #define __RDA_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_rda_mem_types_ { gf_rda_mt_rda_local = gf_common_mt_end + 1, diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead-messages.h b/xlators/performance/readdir-ahead/src/readdir-ahead-messages.h index c9ce16307e6..28ec14dd845 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead-messages.h +++ b/xlators/performance/readdir-ahead/src/readdir-ahead-messages.h @@ -10,7 +10,7 @@ #ifndef _READDIR_AHEAD_MESSAGES_H_ #define _READDIR_AHEAD_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/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c index 71d0e23c95c..4419b0ccf97 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead.c +++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c @@ -24,12 +24,12 @@ */ #include <math.h> -#include "glusterfs.h" -#include "xlator.h" -#include "call-stub.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/call-stub.h> #include "readdir-ahead.h" #include "readdir-ahead-mem-types.h" -#include "defaults.h" +#include <glusterfs/defaults.h> #include "readdir-ahead-messages.h" static int rda_fill_fd(call_frame_t *, xlator_t *, fd_t *); diff --git a/xlators/performance/symlink-cache/src/symlink-cache-messages.h b/xlators/performance/symlink-cache/src/symlink-cache-messages.h index c1ef1a67f9b..40ff2e4b60b 100644 --- a/xlators/performance/symlink-cache/src/symlink-cache-messages.h +++ b/xlators/performance/symlink-cache/src/symlink-cache-messages.h @@ -10,7 +10,7 @@ #ifndef _SYMLINK_CACHE_MESSAGES_H_ #define _SYMLINK_CACHE_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/performance/symlink-cache/src/symlink-cache.c b/xlators/performance/symlink-cache/src/symlink-cache.c index 81a6d6fc296..58d0783f233 100644 --- a/xlators/performance/symlink-cache/src/symlink-cache.c +++ b/xlators/performance/symlink-cache/src/symlink-cache.c @@ -8,14 +8,14 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "list.h" -#include "compat.h" -#include "compat-errno.h" -#include "common-utils.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/common-utils.h> #include "symlink-cache-messages.h" struct symlink_cache { diff --git a/xlators/performance/write-behind/src/write-behind-mem-types.h b/xlators/performance/write-behind/src/write-behind-mem-types.h index c92a7d4c1f4..a0647299150 100644 --- a/xlators/performance/write-behind/src/write-behind-mem-types.h +++ b/xlators/performance/write-behind/src/write-behind-mem-types.h @@ -11,7 +11,7 @@ #ifndef __WB_MEM_TYPES_H__ #define __WB_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_wb_mem_types_ { gf_wb_mt_wb_file_t = gf_common_mt_end + 1, diff --git a/xlators/performance/write-behind/src/write-behind-messages.h b/xlators/performance/write-behind/src/write-behind-messages.h index 914fc63dda6..e9ea474879b 100644 --- a/xlators/performance/write-behind/src/write-behind-messages.h +++ b/xlators/performance/write-behind/src/write-behind-messages.h @@ -10,7 +10,7 @@ #ifndef _WRITE_BEHIND_MESSAGES_H_ #define _WRITE_BEHIND_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/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index b46a42f300f..a3404425303 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -8,17 +8,17 @@ cases as published by the Free Software Foundation. */ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "list.h" -#include "compat.h" -#include "compat-errno.h" -#include "common-utils.h" -#include "call-stub.h" -#include "statedump.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> +#include <glusterfs/compat.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/call-stub.h> +#include <glusterfs/statedump.h> +#include <glusterfs/defaults.h> #include "write-behind-mem-types.h" #include "write-behind-messages.h" diff --git a/xlators/playground/template/src/template.c b/xlators/playground/template/src/template.c index e96374e0302..2f25d2363a6 100644 --- a/xlators/playground/template/src/template.c +++ b/xlators/playground/template/src/template.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ #include "template.h" -#include "statedump.h" +#include <glusterfs/statedump.h> static int32_t template_mem_acct_init(xlator_t *this) diff --git a/xlators/playground/template/src/template.h b/xlators/playground/template/src/template.h index 0abe2245296..c53dc1c7010 100644 --- a/xlators/playground/template/src/template.h +++ b/xlators/playground/template/src/template.h @@ -10,11 +10,11 @@ #ifndef __TEMPLATE_H__ #define __TEMPLATE_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> struct template_private { /* Add all the relevant fields you need here */ @@ -24,7 +24,7 @@ struct template_private { typedef struct template_private template_private_t; /* Below section goes to template-mem-types.h */ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_template_mem_types_ { gf_template_mt_private_t = gf_common_mt_end + 1, @@ -36,7 +36,7 @@ enum gf_template_mem_types_ { NOTE: make sure you have added your component (in this case, TEMPLATE) in `libglusterfs/src/glfs-message-id.h`. */ -#include "glfs-message-id.h" +#include <glusterfs/glfs-message-id.h> GLFS_MSGID(TEMPLATE, TEMPLATE_MSG_NO_MEMORY, TEMPLATE_MSG_NO_GRAPH); diff --git a/xlators/protocol/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c index f64259e3c11..0d995862de4 100644 --- a/xlators/protocol/auth/addr/src/addr.c +++ b/xlators/protocol/auth/addr/src/addr.c @@ -12,7 +12,7 @@ #include <sys/socket.h> #include <netdb.h> #include "authenticate.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "rpc-transport.h" #define ENTRY_DELIMITER "," diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c index 352a1130e14..c401c4fd791 100644 --- a/xlators/protocol/client/src/client-callback.c +++ b/xlators/protocol/client/src/client-callback.c @@ -10,7 +10,7 @@ #include "client.h" #include "rpc-clnt.h" -#include "defaults.h" +#include <glusterfs/defaults.h> #include "client-messages.h" int diff --git a/xlators/protocol/client/src/client-common.c b/xlators/protocol/client/src/client-common.c index 31615516fcf..7708c820918 100644 --- a/xlators/protocol/client/src/client-common.c +++ b/xlators/protocol/client/src/client-common.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "rpc-common-xdr.h" #include "glusterfs3-xdr.h" #include "glusterfs4-xdr.h" diff --git a/xlators/protocol/client/src/client-common.h b/xlators/protocol/client/src/client-common.h index 21d416d9f27..5214eae128e 100644 --- a/xlators/protocol/client/src/client-common.h +++ b/xlators/protocol/client/src/client-common.h @@ -11,8 +11,8 @@ #ifndef __CLIENT_COMMON_H__ #define __CLIENT_COMMON_H__ -#include "dict.h" -#include "xlator.h" +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> #include "rpc-common-xdr.h" #include "glusterfs3-xdr.h" #include "glusterfs4-xdr.h" diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index ed9d0a5d9d8..f9631c58e69 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -8,13 +8,13 @@ cases as published by the Free Software Foundation. */ -#include "fd-lk.h" +#include <glusterfs/fd-lk.h> #include "client.h" -#include "xlator.h" -#include "defaults.h" -#include "glusterfs.h" -#include "statedump.h" -#include "compat-errno.h" +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/statedump.h> +#include <glusterfs/compat-errno.h> #include "glusterfs3.h" #include "portmap-xdr.h" diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index c70159fbce1..849fdfca0bc 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -9,11 +9,11 @@ */ #include "client.h" -#include "fd.h" +#include <glusterfs/fd.h> #include "client-messages.h" #include "client-common.h" -#include "compat-errno.h" -#include "common-utils.h" +#include <glusterfs/compat-errno.h> +#include <glusterfs/common-utils.h> int client_fd_lk_list_empty(fd_lk_ctx_t *lk_ctx, gf_boolean_t try_lock) diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protoco |