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>

6 files changed, 16 insertions, 16 deletions

diff --git a/xlators/storage/bd/src/bd-aio.c b/xlators/storage/bd/src/bd-aio.c
index 6bc7d4a104c..db73dc8978c 100644
--- a/xlators/storage/bd/src/bd-aio.c
+++ b/xlators/storage/bd/src/bd-aio.c
@@ -16,9 +16,9 @@
 #include <lvm2app.h>
 #include <sys/uio.h>
 
-#include "xlator.h"
-#include "glusterfs.h"
-#include "defaults.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/defaults.h>
 #include "bd.h"
 #include "bd-aio.h"
 
diff --git a/xlators/storage/bd/src/bd-aio.h b/xlators/storage/bd/src/bd-aio.h
index 1332622050d..23457673383 100644
--- a/xlators/storage/bd/src/bd-aio.h
+++ b/xlators/storage/bd/src/bd-aio.h
@@ -11,8 +11,8 @@
 #ifndef _BD_AIO_H
 #define _BD_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
diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c
index c6891749008..74c979ace00 100644
--- a/xlators/storage/bd/src/bd-helper.c
+++ b/xlators/storage/bd/src/bd-helper.c
@@ -6,9 +6,9 @@
 #include <sys/ioctl.h>
 #include "bd.h"
 #include "bd-mem-types.h"
-#include "run.h"
-#include "lvm-defaults.h"
-#include "syscall.h"
+#include <glusterfs/run.h>
+#include <glusterfs/lvm-defaults.h>
+#include <glusterfs/syscall.h>
 
 int
 bd_inode_ctx_set(inode_t *inode, xlator_t *this, bd_attr_t *ctx)
diff --git a/xlators/storage/bd/src/bd-mem-types.h b/xlators/storage/bd/src/bd-mem-types.h
index a63df819754..5cdbd6938e1 100644
--- a/xlators/storage/bd/src/bd-mem-types.h
+++ b/xlators/storage/bd/src/bd-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __BD_MEM_TYPES_H__
 #define __BD_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_bd_mem_types_ {
     gf_bd_private = gf_common_mt_end + 1,
diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c
index 0a29a99181b..3d1fa1b6b14 100644
--- a/xlators/storage/bd/src/bd.c
+++ b/xlators/storage/bd/src/bd.c
@@ -29,13 +29,13 @@
 #include "bd.h"
 #include "bd-aio.h"
 #include "bd-mem-types.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "glusterfs3-xdr.h"
-#include "run.h"
+#include <glusterfs/run.h>
 #include "protocol-common.h"
-#include "checksum.h"
-#include "syscall.h"
-#include "lvm-defaults.h"
+#include <glusterfs/checksum.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/lvm-defaults.h>
 
 /*
  * Call back function for setxattr and removexattr.
diff --git a/xlators/storage/bd/src/bd.h b/xlators/storage/bd/src/bd.h
index 769affbb70c..f73781a0fe6 100644
--- a/xlators/storage/bd/src/bd.h
+++ b/xlators/storage/bd/src/bd.h
@@ -22,8 +22,8 @@
 #include <libaio.h>
 #endif
 
-#include "xlator.h"
-#include "mem-types.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/mem-types.h>
 
 #define BD_XLATOR "block device mapper xlator"
 #define BACKEND_VG "vg"