summaryrefslogtreecommitdiffstats
path: root/rpc/rpc-transport/rdma/src
diff options
context:
space:
mode:
authorShyamsundarR <srangana@redhat.com>2018-11-29 14:08:06 -0500
committerAmar Tumballi <amarts@redhat.com>2018-12-05 21:47:04 +0000
commit20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 (patch)
treef2e6af0f2ba7768e32cbf712149c0ffd5314f811 /rpc/rpc-transport/rdma/src
parentad446dabb88439ba83e2092021b09894351e8e71 (diff)
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>
Diffstat (limited to 'rpc/rpc-transport/rdma/src')
-rw-r--r--rpc/rpc-transport/rdma/src/name.c2
-rw-r--r--rpc/rpc-transport/rdma/src/name.h2
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.c12
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.h6
-rw-r--r--rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c
index d57f2d4f58d..47184d9f148 100644
--- a/rpc/rpc-transport/rdma/src/name.c
+++ b/rpc/rpc-transport/rdma/src/name.c
@@ -21,7 +21,7 @@
#include "rpc-transport.h"
#include "rdma.h"
-#include "common-utils.h"
+#include <glusterfs/common-utils.h>
#include "rpc-lib-messages.h"
#include "rpc-trans-rdma-messages.h"
diff --git a/rpc/rpc-transport/rdma/src/name.h b/rpc/rpc-transport/rdma/src/name.h
index 6c782b52db5..41c4c6a7e8e 100644
--- a/rpc/rpc-transport/rdma/src/name.h
+++ b/rpc/rpc-transport/rdma/src/name.h
@@ -13,7 +13,7 @@
#include <rdma/rdma_cma.h>
-#include "compat.h"
+#include <glusterfs/compat.h>
int32_t
gf_rdma_client_bind(rpc_transport_t *this, struct sockaddr *sockaddr,
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index ebf54885f1a..45605c8ff53 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -8,14 +8,14 @@
cases as published by the Free Software Foundation.
*/
-#include "dict.h"
-#include "glusterfs.h"
-#include "iobuf.h"
-#include "logging.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/iobuf.h>
+#include <glusterfs/logging.h>
#include "rdma.h"
#include "name.h"
-#include "byte-order.h"
-#include "xlator.h"
+#include <glusterfs/byte-order.h>
+#include <glusterfs/xlator.h>
#include "xdr-rpc.h"
#include "rpc-lib-messages.h"
#include "rpc-trans-rdma-messages.h"
diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h
index 84c1397054b..403f5678ad8 100644
--- a/rpc/rpc-transport/rdma/src/rdma.h
+++ b/rpc/rpc-transport/rdma/src/rdma.h
@@ -17,10 +17,10 @@
#include "rpc-clnt.h"
#include "rpc-transport.h"
-#include "xlator.h"
-#include "gf-event.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/gf-event.h>
#include <stdio.h>
-#include <list.h>
+#include <glusterfs/list.h>
#include <arpa/inet.h>
#include <infiniband/verbs.h>
#include <rdma/rdma_cma.h>
diff --git a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h
index 6e9ea9a2925..662a8980648 100644
--- a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h
+++ b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h
@@ -11,7 +11,7 @@
#ifndef _RPC_TRANS_RDMA_MESSAGES_H_
#define _RPC_TRANS_RDMA_MESSAGES_H_
-#include "glfs-message-id.h"
+#include <glusterfs/glfs-message-id.h>
/* To add new message IDs, append new identifiers at the end of the list.
*