libglusterfs: Move devel headers under glusterfs directory

libglusterfs devel package headers are referenced in code using
include semantics for a program, this while it works can be better
especially when dealing with out of tree xlator builds or in
general out of tree devel package usage.

Towards this, the following changes are done,
- moved all devel headers under a glusterfs directory
- Included these headers using system header notation <> in all
code outside of libglusterfs
- Included these headers using own program notation "" within
libglusterfs

This change although big, is just moving around the headers and
making it correct when including these headers from other sources.

This helps us correctly include libglusterfs includes without
namespace conflicts.

Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b
Updates: bz#1193929
Signed-off-by: ShyamsundarR <srangana@redhat.com>

25 files changed, 81 insertions, 81 deletions

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/protocol/client/src/client-lk.c
index 48f32116de9..01613b7ab66 100644
--- a/xlators/protocol/client/src/client-lk.c
+++ b/xlators/protocol/client/src/client-lk.c
@@ -8,10 +8,10 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "common-utils.h"
-#include "xlator.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/xlator.h>
 #include "client.h"
-#include "lkowner.h"
+#include <glusterfs/lkowner.h>
 #include "client-messages.h"
 
 static void
diff --git a/xlators/protocol/client/src/client-mem-types.h b/xlators/protocol/client/src/client-mem-types.h
index 715f981c31e..f61fa0c1828 100644
--- a/xlators/protocol/client/src/client-mem-types.h
+++ b/xlators/protocol/client/src/client-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __CLIENT_MEM_TYPES_H__
 #define __CLIENT_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_client_mem_types_ {
     gf_client_mt_clnt_conf_t = gf_common_mt_end + 1,
diff --git a/xlators/protocol/client/src/client-messages.h b/xlators/protocol/client/src/client-messages.h
index 879d53741d1..5c0ca5946c1 100644
--- a/xlators/protocol/client/src/client-messages.h
+++ b/xlators/protocol/client/src/client-messages.h
@@ -11,7 +11,7 @@
 #ifndef _PC_MESSAGES_H__
 #define _PC_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/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c
index 9e5a5b44c69..b7df7cc13e3 100644
--- a/xlators/protocol/client/src/client-rpc-fops.c
+++ b/xlators/protocol/client/src/client-rpc-fops.c
@@ -12,11 +12,11 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "client-messages.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "client-common.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/compound-fop-utils.h>
 
 int32_t
 client3_getspec(call_frame_t *frame, xlator_t *this, void *data);
diff --git a/xlators/protocol/client/src/client-rpc-fops_v2.c b/xlators/protocol/client/src/client-rpc-fops_v2.c
index 55a9fd04a6a..ca180c1db4b 100644
--- a/xlators/protocol/client/src/client-rpc-fops_v2.c
+++ b/xlators/protocol/client/src/client-rpc-fops_v2.c
@@ -12,11 +12,11 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs4-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "client-messages.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "client-common.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/compound-fop-utils.h>
 
 extern int32_t
 client3_getspec(call_frame_t *frame, xlator_t *this, void *data);
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 37c2d9891b6..44fd4d5409f 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -9,12 +9,12 @@
 */
 
 #include "client.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "glusterfs.h"
-#include "statedump.h"
-#include "compat-errno.h"
-#include "gf-event.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/compat-errno.h>
+#include <glusterfs/gf-event.h>
 
 #include "xdr-rpc.h"
 #include "glusterfs3.h"
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
index c63e3a290d6..5fc75a84628 100644
--- a/xlators/protocol/client/src/client.h
+++ b/xlators/protocol/client/src/client.h
@@ -15,15 +15,15 @@
 #include <stdint.h>
 
 #include "rpc-clnt.h"
-#include "list.h"
-#include "inode.h"
+#include <glusterfs/list.h>
+#include <glusterfs/inode.h>
 #include "client-mem-types.h"
 #include "protocol-common.h"
 #include "glusterfs3.h"
 #include "glusterfs3-xdr.h"
-#include "fd-lk.h"
-#include "defaults.h"
-#include "default-args.h"
+#include <glusterfs/fd-lk.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/default-args.h>
 #include "client-messages.h"
 
 /* FIXME: Needs to be defined in a common file */
diff --git a/xlators/protocol/server/src/authenticate.h b/xlators/protocol/server/src/authenticate.h
index 6fc53933343..6888cf696e6 100644
--- a/xlators/protocol/server/src/authenticate.h
+++ b/xlators/protocol/server/src/authenticate.h
@@ -17,10 +17,10 @@
 
 #include <stdio.h>
 #include <fnmatch.h>
-#include "dict.h"
-#include "compat.h"
-#include "list.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/list.h>
+#include <glusterfs/xlator.h>
 
 typedef enum { AUTH_ACCEPT, AUTH_REJECT, AUTH_DONT_CARE } auth_result_t;
 
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c
index b5d61edccfb..25b36155065 100644
--- a/xlators/protocol/server/src/server-common.c
+++ b/xlators/protocol/server/src/server-common.c
@@ -1,13 +1,13 @@
 #include "server.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "server-messages.h"
 #include "server-helpers.h"
-#include "defaults.h"
-#include "fd.h"
+#include <glusterfs/defaults.h>
+#include <glusterfs/fd.h>
 #include "xdr-nfs3.h"
 
 void
