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>

15 files changed, 100 insertions, 100 deletions

diff --git a/xlators/storage/posix/src/posix-aio.c b/xlators/storage/posix/src/posix-aio.c
index df32ffdd5c2..7ab38edf1b7 100644
--- a/xlators/storage/posix/src/posix-aio.c
+++ b/xlators/storage/posix/src/posix-aio.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 "glusterfs.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
 #include "posix.h"
 #include <sys/uio.h>
 #include "posix-messages.h"
diff --git a/xlators/storage/posix/src/posix-aio.h b/xlators/storage/posix/src/posix-aio.h
index 9b4a7078ecf..d2589bffc07 100644
--- a/xlators/storage/posix/src/posix-aio.h
+++ b/xlators/storage/posix/src/posix-aio.h
@@ -10,8 +10,8 @@
 #ifndef _POSIX_AIO_H
 #define _POSIX_AIO_H
 
-#include "xlator.h"
-#include "glusterfs.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
 
 // Maximum number of concurrently submitted IO events. The heaviest load
 // GlusterFS has been able to handle had 60-80 concurrent calls
diff --git a/xlators/storage/posix/src/posix-common.c b/xlators/storage/posix/src/posix-common.c
index 8eef765924a..573f2e0103b 100644
--- a/xlators/storage/posix/src/posix-common.c
+++ b/xlators/storage/posix/src/posix-common.c
@@ -36,30 +36,30 @@
 #include <fcntl.h>
 #endif /* HAVE_LINKAT */
 
-#include "glusterfs.h"
-#include "checksum.h"
-#include "dict.h"
-#include "logging.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/checksum.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/logging.h>
 #include "posix.h"
 #include "posix-inode-handle.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "common-utils.h"
-#include "compat-errno.h"
-#include "compat.h"
-#include "byte-order.h"
-#include "syscall.h"
-#include "statedump.h"
-#include "locking.h"
-#include "timer.h"
+#include <glusterfs/xlator.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/syscall.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/locking.h>
+#include <glusterfs/timer.h>
 #include "glusterfs3-xdr.h"
-#include "hashfn.h"
+#include <glusterfs/hashfn.h>
 #include "posix-aio.h"
-#include "glusterfs-acl.h"
+#include <glusterfs/glusterfs-acl.h>
 #include "posix-messages.h"
-#include "events.h"
+#include <glusterfs/events.h>
 #include "posix-gfid-path.h"
-#include "compat-uuid.h"
+#include <glusterfs/compat-uuid.h>
 
 extern char *marker_xattrs[];
 #define ALIGN_SIZE 4096
diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c
index 17fab3e6e9c..ffd36d2c714 100644
--- a/xlators/storage/posix/src/posix-entry-ops.c
+++ b/xlators/storage/posix/src/posix-entry-ops.c
@@ -36,32 +36,32 @@
 #include <fcntl.h>
 #endif /* HAVE_LINKAT */
 
-#include "glusterfs.h"
-#include "checksum.h"
-#include "dict.h"
-#include "logging.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/checksum.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/logging.h>
 #include "posix.h"
 #include "posix-handle.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "common-utils.h"
-#include "compat-errno.h"
-#include "compat.h"
-#include "byte-order.h"
-#include "syscall.h"
-#include "statedump.h"
-#include "locking.h"
-#include "timer.h"
+#include <glusterfs/xlator.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/syscall.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/locking.h>
+#include <glusterfs/timer.h>
 #include "glusterfs3-xdr.h"
-#include "hashfn.h"
+#include <glusterfs/hashfn.h>
 #include "posix-aio.h"
-#include "glusterfs-acl.h"
+#include <glusterfs/glusterfs-acl.h>
 #include "posix-messages.h"
 #include "posix-metadata.h"
-#include "events.h"
+#include <glusterfs/events.h>
 #include "posix-gfid-path.h"
-#include "compat-uuid.h"
-#include "syncop.h"
+#include <glusterfs/compat-uuid.h>
+#include <glusterfs/syncop.h>
 
 extern char *marker_xattrs[];
 #define ALIGN_SIZE 4096
