diff options
Diffstat (limited to 'rpc')
44 files changed, 106 insertions, 106 deletions
diff --git a/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c index d569a0403f8..fe5fe030767 100644 --- a/rpc/rpc-lib/src/auth-glusterfs.c +++ b/rpc/rpc-lib/src/auth-glusterfs.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> #include "xdr-rpc.h" #include "xdr-common.h" #include "rpc-common-xdr.h" diff --git a/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c index 46046e8e440..820a2c03953 100644 --- a/rpc/rpc-lib/src/auth-null.c +++ b/rpc/rpc-lib/src/auth-null.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> int auth_null_request_init(rpcsvc_request_t *req, void *priv) diff --git a/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c index c53870fcf94..cacb1ff8008 100644 --- a/rpc/rpc-lib/src/auth-unix.c +++ b/rpc/rpc-lib/src/auth-unix.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "list.h" -#include "dict.h" +#include <glusterfs/list.h> +#include <glusterfs/dict.h> #include "xdr-rpc.h" int diff --git a/rpc/rpc-lib/src/autoscale-threads.c b/rpc/rpc-lib/src/autoscale-threads.c index d629a1cd430..2c53ebbf40e 100644 --- a/rpc/rpc-lib/src/autoscale-threads.c +++ b/rpc/rpc-lib/src/autoscale-threads.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpcsvc.h" void diff --git a/rpc/rpc-lib/src/mgmt-pmap.c b/rpc/rpc-lib/src/mgmt-pmap.c index 344ec56bbf7..ccb56a479c4 100644 --- a/rpc/rpc-lib/src/mgmt-pmap.c +++ b/rpc/rpc-lib/src/mgmt-pmap.c @@ -12,7 +12,7 @@ #include "protocol-common.h" #include "rpc-clnt.h" #include "xdr-generic.h" -#include "xlator.h" +#include <glusterfs/xlator.h> /* Defining a minimal RPC client program for portmap signout */ diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.c b/rpc/rpc-lib/src/rpc-clnt-ping.c index 7c2026f9086..2298ef6394f 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.c +++ b/rpc/rpc-lib/src/rpc-clnt-ping.c @@ -10,14 +10,14 @@ #include "rpc-clnt.h" #include "rpc-clnt-ping.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "xdr-rpcclnt.h" #include "rpc-transport.h" #include "protocol-common.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "rpc-common-xdr.h" -#include "timespec.h" +#include <glusterfs/timespec.h> char *clnt_ping_procs[GF_DUMP_MAXVALUE] = { [GF_DUMP_PING] = "NULL", diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index b26d645bb12..eb69ed7c6e7 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -12,11 +12,11 @@ #include "rpc-clnt.h" #include "rpc-clnt-ping.h" -#include "byte-order.h" +#include <glusterfs/byte-order.h> #include "xdr-rpcclnt.h" #include "rpc-transport.h" #include "protocol-common.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "rpc-common-xdr.h" diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h index d80df7f8b96..d16cc40aefe 100644 --- a/rpc/rpc-lib/src/rpc-clnt.h +++ b/rpc/rpc-lib/src/rpc-clnt.h @@ -11,9 +11,9 @@ #ifndef __RPC_CLNT_H #define __RPC_CLNT_H -#include "stack.h" +#include <glusterfs/stack.h> #include "rpc-transport.h" -#include "timer.h" +#include <glusterfs/timer.h> #include "xdr-common.h" #include "glusterfs3.h" diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c index 50013776c86..e2a448fa640 100644 --- a/rpc/rpc-lib/src/rpc-drc.c +++ b/rpc/rpc-lib/src/rpc-drc.c @@ -12,11 +12,11 @@ #ifndef RPC_DRC_H #include "rpc-drc.h" #endif -#include "locking.h" -#include "hashfn.h" -#include "common-utils.h" -#include "statedump.h" -#include "mem-pool.h" +#include <glusterfs/locking.h> +#include <glusterfs/hashfn.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/statedump.h> +#include <glusterfs/mem-pool.h> #include <netinet/in.h> #include <unistd.h> diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h index 89b7c87e756..6aaede0828a 100644 --- a/rpc/rpc-lib/src/rpc-drc.h +++ b/rpc/rpc-lib/src/rpc-drc.h @@ -13,8 +13,8 @@ #include "rpcsvc-common.h" #include "rpcsvc.h" -#include "locking.h" -#include "dict.h" +#include <glusterfs/locking.h> +#include <glusterfs/dict.h> #include "rb.h" /* per-client cache structure */ diff --git a/rpc/rpc-lib/src/rpc-lib-messages.h b/rpc/rpc-lib/src/rpc-lib-messages.h index 9251578a121..2c0b820dbf9 100644 --- a/rpc/rpc-lib/src/rpc-lib-messages.h +++ b/rpc/rpc-lib/src/rpc-lib-messages.h @@ -11,7 +11,7 @@ #ifndef _RPC_LIB_MESSAGES_H_ #define _RPC_LIB_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/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 7e70b5dfdb1..0c9291380be 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -15,14 +15,14 @@ #include <fnmatch.h> #include <stdint.h> -#include "logging.h" +#include <glusterfs/logging.h> #include "rpc-transport.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> /* FIXME: xlator.h is needed for volume_option_t, need to define the datatype * in some other header */ -#include "xlator.h" -#include "list.h" +#include <glusterfs/xlator.h> +#include <glusterfs/list.h> #ifndef GF_OPTION_LIST_EMPTY #define GF_OPTION_LIST_EMPTY(_opt) (_opt->value[0] == NULL) diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index d7b86b63748..18412cc85f7 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -56,8 +56,8 @@ struct rpc_transport_ops; typedef struct rpc_transport rpc_transport_t; -#include "dict.h" -#include "compat.h" +#include <glusterfs/dict.h> +#include <glusterfs/compat.h> #include "rpcsvc-common.h" struct peer_info { diff --git a/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c index 7c45c9b2a97..18e6a133ebe 100644 --- a/rpc/rpc-lib/src/rpcsvc-auth.c +++ b/rpc/rpc-lib/src/rpcsvc-auth.c @@ -9,8 +9,8 @@ */ #include "rpcsvc.h" -#include "logging.h" -#include "dict.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> extern rpcsvc_auth_t * rpcsvc_auth_null_init(rpcsvc_t *svc, dict_t *options); diff --git a/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h index 361f31c27f2..d19b2d3f34c 100644 --- a/rpc/rpc-lib/src/rpcsvc-common.h +++ b/rpc/rpc-lib/src/rpcsvc-common.h @@ -12,11 +12,11 @@ #define _RPCSVC_COMMON_H #include <pthread.h> -#include "list.h" -#include "compat.h" -#include "glusterfs.h" -#include "dict.h" -#include "xlator.h" +#include <glusterfs/list.h> +#include <glusterfs/compat.h> +#include <glusterfs/glusterfs.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> typedef enum { RPCSVC_EVENT_ACCEPT, diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index fd531fbc1ee..0a80bb179c2 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -10,19 +10,19 @@ #include "rpcsvc.h" #include "rpc-transport.h" -#include "dict.h" -#include "logging.h" -#include "byte-order.h" -#include "common-utils.h" -#include "compat-errno.h" -#include "list.h" +#include <glusterfs/dict.h> +#include <glusterfs/logging.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> +#include <glusterfs/list.h> #include "xdr-rpc.h" -#include "iobuf.h" -#include "globals.h" +#include <glusterfs/iobuf.h> +#include <glusterfs/globals.h> #include "xdr-common.h" #include "xdr-generic.h" #include "rpc-common-xdr.h" -#include "syncop.h" +#include <glusterfs/syncop.h> #include "rpc-drc.h" #include "protocol-common.h" @@ -44,7 +44,7 @@ #endif #include "xdr-rpcclnt.h" -#include "glusterfs-acl.h" +#include <glusterfs/glusterfs-acl.h> struct rpcsvc_program gluster_dump_prog; diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index 3e25ef3a8e9..34045ce8a44 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -11,23 +11,23 @@ #ifndef _RPCSVC_H #define _RPCSVC_H -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpc-transport.h" -#include "logging.h" -#include "dict.h" -#include "mem-pool.h" -#include "list.h" -#include "iobuf.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/mem-pool.h> +#include <glusterfs/list.h> +#include <glusterfs/iobuf.h> #include "xdr-rpc.h" -#include "glusterfs.h" -#include "xlator.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> #include "rpcsvc-common.h" #include <pthread.h> #include <sys/uio.h> #include <inttypes.h> #include <rpc/rpc_msg.h> -#include "compat.h" +#include <glusterfs/compat.h> #ifndef MAX_IOVEC #define MAX_IOVEC 16 diff --git a/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c index 36fd9db1a97..2cf39a8bdfc 100644 --- a/rpc/rpc-lib/src/xdr-rpc.c +++ b/rpc/rpc-lib/src/xdr-rpc.c @@ -15,11 +15,11 @@ #include <sys/uio.h> #include <rpc/auth_unix.h> -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "xdr-common.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> /* Decodes the XDR format in msgbuf into rpc_msg. * The remaining payload is returned into payload. diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c index 9e60d19e7a2..8175cd00c3a 100644 --- a/rpc/rpc-lib/src/xdr-rpcclnt.c +++ b/rpc/rpc-lib/src/xdr-rpcclnt.c @@ -16,11 +16,11 @@ #include <rpc/auth_unix.h> #include <errno.h> -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-rpc.h" #include "xdr-common.h" -#include "logging.h" -#include "common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/common-utils.h> /* Decodes the XDR format in msgbuf into rpc_msg. * The remaining payload is returned into payload. 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. * diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 1f866ccdecf..ca14402ed4a 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -21,7 +21,7 @@ #include "rpc-transport.h" #include "socket.h" -#include "common-utils.h" +#include <glusterfs/common-utils.h> static void _assign_port(struct sockaddr *sockaddr, uint16_t port) diff --git a/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h index 85f8bb7040b..080c7588f5a 100644 --- a/rpc/rpc-transport/socket/src/name.h +++ b/rpc/rpc-transport/socket/src/name.h @@ -11,7 +11,7 @@ #ifndef _SOCKET_NAME_H #define _SOCKET_NAME_H -#include "compat.h" +#include <glusterfs/compat.h> int32_t client_bind(rpc_transport_t *this, struct sockaddr *sockaddr, diff --git a/rpc/rpc-transport/socket/src/socket-mem-types.h b/rpc/rpc-transport/socket/src/socket-mem-types.h index edf3ed0c6f1..241ce67f670 100644 --- a/rpc/rpc-transport/socket/src/socket-mem-types.h +++ b/rpc/rpc-transport/socket/src/socket-mem-types.h @@ -11,7 +11,7 @@ #ifndef __SOCKET_MEM_TYPES_H__ #define __SOCKET_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> typedef enum gf_sock_mem_types_ { gf_sock_connect_error_state_t = gf_common_mt_end + 1, diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 776e647d4f6..38e52081b3c 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -10,16 +10,16 @@ #include "socket.h" #include "name.h" -#include "dict.h" +#include <glusterfs/dict.h> #include "rpc-transport.h" -#include "logging.h" -#include "xlator.h" -#include "syscall.h" -#include "byte-order.h" -#include "common-utils.h" -#include "compat-errno.h" +#include <glusterfs/logging.h> +#include <glusterfs/xlator.h> +#include <glusterfs/syscall.h> +#include <glusterfs/byte-order.h> +#include <glusterfs/common-utils.h> +#include <glusterfs/compat-errno.h> #include "socket-mem-types.h" -#include "timer.h" +#include <glusterfs/timer.h> /* ugly #includes below */ #include "protocol-common.h" diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index f1bfba45076..9cbb2a89a22 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -21,13 +21,13 @@ #include <openssl/ecdh.h> #endif -#include "gf-event.h" +#include <glusterfs/gf-event.h> #include "rpc-transport.h" -#include "logging.h" -#include "dict.h" -#include "mem-pool.h" -#include "globals.h" -#include "refcount.h" +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/mem-pool.h> +#include <glusterfs/globals.h> +#include <glusterfs/refcount.h> #ifndef MAX_IOVEC #define MAX_IOVEC 16 diff --git a/rpc/xdr/src/acl3-xdr.x b/rpc/xdr/src/acl3-xdr.x index 44f1ed4fac9..7f7364971e6 100644 --- a/rpc/xdr/src/acl3-xdr.x +++ b/rpc/xdr/src/acl3-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "xdr-nfs3.h" struct aclentry { diff --git a/rpc/xdr/src/changelog-xdr.x b/rpc/xdr/src/changelog-xdr.x index 97cd4558ccb..5956245d5ce 100644 --- a/rpc/xdr/src/changelog-xdr.x +++ b/rpc/xdr/src/changelog-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* XDR: libgfchangelog -> changelog */ diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 6f5fd256954..a32c8645708 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> enum gf_cli_defrag_type { GF_DEFRAG_CMD_NONE = 0, diff --git a/rpc/xdr/src/glusterd1-xdr.x b/rpc/xdr/src/glusterd1-xdr.x index 1ce57392b5b..9b36d34378a 100644 --- a/rpc/xdr/src/glusterd1-xdr.x +++ b/rpc/xdr/src/glusterd1-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> enum glusterd_volume_status { GLUSTERD_STATUS_NONE = 0, diff --git a/rpc/xdr/src/glusterfs-fops.x b/rpc/xdr/src/glusterfs-fops.x index 8ccc4658f6c..ffb71d6418a 100644 --- a/rpc/xdr/src/glusterfs-fops.x +++ b/rpc/xdr/src/glusterfs-fops.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* NOTE: add members ONLY at the end (just before _MAXVALUE) */ /* diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x index c253db5de5b..5e598869801 100644 --- a/rpc/xdr/src/glusterfs3-xdr.x +++ b/rpc/xdr/src/glusterfs3-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "rpc-common-xdr.h" %#include "glusterfs-fops.h" diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h index b8ef394abaf..6e5de623457 100644 --- a/rpc/xdr/src/glusterfs3.h +++ b/rpc/xdr/src/glusterfs3.h @@ -16,9 +16,9 @@ #include "xdr-generic.h" #include "glusterfs3-xdr.h" #include "glusterfs4-xdr.h" -#include "iatt.h" +#include <glusterfs/iatt.h> #include "protocol-common.h" -#include "upcall-utils.h" +#include <glusterfs/upcall-utils.h> #define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) #define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) diff --git a/rpc/xdr/src/glusterfs4-xdr.x b/rpc/xdr/src/glusterfs4-xdr.x index 5ee86c24a0b..c183dbcd704 100644 --- a/rpc/xdr/src/glusterfs4-xdr.x +++ b/rpc/xdr/src/glusterfs4-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> %#include "glusterfs-fops.h" %#include "glusterfs3-xdr.h" diff --git a/rpc/xdr/src/mount3udp.x b/rpc/xdr/src/mount3udp.x index 4fafaa053f8..e8366df400c 100644 --- a/rpc/xdr/src/mount3udp.x +++ b/rpc/xdr/src/mount3udp.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* This is used by rpcgen to auto generate the rpc stubs. * mount3udp_svc.c is heavily modified though diff --git a/rpc/xdr/src/nlm4-xdr.x b/rpc/xdr/src/nlm4-xdr.x index 0fb3a5945a1..847b0e64491 100644 --- a/rpc/xdr/src/nlm4-xdr.x +++ b/rpc/xdr/src/nlm4-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* .x file defined as according to the RFC */ diff --git a/rpc/xdr/src/nsm-xdr.x b/rpc/xdr/src/nsm-xdr.x index 65b36b27d31..7c16a741f1d 100644 --- a/rpc/xdr/src/nsm-xdr.x +++ b/rpc/xdr/src/nsm-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* * This defines the maximum length of the string diff --git a/rpc/xdr/src/portmap-xdr.x b/rpc/xdr/src/portmap-xdr.x index e360911bc07..23515572b9f 100644 --- a/rpc/xdr/src/portmap-xdr.x +++ b/rpc/xdr/src/portmap-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> struct pmap_port_by_brick_req { string brick<>; diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x index b01d282f368..760d1e0aedc 100644 --- a/rpc/xdr/src/rpc-common-xdr.x +++ b/rpc/xdr/src/rpc-common-xdr.x @@ -11,7 +11,7 @@ #ifdef RPC_XDR %#include "rpc-pragmas.h" #endif -%#include "compat.h" +%#include <glusterfs/compat.h> /* This file has definition of few XDR structures which are * not captured in any section specific file */ diff --git a/rpc/xdr/src/xdr-generic.h b/rpc/xdr/src/xdr-generic.h index 367ef555dd3..794dda508cc 100644 --- a/rpc/xdr/src/xdr-generic.h +++ b/rpc/xdr/src/xdr-generic.h @@ -15,7 +15,7 @@ #include <rpc/types.h> #include <rpc/xdr.h> -#include "compat.h" +#include <glusterfs/compat.h> #define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) #define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) diff --git a/rpc/xdr/src/xdr-nfs3.c b/rpc/xdr/src/xdr-nfs3.c index aca9a299b0e..cfccaaa89b8 100644 --- a/rpc/xdr/src/xdr-nfs3.c +++ b/rpc/xdr/src/xdr-nfs3.c @@ -23,7 +23,7 @@ #endif #include "xdr-nfs3.h" -#include "mem-pool.h" +#include <glusterfs/mem-pool.h> #include "xdr-common.h" bool_t |