diff --git a/xlators/protocol/server/src/server-common.h b/xlators/protocol/server/src/server-common.h
index 53e46afdc69..2844ee95756 100644
--- a/xlators/protocol/server/src/server-common.h
+++ b/xlators/protocol/server/src/server-common.h
@@ -1,11 +1,11 @@
 #include "server.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "server-messages.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 
 #include "xdr-nfs3.h"
 void
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index f2838832b59..382f2410ee8 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -12,13 +12,13 @@
 #include "server-helpers.h"
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "glusterfs3.h"
 #include "authenticate.h"
 #include "server-messages.h"
-#include "syscall.h"
-#include "events.h"
-#include "syncop.h"
+#include <glusterfs/syscall.h>
+#include <glusterfs/events.h>
+#include <glusterfs/syncop.h>
 
 struct __get_xl_struct {
     const char *name;
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index b1c80b62d53..c55a422679d 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -10,16 +10,16 @@
 
 #include "server.h"
 #include "server-helpers.h"
-#include "gidcache.h"
+#include <glusterfs/gidcache.h>
 #include "server-messages.h"
-#include "syscall.h"
-#include "defaults.h"
-#include "default-args.h"
+#include <glusterfs/syscall.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/default-args.h>
 #include "server-common.h"
 
 #include <fnmatch.h>
 #include <pwd.h>
-#include "compound-fop-utils.h"
+#include <glusterfs/compound-fop-utils.h>
 
 /* based on nfs_fix_aux_groups() */
 int
diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h
index 9f2e1546831..7dea40e3eb1 100644
--- a/xlators/protocol/server/src/server-helpers.h
+++ b/xlators/protocol/server/src/server-helpers.h
@@ -12,7 +12,7 @@
 #define _SERVER_HELPERS_H
 
 #include "server.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 
 #define CALL_STATE(frame) ((server_state_t *)frame->root->state)
 
diff --git a/xlators/protocol/server/src/server-mem-types.h b/xlators/protocol/server/src/server-mem-types.h
index c4679c5587d..081e9f40e84 100644
--- a/xlators/protocol/server/src/server-mem-types.h
+++ b/xlators/protocol/server/src/server-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __SERVER_MEM_TYPES_H__
 #define __SERVER_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_server_mem_types_ {
     gf_server_mt_server_conf_t = gf_common_mt_end + 1,
diff --git a/xlators/protocol/server/src/server-messages.h b/xlators/protocol/server/src/server-messages.h
index bc7431b9d86..9f00421fe92 100644
--- a/xlators/protocol/server/src/server-messages.h
+++ b/xlators/protocol/server/src/server-messages.h
@@ -11,7 +11,7 @@
 #ifndef _PS_MESSAGES_H__
 #define _PS_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/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index 33a1437e4ef..52a144e5d12 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -15,13 +15,13 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "server-messages.h"
-#include "defaults.h"
-#include "default-args.h"
+#include <glusterfs/defaults.h>
+#include <glusterfs/default-args.h>
 #include "server-common.h"
-#include "xlator.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/compound-fop-utils.h>
 
 #include "xdr-nfs3.h"
 
diff --git a/xlators/protocol/server/src/server-rpc-fops_v2.c b/xlators/protocol/server/src/server-rpc-fops_v2.c
index d945f47fc8c..c5a8e482621 100644
--- a/xlators/protocol/server/src/server-rpc-fops_v2.c
+++ b/xlators/protocol/server/src/server-rpc-fops_v2.c
@@ -15,13 +15,13 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs4-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "server-messages.h"
-#include "defaults.h"
-#include "default-args.h"
+#include <glusterfs/defaults.h>
+#include <glusterfs/default-args.h>
 #include "server-common.h"
-#include "xlator.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/compound-fop-utils.h>
 
 #include "xdr-nfs3.h"
 
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index a8908166c76..50c6c30d63f 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -14,12 +14,12 @@
 #include "server.h"
 #include "server-helpers.h"
 #include "glusterfs3-xdr.h"
-#include "call-stub.h"
-#include "statedump.h"
-#include "defaults.h"
+#include <glusterfs/call-stub.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/defaults.h>
 #include "authenticate.h"
-#include "gf-event.h"
-#include "events.h"
+#include <glusterfs/gf-event.h>
+#include <glusterfs/events.h>
 #include "server-messages.h"
 #include "rpc-clnt.h"
 #include "glusterfsd.h"
diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h
index a0e0a960c7c..2a77aba1f3c 100644
--- a/xlators/protocol/server/src/server.h
+++ b/xlators/protocol/server/src/server.h
@@ -13,17 +13,17 @@
 
 #include <pthread.h>
 
-#include "fd.h"
+#include <glusterfs/fd.h>
 #include "rpcsvc.h"
 
-#include "fd.h"
+#include <glusterfs/fd.h>
 #include "protocol-common.h"
 #include "server-mem-types.h"
 #include "glusterfs3.h"
-#include "timer.h"
-#include "client_t.h"
-#include "gidcache.h"
-#include "defaults.h"
+#include <glusterfs/timer.h>
+#include <glusterfs/client_t.h>
+#include <glusterfs/gidcache.h>
+#include <glusterfs/defaults.h>
 #include "authenticate.h"
 
 #define DEFAULT_BLOCK_SIZE 4194304 /* 4MB */