diff --git a/xlators/storage/posix/src/posix-gfid-path.c b/xlators/storage/posix/src/posix-gfid-path.c
index de8b4d70c07..64b5c6c3f09 100644
--- a/xlators/storage/posix/src/posix-gfid-path.c
+++ b/xlators/storage/posix/src/posix-gfid-path.c
@@ -8,10 +8,10 @@
    cases as published by the Free Software Foundation.
 */
 
-#include "common-utils.h"
-#include "xlator.h"
-#include "syscall.h"
-#include "logging.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/logging.h>
 #include "posix-messages.h"
 #include "posix-mem-types.h"
 #include "posix-gfid-path.h"
diff --git a/xlators/storage/posix/src/posix-gfid-path.h b/xlators/storage/posix/src/posix-gfid-path.h
index 21f849dd276..323f11429a8 100644
--- a/xlators/storage/posix/src/posix-gfid-path.h
+++ b/xlators/storage/posix/src/posix-gfid-path.h
@@ -11,9 +11,9 @@
 #ifndef _POSIX_GFID_PATH_H
 #define _POSIX_GFID_PATH_H
 
-#include "xlator.h"
-#include "common-utils.h"
-#include "compat-errno.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/common-utils.h>
+#include <glusterfs/compat-errno.h>
 
 #define MAX_GFID2PATH_LINK_SUP 500
 
diff --git a/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c
index 5c50d413640..dac55e17118 100644
--- a/xlators/storage/posix/src/posix-handle.c
+++ b/xlators/storage/posix/src/posix-handle.c
@@ -16,16 +16,16 @@
 #include <alloca.h>
 #endif
 
-#include "common-utils.h"
+#include <glusterfs/common-utils.h>
 
 #include "posix-handle.h"
 #include "posix.h"
-#include "xlator.h"
-#include "syscall.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/syscall.h>
 #include "posix-messages.h"
 #include "posix-metadata.h"
 
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 
 int
 posix_handle_mkdir_hashes(xlator_t *this, const char *newpath);
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c
index fcd4b3ccf3f..8f76eacd8c4 100644
--- a/xlators/storage/posix/src/posix-helpers.c
+++ b/xlators/storage/posix/src/posix-helpers.c
@@ -33,29 +33,29 @@
 #endif /* GF_BSD_HOST_OS */
 
 #include <fnmatch.h>
-#include "glusterfs.h"
-#include "checksum.h"
-#include "dict.h"
-#include "logging.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/checksum.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/logging.h>
 #include "posix.h"
 #include "posix-messages.h"
 #include "posix-metadata.h"
 #include "posix-handle.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "common-utils.h"
-#include "compat-errno.h"
-#include "compat.h"
-#include "byte-order.h"
-#include "syscall.h"
-#include "statedump.h"
-#include "locking.h"
-#include "timer.h"
+#include <glusterfs/xlator.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/syscall.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/locking.h>
+#include <glusterfs/timer.h>
 #include "glusterfs3-xdr.h"
-#include "hashfn.h"
-#include "glusterfs-acl.h"
+#include <glusterfs/hashfn.h>
+#include <glusterfs/glusterfs-acl.h>
 #include "posix-gfid-path.h"
-#include "events.h"
+#include <glusterfs/events.h>
 #include "glusterfsd.h"
 #include <sys/types.h>
 
diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c
index 651569bf041..9e2b37f582c 100644
--- a/xlators/storage/posix/src/posix-inode-fd-ops.c
+++ b/xlators/storage/posix/src/posix-inode-fd-ops.c
@@ -37,30 +37,30 @@
 #include <fcntl.h>
 #endif /* HAVE_LINKAT */
 
-#include "glusterfs.h"
-#include "checksum.h"
-#include "dict.h"
-#include "logging.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/checksum.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/logging.h>
 #include "posix.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "common-utils.h"
