diff options
Diffstat (limited to 'libglusterfs/src')
-rw-r--r-- | libglusterfs/src/Makefile.am | 37 | ||||
-rw-r--r-- | libglusterfs/src/call-stub.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/circ-buff.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/client_t.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/cluster-syncop.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/common-utils.c | 20 | ||||
-rw-r--r-- | libglusterfs/src/compat-errno.c | 2 | ||||
-rw-r--r-- | libglusterfs/src/compat.c | 16 | ||||
-rw-r--r-- | libglusterfs/src/compound-fop-utils.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/ctx.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/daemon.c | 2 | ||||
-rw-r--r-- | libglusterfs/src/default-args.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/defaults-tmpl.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/dict.c | 20 | ||||
-rw-r--r-- | libglusterfs/src/event-epoll.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/event-history.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/event-poll.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/event.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/events.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/fd-lk.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/fd.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/gf-dirent.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store.h | 8 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store_helper.c | 2 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store_helper.h | 10 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_mem-types.h | 2 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.h | 4 | ||||
-rw-r--r-- | libglusterfs/src/gidcache.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/globals.c | 14 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/atomic.h (renamed from libglusterfs/src/atomic.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/byte-order.h (renamed from libglusterfs/src/byte-order.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/call-stub.h (renamed from libglusterfs/src/call-stub.h) | 10 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/checksum.h (renamed from libglusterfs/src/checksum.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/circ-buff.h (renamed from libglusterfs/src/circ-buff.h) | 6 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/client_t.h (renamed from libglusterfs/src/client_t.h) | 6 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/cluster-syncop.h (renamed from libglusterfs/src/cluster-syncop.h) | 8 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/common-utils.h (renamed from libglusterfs/src/common-utils.h) | 16 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/compat-errno.h (renamed from libglusterfs/src/compat-errno.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/compat-uuid.h (renamed from libglusterfs/src/compat-uuid.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/compat.h (renamed from libglusterfs/src/compat.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/compound-fop-utils.h (renamed from libglusterfs/src/compound-fop-utils.h) | 8 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/daemon.h (renamed from libglusterfs/src/daemon.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/default-args.h (renamed from libglusterfs/src/default-args.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/defaults.h (renamed from libglusterfs/src/defaults.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/dict.h (renamed from libglusterfs/src/dict.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/event-history.h (renamed from libglusterfs/src/event-history.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/events.h (renamed from libglusterfs/src/events.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/fd-lk.h (renamed from libglusterfs/src/fd-lk.h) | 16 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/fd.h (renamed from libglusterfs/src/fd.h) | 14 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/gf-dirent.h (renamed from libglusterfs/src/gf-dirent.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/gf-event.h (renamed from libglusterfs/src/gf-event.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/gidcache.h (renamed from libglusterfs/src/gidcache.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/glfs-message-id.h (renamed from libglusterfs/src/glfs-message-id.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/globals.h (renamed from libglusterfs/src/globals.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/glusterfs-acl.h (renamed from libglusterfs/src/glusterfs-acl.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/glusterfs.h (renamed from libglusterfs/src/glusterfs.h) | 14 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/graph-utils.h (renamed from libglusterfs/src/graph-utils.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/hashfn.h (renamed from libglusterfs/src/hashfn.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/iatt.h (renamed from libglusterfs/src/iatt.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/inode.h (renamed from libglusterfs/src/inode.h) | 8 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/iobuf.h (renamed from libglusterfs/src/iobuf.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/latency.h (renamed from libglusterfs/src/latency.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/libglusterfs-messages.h (renamed from libglusterfs/src/libglusterfs-messages.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/list.h (renamed from libglusterfs/src/list.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/lkowner.h (renamed from libglusterfs/src/lkowner.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/locking.h (renamed from libglusterfs/src/locking.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/logging.h (renamed from libglusterfs/src/logging.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/lvm-defaults.h (renamed from libglusterfs/src/lvm-defaults.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/mem-pool.h (renamed from libglusterfs/src/mem-pool.h) | 12 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/mem-types.h (renamed from libglusterfs/src/mem-types.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/monitoring.h (renamed from libglusterfs/src/monitoring.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/options.h (renamed from libglusterfs/src/options.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/parse-utils.h (renamed from libglusterfs/src/parse-utils.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/quota-common-utils.h (renamed from libglusterfs/src/quota-common-utils.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/rbthash.h (renamed from libglusterfs/src/rbthash.h) | 10 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/refcount.h (renamed from libglusterfs/src/refcount.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/revision.h (renamed from libglusterfs/src/revision.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/rot-buffs.h (renamed from libglusterfs/src/rot-buffs.h) | 6 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/run.h (renamed from libglusterfs/src/run.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/stack.h (renamed from libglusterfs/src/stack.h) | 16 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/statedump.h (renamed from libglusterfs/src/statedump.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/store.h (renamed from libglusterfs/src/store.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/strfd.h (renamed from libglusterfs/src/strfd.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/syncop-utils.h (renamed from libglusterfs/src/syncop-utils.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/syncop.h (renamed from libglusterfs/src/syncop.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/syscall.h (renamed from libglusterfs/src/syscall.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/template-component-messages.h (renamed from libglusterfs/src/template-component-messages.h) | 2 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/throttle-tbf.h (renamed from libglusterfs/src/throttle-tbf.h) | 6 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/timer.h (renamed from libglusterfs/src/timer.h) | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/timespec.h (renamed from libglusterfs/src/timespec.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/trie.h (renamed from libglusterfs/src/trie.h) | 0 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/upcall-utils.h (renamed from libglusterfs/src/upcall-utils.h) | 6 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/xlator.h (renamed from libglusterfs/src/xlator.h) | 32 | ||||
-rw-r--r-- | libglusterfs/src/graph-print.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/graph.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/graph.l | 2 | ||||
-rw-r--r-- | libglusterfs/src/graph.y | 10 | ||||
-rw-r--r-- | libglusterfs/src/hashfn.c | 2 | ||||
-rw-r--r-- | libglusterfs/src/inode.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/iobuf.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/latency.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/locking.c | 2 | ||||
-rw-r--r-- | libglusterfs/src/logging.c | 14 | ||||
-rw-r--r-- | libglusterfs/src/mem-pool.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/monitoring.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/options.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/parse-utils.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/quota-common-utils.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/rbthash.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/refcount.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/rot-buffs.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/run.c | 10 | ||||
-rw-r--r-- | libglusterfs/src/stack.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/statedump.c | 14 | ||||
-rw-r--r-- | libglusterfs/src/store.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/strfd.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/syncop-utils.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/syncop.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/syscall.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/throttle-tbf.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/tier-ctr-interface.h | 2 | ||||
-rw-r--r-- | libglusterfs/src/timer.c | 12 | ||||
-rw-r--r-- | libglusterfs/src/timespec.c | 8 | ||||
-rw-r--r-- | libglusterfs/src/trie.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/unittest/global_mock.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/unittest/log_mock.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/unittest/mem_pool_unittest.c | 6 | ||||
-rw-r--r-- | libglusterfs/src/xlator.c | 6 |
130 files changed, 395 insertions, 386 deletions
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 { \ |