-#include "compat-errno.h"
-#include "compat.h"
-#include "byte-order.h"
-#include "syscall.h"
-#include "statedump.h"
-#include "locking.h"
-#include "timer.h"
+#include <glusterfs/xlator.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/syscall.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/locking.h>
+#include <glusterfs/timer.h>
 #include "glusterfs3-xdr.h"
-#include "hashfn.h"
+#include <glusterfs/hashfn.h>
 #include "posix-aio.h"
-#include "glusterfs-acl.h"
+#include <glusterfs/glusterfs-acl.h>
 #include "posix-messages.h"
 #include "posix-metadata.h"
-#include "events.h"
+#include <glusterfs/events.h>
 #include "posix-gfid-path.h"
-#include "compat-uuid.h"
+#include <glusterfs/compat-uuid.h>
 
 extern char *marker_xattrs[];
 #define ALIGN_SIZE 4096
diff --git a/xlators/storage/posix/src/posix-inode-handle.h b/xlators/storage/posix/src/posix-inode-handle.h
index f225d94912b..2a4b6438150 100644
--- a/xlators/storage/posix/src/posix-inode-handle.h
+++ b/xlators/storage/posix/src/posix-inode-handle.h
@@ -12,8 +12,8 @@
 
 #include <limits.h>
 #include <sys/types.h>
-#include "xlator.h"
-#include "gf-dirent.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/gf-dirent.h>
 #include "posix.h"
 
 /* From Open Group Base Specifications Issue 6 */
diff --git a/xlators/storage/posix/src/posix-mem-types.h b/xlators/storage/posix/src/posix-mem-types.h
index 07b51db9543..2253f381ac5 100644
--- a/xlators/storage/posix/src/posix-mem-types.h
+++ b/xlators/storage/posix/src/posix-mem-types.h
@@ -10,7 +10,7 @@
 #ifndef __POSIX_MEM_TYPES_H__
 #define __POSIX_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_posix_mem_types_ {
     gf_posix_mt_posix_fd = gf_common_mt_end + 1,
diff --git a/xlators/storage/posix/src/posix-messages.h b/xlators/storage/posix/src/posix-messages.h
index 14167a5f829..62af32ac8fe 100644
--- a/xlators/storage/posix/src/posix-messages.h
+++ b/xlators/storage/posix/src/posix-messages.h
@@ -11,7 +11,7 @@
 #ifndef _POSIX_MESSAGES_H_
 #define _POSIX_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/storage/posix/src/posix-metadata.c b/xlators/storage/posix/src/posix-metadata.c
index 99b49ff4458..26fae2019b5 100644
--- a/xlators/storage/posix/src/posix-metadata.c
+++ b/xlators/storage/posix/src/posix-metadata.c
@@ -8,14 +8,14 @@
    cases as published by the Free Software Foundation.
 */
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "posix-metadata.h"
 #include "posix-metadata-disk.h"
 #include "posix-handle.h"
 #include "posix-messages.h"
-#include "syscall.h"
-#include "compat-errno.h"
-#include "compat.h"
+#include <glusterfs/syscall.h>
+#include <glusterfs/compat-errno.h>
+#include <glusterfs/compat.h>
 
 static int gf_posix_xattr_enotsup_log;
 
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 61aa14d2827..7aa9d5026ba 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -14,7 +14,7 @@
 #define _GNU_SOURCE
 #endif
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "posix.h"
 
 class_methods_t class_methods = {.init = posix_init,
diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h
index a61758ef8f6..1f1d4fc2774 100644
--- a/xlators/storage/posix/src/posix.h
+++ b/xlators/storage/posix/src/posix.h
@@ -32,12 +32,12 @@
 #include <sys/extattr.h>
 #endif
 
-#include "xlator.h"
-#include "compat.h"
-#include "timer.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/timer.h>
 #include "posix-mem-types.h"
 #include "posix-handle.h"
-#include "call-stub.h"
+#include <glusterfs/call-stub.h>
 
 #ifdef HAVE_LIBAIO
 #include <libaio.h>