diff options
394 files changed, 1 insertions, 1950 deletions
diff --git a/api/src/gfapi-messages.h b/api/src/gfapi-messages.h index 2c59af2411..4c9b3f6622 100644 --- a/api/src/gfapi-messages.h +++ b/api/src/gfapi-messages.h @@ -11,11 +11,6 @@ #ifndef _GFAPI_MESSAGES_H__ #define _GFAPI_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file gfapi-messages.h diff --git a/api/src/glfs-master.c b/api/src/glfs-master.c index 11843c15b4..bb65769548 100644 --- a/api/src/glfs-master.c +++ b/api/src/glfs-master.c @@ -15,11 +15,6 @@ #include <inttypes.h> #include <limits.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c index 2159d6795a..d69c3fc188 100644 --- a/api/src/glfs-mgmt.c +++ b/api/src/glfs-mgmt.c @@ -16,11 +16,6 @@ #include <signal.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif /* _CONFIG_H */ - #include "glusterfs.h" #include "glfs.h" #include "stack.h" diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index 60e285d3ae..287c48a13a 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -16,11 +16,6 @@ #include <inttypes.h> #include <limits.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "stack.h" diff --git a/api/src/glfs.c b/api/src/glfs.c index 5653f4d46c..fc392947e1 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -33,11 +33,6 @@ #include <unistd.h> #include <limits.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "stack.h" diff --git a/cli/src/cli-cmd-global.c b/cli/src/cli-cmd-global.c index 9b71821b00..3c526f8a82 100644 --- a/cli/src/cli-cmd-global.c +++ b/cli/src/cli-cmd-global.c @@ -19,11 +19,6 @@ #include <sys/wait.h> #include <netinet/in.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd-misc.c b/cli/src/cli-cmd-misc.c index ccfeb6d87f..9f8c159f07 100644 --- a/cli/src/cli-cmd-misc.c +++ b/cli/src/cli-cmd-misc.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 2390822e5d..03b5d938d9 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c index 551312411a..1fe84b3ebc 100644 --- a/cli/src/cli-cmd-peer.c +++ b/cli/src/cli-cmd-peer.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd-snapshot.c b/cli/src/cli-cmd-snapshot.c index 2716dd094a..80ab2b0f21 100644 --- a/cli/src/cli-cmd-snapshot.c +++ b/cli/src/cli-cmd-snapshot.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c index 690a104183..d71f622ba1 100644 --- a/cli/src/cli-cmd-system.c +++ b/cli/src/cli-cmd-system.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index da6603cc1f..3ce8839492 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -19,11 +19,6 @@ #include <sys/wait.h> #include <netinet/in.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 5ea1edc9ca..99448fcae5 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-cmd.h b/cli/src/cli-cmd.h index 94fa3e9c67..9a4426a3a7 100644 --- a/cli/src/cli-cmd.h +++ b/cli/src/cli-cmd.h @@ -10,11 +10,6 @@ #ifndef __CLI_CMD_H__ #define __CLI_CMD_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <netdb.h> #include "cli.h" diff --git a/cli/src/cli-quotad-client.c b/cli/src/cli-quotad-client.c index 7c1651936c..d00dfac6e6 100644 --- a/cli/src/cli-quotad-client.c +++ b/cli/src/cli-quotad-client.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli-quotad-client.h" diff --git a/cli/src/cli-rl.c b/cli/src/cli-rl.c index ade1c8ebb3..bca37d9c50 100644 --- a/cli/src/cli-rl.c +++ b/cli/src/cli-rl.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 290028f651..8aca451fec 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* Widths of various columns in top read/write-perf output * Total width of top read/write-perf should be 80 chars * including one space between column diff --git a/cli/src/cli.c b/cli/src/cli.c index 525ec4bab7..4f4813bae7 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -29,11 +29,6 @@ #include <semaphore.h> #include <errno.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/cli/src/cli.h b/cli/src/cli.h index c9283b5b87..be9fd96180 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -10,11 +10,6 @@ #ifndef __CLI_H__ #define __CLI_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpc-clnt.h" #include "glusterfs.h" #include "protocol-common.h" diff --git a/cli/src/input.c b/cli/src/input.c index 26f337c3c2..10fc39cd6b 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -13,11 +13,6 @@ #include <stdint.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "cli.h" #include "cli-mem-types.h" diff --git a/cli/src/registry.c b/cli/src/registry.c index c4abe3be0b..1adf7d6e57 100644 --- a/cli/src/registry.c +++ b/cli/src/registry.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/configure.ac b/configure.ac index 1a09854224..e70e1c3b6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1257,7 +1257,7 @@ CONTRIBDIR='$(top_srcdir)/contrib' AC_SUBST(CONTRIBDIR) GF_CPPDEFINES='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)' -GF_CPPINCLUDES='-I$(top_srcdir)/libglusterfs/src' +GF_CPPINCLUDES='-include $(top_builddir)/config.h -I$(top_srcdir)/libglusterfs/src' GF_CPPFLAGS="$GF_CPPFLAGS $GF_CPPDEFINES $GF_CPPINCLUDES" AC_SUBST([GF_CPPFLAGS]) diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c index ce900b0a3e..7f1365a49d 100644 --- a/geo-replication/src/gsyncd.c +++ b/geo-replication/src/gsyncd.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/geo-replication/src/procdiggy.c b/geo-replication/src/procdiggy.c index 1eba414c11..d9253bbb89 100644 --- a/geo-replication/src/procdiggy.c +++ b/geo-replication/src/procdiggy.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h index ba3b7a5873..1e47380f4c 100644 --- a/glusterfsd/src/glusterfsd-messages.h +++ b/glusterfsd/src/glusterfsd-messages.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERFSD_MESSAGES_H_ #define _GLUSTERFSD_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /* NOTE: Rules for message additions diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 1cff44be4d..4a84ae56a4 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -13,11 +13,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif /* _CONFIG_H */ - #include "glusterfs.h" #include "stack.h" #include "dict.h" diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 61ae4e497f..b772caa665 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -32,11 +32,6 @@ #include <errno.h> #include <pwd.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index d183b0507f..f439cef159 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -10,10 +10,6 @@ #ifndef __GLUSTERFSD_H__ #define __GLUSTERFSD_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include "rpcsvc.h" #include "glusterd1-xdr.h" diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c index 128dcf9e15..911ea33490 100644 --- a/libglusterfs/src/call-stub.c +++ b/libglusterfs/src/call-stub.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <openssl/md5.h> #include <inttypes.h> diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/call-stub.h index 954338be91..af4a2f55af 100644 --- a/libglusterfs/src/call-stub.h +++ b/libglusterfs/src/call-stub.h @@ -11,11 +11,6 @@ #ifndef _CALL_STUB_H_ #define _CALL_STUB_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "stack.h" diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c index 84257e66b0..9e6c90eba4 100644 --- a/libglusterfs/src/client_t.c +++ b/libglusterfs/src/client_t.c @@ -16,11 +16,6 @@ #include "rpcsvc.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - static int gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx, uint32_t endcount) diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/client_t.h index 64c0514c8a..bfea62061b 100644 --- a/libglusterfs/src/client_t.h +++ b/libglusterfs/src/client_t.h @@ -11,11 +11,6 @@ #ifndef _CLIENT_T_H #define _CLIENT_T_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "locking.h" /* for gf_lock_t, not included by glusterfs.h */ diff --git a/libglusterfs/src/cluster-syncop.h b/libglusterfs/src/cluster-syncop.h index a681951c27..3712259c65 100644 --- a/libglusterfs/src/cluster-syncop.h +++ b/libglusterfs/src/cluster-syncop.h @@ -12,11 +12,6 @@ #ifndef _CLUSTER_SYNCOP_H #define _CLUSTER_SYNCOP_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include <sys/time.h> #include <pthread.h> diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 4bcef6ae33..bda336e348 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_BACKTRACE #include <execinfo.h> #else diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index c361405d5e..6691259f51 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -11,11 +11,6 @@ #ifndef _COMMON_UTILS_H #define _COMMON_UTILS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdint.h> #include <sys/uio.h> #include <netdb.h> diff --git a/libglusterfs/src/compat-errno.c b/libglusterfs/src/compat-errno.c index d8ab82a5d2..3674596ad7 100644 --- a/libglusterfs/src/compat-errno.c +++ b/libglusterfs/src/compat-errno.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdint.h> #include "compat-errno.h" diff --git a/libglusterfs/src/compat-errno.h b/libglusterfs/src/compat-errno.h index 65e52081dd..6f46157e69 100644 --- a/libglusterfs/src/compat-errno.h +++ b/libglusterfs/src/compat-errno.h @@ -11,11 +11,6 @@ #ifndef __COMPAT_ERRNO_H__ #define __COMPAT_ERRNO_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <errno.h> #define GF_ERROR_CODE_SUCCESS 0 diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c index 93e7b45a69..0538a3298c 100644 --- a/libglusterfs/src/compat.c +++ b/libglusterfs/src/compat.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <string.h> #include <stdlib.h> #include <unistd.h> diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h index 1522257dff..458a751c2f 100644 --- a/libglusterfs/src/compat.h +++ b/libglusterfs/src/compat.h @@ -11,11 +11,6 @@ #ifndef __COMPAT_H__ #define __COMPAT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdint.h> #include "dict.h" diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c index aa9d4216fd..c70d97bc5d 100644 --- a/libglusterfs/src/ctx.c +++ b/libglusterfs/src/ctx.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif /* !_CONFIG_H */ - #include <pthread.h> #include "globals.h" diff --git a/libglusterfs/src/daemon.h b/libglusterfs/src/daemon.h index 80836a326d..95e134b78b 100644 --- a/libglusterfs/src/daemon.h +++ b/libglusterfs/src/daemon.h @@ -11,11 +11,6 @@ #ifndef _DAEMON_H #define _DAEMON_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define DEVNULLPATH "/dev/null" int os_daemon_return(int nochdir, int noclose); diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c index 1414da9073..b7174c8a93 100644 --- a/libglusterfs/src/defaults.c +++ b/libglusterfs/src/defaults.c @@ -20,11 +20,6 @@ All the functions are plain enough to understand. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h index a4ec762540..68d23974b3 100644 --- a/libglusterfs/src/defaults.h +++ b/libglusterfs/src/defaults.h @@ -15,11 +15,6 @@ #ifndef _DEFAULTS_H #define _DEFAULTS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" typedef struct { diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index ffc92e7272..23e25b16ed 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -16,11 +16,6 @@ #include <limits.h> #include <fnmatch.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "common-utils.h" #include "dict.h" diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h index a9004e96a5..46cb2a3ca5 100644 --- a/libglusterfs/src/dict.h +++ b/libglusterfs/src/dict.h @@ -11,11 +11,6 @@ #ifndef _DICT_H #define _DICT_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #include <sys/uio.h> #include <pthread.h> diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c index 92420f3734..9703fdc0f3 100644 --- a/libglusterfs/src/event-epoll.c +++ b/libglusterfs/src/event-epoll.c @@ -21,11 +21,6 @@ #include "mem-pool.h" #include "common-utils.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_SYS_EPOLL_H #include <sys/epoll.h> diff --git a/libglusterfs/src/event-history.h b/libglusterfs/src/event-history.h index b64f63b5eb..de5d47cdfe 100644 --- a/libglusterfs/src/event-history.h +++ b/libglusterfs/src/event-history.h @@ -11,11 +11,6 @@ #ifndef _EH_H #define _EH_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "mem-types.h" #include "circ-buff.h" diff --git a/libglusterfs/src/event-poll.c b/libglusterfs/src/event-poll.c index 0daceb0d5a..b32d38f6aa 100644 --- a/libglusterfs/src/event-poll.c +++ b/libglusterfs/src/event-poll.c @@ -21,11 +21,6 @@ #include "mem-pool.h" #include "common-utils.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - struct event_slot_poll { diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c index 35564e46ea..ab93f6c1f1 100644 --- a/libglusterfs/src/event.c +++ b/libglusterfs/src/event.c @@ -21,11 +21,6 @@ #include "mem-pool.h" #include "common-utils.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - struct event_pool * diff --git a/libglusterfs/src/event.h b/libglusterfs/src/event.h index eac57bc01a..b01ef24bb8 100644 --- a/libglusterfs/src/event.h +++ b/libglusterfs/src/event.h @@ -11,11 +11,6 @@ #ifndef _EVENT_H_ #define _EVENT_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> struct event_pool; diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index 613f9017b0..1a191f340e 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -15,11 +15,6 @@ #include "statedump.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - static int gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr); diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h index c1b9157d88..5a98ec38ca 100644 --- a/libglusterfs/src/fd.h +++ b/libglusterfs/src/fd.h @@ -11,11 +11,6 @@ #ifndef _FD_H #define _FD_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "list.h" #include <sys/types.h> #include <unistd.h> diff --git a/libglusterfs/src/gf-dirent.c b/libglusterfs/src/gf-dirent.c index 99c0eb6441..c602d08b27 100644 --- a/libglusterfs/src/gf-dirent.c +++ b/libglusterfs/src/gf-dirent.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <string.h> diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h index faeaf41194..098a66ace1 100644 --- a/libglusterfs/src/gf-dirent.h +++ b/libglusterfs/src/gf-dirent.h @@ -12,11 +12,6 @@ #ifndef _GF_DIRENT_H #define _GF_DIRENT_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "iatt.h" #include "inode.h" diff --git a/libglusterfs/src/gfdb/gfdb_data_store.h b/libglusterfs/src/gfdb/gfdb_data_store.h index 977794df5c..57f3de18f1 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store.h +++ b/libglusterfs/src/gfdb/gfdb_data_store.h @@ -11,11 +11,6 @@ #define __GFDB_DATA_STORE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/libglusterfs/src/gfdb/gfdb_data_store_types.h b/libglusterfs/src/gfdb/gfdb_data_store_types.h index 72a1c89a74..5f6650dd91 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_types.h +++ b/libglusterfs/src/gfdb/gfdb_data_store_types.h @@ -11,11 +11,6 @@ #define __GFDB_DATA_STORE_TYPE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <time.h> #include <sys/time.h> #include <string.h> diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.h b/libglusterfs/src/gfdb/gfdb_sqlite3.h index 04bfde7fa3..5b6921eafe 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.h +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.h @@ -11,11 +11,6 @@ #define __GFDB_SQLITE3_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /*Sqlite3 header file*/ #include <sqlite3.h> diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h index 8b62be1d4d..0d222305d0 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h +++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.h @@ -11,11 +11,6 @@ #define __GFDB_SQLITE3_HELPER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "gfdb_sqlite3.h" /****************************************************************************** diff --git a/libglusterfs/src/glfs-message-id.h b/libglusterfs/src/glfs-message-id.h index 0cd035f875..f6ee181768 100644 --- a/libglusterfs/src/glfs-message-id.h +++ b/libglusterfs/src/glfs-message-id.h @@ -11,11 +11,6 @@ #ifndef _GLFS_MESSAGE_ID_H_ #define _GLFS_MESSAGE_ID_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* Base of all message IDs, all message IDs would be * greater than this */ #define GLFS_MSGID_BASE 100000 diff --git a/libglusterfs/src/globals.c b/libglusterfs/src/globals.c index bd1165ec50..a875049dfe 100644 --- a/libglusterfs/src/globals.c +++ b/libglusterfs/src/globals.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif /* !_CONFIG_H */ - #include <pthread.h> #include "glusterfs.h" diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 6f20185f80..10e22af004 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERFS_H #define _GLUSTERFS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/libglusterfs/src/graph-print.c b/libglusterfs/src/graph-print.c index d860d63b30..d352cc798b 100644 --- a/libglusterfs/src/graph-print.c +++ b/libglusterfs/src/graph-print.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/uio.h> #include "common-utils.h" diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c index 709ec3b3ce..e3a864bf11 100644 --- a/libglusterfs/src/graph.c +++ b/libglusterfs/src/graph.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include <dlfcn.h> #include <netdb.h> diff --git a/libglusterfs/src/hashfn.c b/libglusterfs/src/hashfn.c index f79165b221..62f7ab8780 100644 --- a/libglusterfs/src/hashfn.c +++ b/libglusterfs/src/hashfn.c @@ -11,11 +11,6 @@ #include <stdint.h> #include <stdlib.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "hashfn.h" #define get16bits(d) (*((const uint16_t *) (d))) diff --git a/libglusterfs/src/hashfn.h b/libglusterfs/src/hashfn.h index 06ae37e796..fed464e11c 100644 --- a/libglusterfs/src/hashfn.h +++ b/libglusterfs/src/hashfn.h @@ -11,11 +11,6 @@ #ifndef __HASHFN_H__ #define __HASHFN_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <stdint.h> diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/iatt.h index a404d9c8cd..e89f94662a 100644 --- a/libglusterfs/src/iatt.h +++ b/libglusterfs/src/iatt.h @@ -12,11 +12,6 @@ #ifndef _IATT_H #define _IATT_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <sys/stat.h> /* for iatt <--> stat conversions */ #include <unistd.h> diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c index c010db2a68..47096de541 100644 --- a/libglusterfs/src/inode.c +++ b/libglusterfs/src/inode.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "inode.h" #include "fd.h" #include "common-utils.h" diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/inode.h index 5081559934..83646ebda5 100644 --- a/libglusterfs/src/inode.h +++ b/libglusterfs/src/inode.h @@ -11,11 +11,6 @@ #ifndef _INODE_H #define _INODE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdint.h> #include <sys/types.h> diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/lkowner.h index 969d13e504..78f54a628d 100644 --- a/libglusterfs/src/lkowner.h +++ b/libglusterfs/src/lkowner.h @@ -11,11 +11,6 @@ #ifndef _LK_OWNER_H #define _LK_OWNER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define GF_MAX_LOCK_OWNER_LEN 1024 /* 1kB as per NLM */ /* 16strings-16strings-... */ diff --git a/libglusterfs/src/locking.h b/libglusterfs/src/locking.h index 79c6992af0..a66cdc188d 100644 --- a/libglusterfs/src/locking.h +++ b/libglusterfs/src/locking.h @@ -11,11 +11,6 @@ #ifndef _LOCKING_H #define _LOCKING_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #if HAVE_SPINLOCK diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c index e8fca2db91..90eebee2ab 100644 --- a/libglusterfs/src/logging.c +++ b/libglusterfs/src/logging.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <errno.h> #include <pthread.h> #include <stdio.h> diff --git a/libglusterfs/src/logging.h b/libglusterfs/src/logging.h index f19fe9e100..515b4372e8 100644 --- a/libglusterfs/src/logging.h +++ b/libglusterfs/src/logging.h @@ -11,11 +11,6 @@ #ifndef __LOGGING_H__ #define __LOGGING_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/time.h> #include <stdint.h> #include <stdio.h> diff --git a/libglusterfs/src/lvm-defaults.h b/libglusterfs/src/lvm-defaults.h index 4d3b010b20..32feebf3f6 100644 --- a/libglusterfs/src/lvm-defaults.h +++ b/libglusterfs/src/lvm-defaults.h @@ -11,11 +11,6 @@ #ifndef _LVM_DEFAULTS_H #define _LVM_DEFAULTS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define LVM_RESIZE "/sbin/lvresize" #define LVM_CREATE "/sbin/lvcreate" #define LVM_CONVERT "/sbin/lvconvert" diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index 75dce0ea3b..33d8187991 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <fnmatch.h> #include "xlator.h" diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h index 05a3d4332c..83b545850c 100644 --- a/libglusterfs/src/options.h +++ b/libglusterfs/src/options.h @@ -11,11 +11,6 @@ #ifndef _OPTIONS_H #define _OPTIONS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <stdint.h> #include <inttypes.h> diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h index f2d2ef9503..e0cc45eeb6 100644 --- a/libglusterfs/src/stack.h +++ b/libglusterfs/src/stack.h @@ -16,11 +16,6 @@ #ifndef _STACK_H #define _STACK_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - struct _call_stack_t; typedef struct _call_stack_t call_stack_t; struct _call_frame_t; diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c index 351741f429..42d2d75d8a 100644 --- a/libglusterfs/src/store.c +++ b/libglusterfs/src/store.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #include <libgen.h> diff --git a/libglusterfs/src/store.h b/libglusterfs/src/store.h index 6b7c98a354..4a726c6f00 100644 --- a/libglusterfs/src/store.h +++ b/libglusterfs/src/store.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_STORE_H_ #define _GLUSTERD_STORE_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat.h" #include "glusterfs.h" diff --git a/libglusterfs/src/strfd.c b/libglusterfs/src/strfd.c index 3eda05c2db..002d48629b 100644 --- a/libglusterfs/src/strfd.c +++ b/libglusterfs/src/strfd.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdarg.h> #include "mem-types.h" diff --git a/libglusterfs/src/syncop-utils.c b/libglusterfs/src/syncop-utils.c index 349fa92d64..81393136ab 100644 --- a/libglusterfs/src/syncop-utils.c +++ b/libglusterfs/src/syncop-utils.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "syncop.h" #include "common-utils.h" diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index 81eae5a910..a4e39702b7 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "syncop.h" int diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h index f41706a9d3..7779fada10 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/syncop.h @@ -11,11 +11,6 @@ #ifndef _SYNCOP_H #define _SYNCOP_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include <sys/time.h> #include <pthread.h> diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c index 0828b8a64f..dc257f6cfc 100644 --- a/libglusterfs/src/syscall.c +++ b/libglusterfs/src/syscall.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat.h" #include "syscall.h" diff --git a/libglusterfs/src/template-component-messages.h b/libglusterfs/src/template-component-messages.h index c1ea38cf77..7a6d0d14e1 100644 --- a/libglusterfs/src/template-component-messages.h +++ b/libglusterfs/src/template-component-messages.h @@ -11,11 +11,6 @@ #ifndef _component_MESSAGES_H_ #define _component_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /* NOTE: Rules for message additions diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c index 0d845cdeb3..1aa2079f09 100644 --- a/libglusterfs/src/timer.c +++ b/libglusterfs/src/timer.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "timer.h" #include "logging.h" #include "common-utils.h" diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/timer.h index e64b350ec5..220a280c70 100644 --- a/libglusterfs/src/timer.h +++ b/libglusterfs/src/timer.h @@ -11,11 +11,6 @@ #ifndef _TIMER_H #define _TIMER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include <sys/time.h> diff --git a/libglusterfs/src/trie.h b/libglusterfs/src/trie.h index 0356e66210..f7a4deee02 100644 --- a/libglusterfs/src/trie.h +++ b/libglusterfs/src/trie.h @@ -11,11 +11,6 @@ #ifndef _TRIE_H_ #define _TRIE_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - struct trienode; typedef struct trienode trienode_t; diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index 628f349995..117454092c 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include <dlfcn.h> #include <netdb.h> diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h index ca30f99650..d7dbfb413b 100644 --- a/libglusterfs/src/xlator.h +++ b/libglusterfs/src/xlator.h @@ -11,11 +11,6 @@ #ifndef _XLATOR_H #define _XLATOR_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <stdint.h> #include <inttypes.h> diff --git a/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c index c3fc166b73..5670b8e840 100644 --- a/rpc/rpc-lib/src/auth-glusterfs.c +++ b/rpc/rpc-lib/src/auth-glusterfs.c @@ -10,11 +10,6 @@ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "list.h" #include "dict.h" diff --git a/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c index b030341abb..774fdc8da3 100644 --- a/rpc/rpc-lib/src/auth-null.c +++ b/rpc/rpc-lib/src/auth-null.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "list.h" #include "dict.h" diff --git a/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c index 27351f6691..74ebfe0d1f 100644 --- a/rpc/rpc-lib/src/auth-unix.c +++ b/rpc/rpc-lib/src/auth-unix.c @@ -10,11 +10,6 @@ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "list.h" #include "dict.h" diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.c b/rpc/rpc-lib/src/rpc-clnt-ping.c index 17f8874a6a..0429bd3112 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.c +++ b/rpc/rpc-lib/src/rpc-clnt-ping.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpc-clnt.h" #include "rpc-clnt-ping.h" #include "byte-order.h" diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.h b/rpc/rpc-lib/src/rpc-clnt-ping.h index d7cd1d965e..bf97c0690d 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.h +++ b/rpc/rpc-lib/src/rpc-clnt-ping.h @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define RPC_DEFAULT_PING_TIMEOUT 30 void rpc_clnt_check_and_start_ping (struct rpc_clnt *rpc_ptr); diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index db99484cb8..ebcfec73ce 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define RPC_CLNT_DEFAULT_REQUEST_COUNT 512 #include "rpc-clnt.h" diff --git a/rpc/rpc-lib/src/rpc-drc.c b/rpc/rpc-lib/src/rpc-drc.c index 036b215e0c..fb7d2f1360 100644 --- a/rpc/rpc-lib/src/rpc-drc.c +++ b/rpc/rpc-lib/src/rpc-drc.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #ifndef RPC_DRC_H #include "rpc-drc.h" diff --git a/rpc/rpc-lib/src/rpc-drc.h b/rpc/rpc-lib/src/rpc-drc.h index c42c2a2c2f..cd9e2c73d3 100644 --- a/rpc/rpc-lib/src/rpc-drc.h +++ b/rpc/rpc-lib/src/rpc-drc.h @@ -11,11 +11,6 @@ #ifndef RPC_DRC_H #define RPC_DRC_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc-common.h" #include "rpcsvc.h" #include "locking.h" diff --git a/rpc/rpc-lib/src/rpc-lib-messages.h b/rpc/rpc-lib/src/rpc-lib-messages.h index 51351e8228..7046e42d54 100644 --- a/rpc/rpc-lib/src/rpc-lib-messages.h +++ b/rpc/rpc-lib/src/rpc-lib-messages.h @@ -11,11 +11,6 @@ #ifndef _RPC_LIB_MESSAGES_H_ #define _RPC_LIB_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /* NOTE: Rules for message additions diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 23fbf37360..149a831951 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -15,11 +15,6 @@ #include <fnmatch.h> #include <stdint.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "logging.h" #include "rpc-transport.h" #include "glusterfs.h" diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index d0572a1633..df0bab5dc4 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -11,11 +11,6 @@ #ifndef __RPC_TRANSPORT_H__ #define __RPC_TRANSPORT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #ifdef GF_SOLARIS_HOST_OS diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index be95d25b1b..d151d541ce 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "rpc-transport.h" #include "dict.h" diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index 027e2ca1ff..02e467e68a 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -11,11 +11,6 @@ #ifndef _RPCSVC_H #define _RPCSVC_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "event.h" #include "rpc-transport.h" #include "logging.h" diff --git a/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h index 39b8f240a1..596ac99640 100644 --- a/rpc/rpc-lib/src/xdr-common.h +++ b/rpc/rpc-lib/src/xdr-common.h @@ -11,11 +11,6 @@ #ifndef _XDR_COMMON_H_ #define _XDR_COMMON_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <rpc/types.h> #include <sys/types.h> #include <rpc/xdr.h> diff --git a/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c index d016668b9a..88a7637b88 100644 --- a/rpc/rpc-lib/src/xdr-rpc.c +++ b/rpc/rpc-lib/src/xdr-rpc.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <rpc/rpc.h> #include <rpc/pmap_clnt.h> #include <arpa/inet.h> diff --git a/rpc/rpc-lib/src/xdr-rpc.h b/rpc/rpc-lib/src/xdr-rpc.h index 4663ef7966..82e3f5baac 100644 --- a/rpc/rpc-lib/src/xdr-rpc.h +++ b/rpc/rpc-lib/src/xdr-rpc.h @@ -11,11 +11,6 @@ #ifndef _XDR_RPC_H_ #define _XDR_RPC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef GF_SOLARIS_HOST_OS #include <rpc/rpc.h> #endif diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c index 810d1961b9..4a6d2ea913 100644 --- a/rpc/rpc-lib/src/xdr-rpcclnt.c +++ b/rpc/rpc-lib/src/xdr-rpcclnt.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <rpc/rpc.h> #include <rpc/pmap_clnt.h> #include <arpa/inet.h> diff --git a/rpc/rpc-lib/src/xdr-rpcclnt.h b/rpc/rpc-lib/src/xdr-rpcclnt.h index c08d872f8c..e8d615a872 100644 --- a/rpc/rpc-lib/src/xdr-rpcclnt.h +++ b/rpc/rpc-lib/src/xdr-rpcclnt.h @@ -11,11 +11,6 @@ #ifndef _XDR_RPCCLNT_H #define _XDR_RPCCLNT_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - //#include <rpc/rpc.h> //#include <rpc/pmap_clnt.h> #include <arpa/inet.h> diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index 89fb6cb17d..7d665d34d5 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "glusterfs.h" #include "iobuf.h" diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h index cf4536dc9b..449861f075 100644 --- a/rpc/rpc-transport/rdma/src/rdma.h +++ b/rpc/rpc-transport/rdma/src/rdma.h @@ -12,11 +12,6 @@ #define _XPORT_RDMA_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef MAX_IOVEC #define MAX_IOVEC 16 #endif /* MAX_IOVEC */ 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 0957de25bb..616b0a20f6 100644 --- a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h +++ b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h @@ -11,11 +11,6 @@ #ifndef _RPC_TRANS_RDMA_MESSAGES_H_ #define _RPC_TRANS_RDMA_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /* NOTE: Rules for message additions diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 82a84dd5fc..ece2bc8379 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "socket.h" #include "name.h" #include "dict.h" diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index 2a84e264b8..e30d2ece99 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -14,11 +14,6 @@ #include <openssl/ssl.h> #include <openssl/err.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "event.h" #include "rpc-transport.h" #include "logging.h" diff --git a/rpc/xdr/src/msg-nfs3.c b/rpc/xdr/src/msg-nfs3.c index 6cdb5d37ea..040aced6a9 100644 --- a/rpc/xdr/src/msg-nfs3.c +++ b/rpc/xdr/src/msg-nfs3.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/uio.h> #include <rpc/rpc.h> #include <rpc/xdr.h> diff --git a/rpc/xdr/src/msg-nfs3.h b/rpc/xdr/src/msg-nfs3.h index b8e2c96945..628daea554 100644 --- a/rpc/xdr/src/msg-nfs3.h +++ b/rpc/xdr/src/msg-nfs3.h @@ -11,11 +11,6 @@ #ifndef _MSG_NFS3_H_ #define _MSG_NFS3_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xdr-nfs3.h" #include "nlm4-xdr.h" #include "acl3-xdr.h" diff --git a/tests/basic/logchecks-messages.h b/tests/basic/logchecks-messages.h index 50efe9dfad..6344037b44 100644 --- a/tests/basic/logchecks-messages.h +++ b/tests/basic/logchecks-messages.h @@ -11,11 +11,6 @@ #ifndef _LOGCHECKS_MESSAGES_H_ #define _LOGCHECKS_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /* NOTE: Rules for message additions diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index f478fea4da..4d0a562738 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -15,11 +15,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "afr.h" #include "dict.h" diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 984ed9c609..1237b261b1 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -17,11 +17,6 @@ #include <signal.h> #include <string.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 8a2c0e46e4..05b4cc0292 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -16,11 +16,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "afr.h" #include "dict.h" diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 7fed62a536..9cb6d2fca6 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -16,11 +16,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "afr.h" #include "dict.h" diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index 3db4010e99..931785c2c5 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -16,11 +16,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "afr.h" #include "dict.h" diff --git a/xlators/cluster/afr/src/afr-messages.h b/xlators/cluster/afr/src/afr-messages.h index 52bdead934..b7e761bedf 100644 --- a/xlators/cluster/afr/src/afr-messages.h +++ b/xlators/cluster/afr/src/afr-messages.h @@ -11,11 +11,6 @@ #ifndef _AFR_MESSAGES_H_ #define _AFR_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file afr-messages.h diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index f1da8b0520..ebfadf40e5 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -15,11 +15,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "afr.h" #include "dict.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index f3d1f8b0b1..c1b116ed9c 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" #include "byte-order.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 7567fe9f85..f5664f08a2 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" #include "byte-order.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index cb3648c07b..4c092f19a7 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" #include "byte-order.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 11c0c9c8cd..ea38d03781 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" #include "byte-order.h" diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c index ba9c3eeb6e..a45a763a2f 100644 --- a/xlators/cluster/afr/src/afr-self-heal-name.c +++ b/xlators/cluster/afr/src/afr-self-heal-name.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index fe9367597a..cdcef2d54e 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr.h" #include "afr-self-heal.h" #include "afr-self-heald.h" diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 26efe93de9..7af5f217a2 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -15,10 +15,6 @@ #include <stdlib.h> #include <signal.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include "afr-common.c" struct volume_options options[]; diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 855d3a3680..3d28ac22ab 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -12,11 +12,6 @@ #ifndef __AFR_H__ #define __AFR_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "call-stub.h" #include "compat-errno.h" #include "afr-mem-types.h" diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index ff8f5866f1..21855723d5 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -13,11 +13,6 @@ #include <stdlib.h> #include <fnmatch.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "afr-common.c" #include "defaults.c" #include "glusterfs.h" diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 3a1a9422d4..d42ef867e2 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* TODO: add NS locking */ #include "glusterfs.h" diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 5eb65bf039..96f99141a5 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <regex.h> #include <signal.h> diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c index 621c613d08..83efdf1f0a 100644 --- a/xlators/cluster/dht/src/dht-diskusage.c +++ b/xlators/cluster/dht/src/dht-diskusage.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* TODO: add NS locking */ #include "glusterfs.h" diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c index 72b3df022d..478d6cea2f 100644 --- a/xlators/cluster/dht/src/dht-hashfn.c +++ b/xlators/cluster/dht/src/dht-hashfn.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 2f85066569..19bea0a0ae 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c index 78e3ef4233..896997e67f 100644 --- a/xlators/cluster/dht/src/dht-inode-read.c +++ b/xlators/cluster/dht/src/dht-inode-read.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dht-common.h" int dht_access2 (xlator_t *this, call_frame_t *frame, int ret); diff --git a/xlators/cluster/dht/src/dht-inode-write.c b/xlators/cluster/dht/src/dht-inode-write.c index 7d04376abf..f4560da5ca 100644 --- a/xlators/cluster/dht/src/dht-inode-write.c +++ b/xlators/cluster/dht/src/dht-inode-write.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dht-common.h" int dht_writev2 (xlator_t *this, call_frame_t *frame, int ret); diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c index da8f13fc42..103a7f8d63 100644 --- a/xlators/cluster/dht/src/dht-layout.c +++ b/xlators/cluster/dht/src/dht-layout.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/cluster/dht/src/dht-linkfile.c b/xlators/cluster/dht/src/dht-linkfile.c index 14df318709..dc995ff31d 100644 --- a/xlators/cluster/dht/src/dht-linkfile.c +++ b/xlators/cluster/dht/src/dht-linkfile.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/cluster/dht/src/dht-messages.h b/xlators/cluster/dht/src/dht-messages.h index eb4c356e3c..28cfe77d91 100644 --- a/xlators/cluster/dht/src/dht-messages.h +++ b/xlators/cluster/dht/src/dht-messages.h @@ -10,11 +10,6 @@ #ifndef _DHT_MESSAGES_H_ #define _DHT_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file dht-messages.h diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 3ab73d4ef5..92ebd02f99 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dht-common.h" #include "xlator.h" #include <signal.h> diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index 4e4e986968..f3344c8c97 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -11,11 +11,6 @@ /* TODO: link(oldpath, newpath) fails if newpath already exists. DHT should * delete the newpath if it gets EEXISTS from link() call. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "dht-common.h" diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index c881a36180..6d3d20823c 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 2fef13adbd..8a15fb2a2b 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* TODO: add NS locking */ #include "statedump.h" #include "dht-common.h" diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 3934df5ec6..e1e09d12a4 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "statedump.h" #include "dht-common.h" diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c index 72d6d9c10e..43519d9754 100644 --- a/xlators/cluster/dht/src/nufa.c +++ b/xlators/cluster/dht/src/nufa.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dht-common.h" /* TODO: all 'TODO's in dht.c holds good */ diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c index 0071dfa265..c86a0a9b75 100644 --- a/xlators/cluster/dht/src/switch.c +++ b/xlators/cluster/dht/src/switch.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dht-common.h" #include "dht-mem-types.h" diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index b575da0b8f..39f9ba5898 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -8,10 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <dlfcn.h> #include "dht-common.h" diff --git a/xlators/cluster/dht/src/tier.h b/xlators/cluster/dht/src/tier.h index 7d4ea6b7eb..246ef2af0b 100644 --- a/xlators/cluster/dht/src/tier.h +++ b/xlators/cluster/dht/src/tier.h @@ -11,11 +11,6 @@ #ifndef _TIER_H_ #define _TIER_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /******************************************************************************/ /* This is from dht-rebalancer.c as we dont have dht-rebalancer.h */ diff --git a/xlators/cluster/dht/src/unittest/dht_layout_mock.c b/xlators/cluster/dht/src/unittest/dht_layout_mock.c index faf871d49b..6544f4208f 100644 --- a/xlators/cluster/dht/src/unittest/dht_layout_mock.c +++ b/xlators/cluster/dht/src/unittest/dht_layout_mock.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "dht-common.h" diff --git a/xlators/cluster/ha/src/ha.c b/xlators/cluster/ha/src/ha.c index 742ec46f10..6071eab55e 100644 --- a/xlators/cluster/ha/src/ha.c +++ b/xlators/cluster/ha/src/ha.c @@ -11,11 +11,6 @@ * can be written to decide what error to be returned and when */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "call-stub.h" #include "defaults.h" diff --git a/xlators/cluster/map/src/map-helper.c b/xlators/cluster/map/src/map-helper.c index 851397b68d..c5f828ae6d 100644 --- a/xlators/cluster/map/src/map-helper.c +++ b/xlators/cluster/map/src/map-helper.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "map.h" diff --git a/xlators/cluster/map/src/map.c b/xlators/cluster/map/src/map.c index aa2b23c29f..fbb56dbc55 100644 --- a/xlators/cluster/map/src/map.c +++ b/xlators/cluster/map/src/map.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "map.h" diff --git a/xlators/cluster/stripe/src/stripe.h b/xlators/cluster/stripe/src/stripe.h index 150d9e49f9..1e2fcb4e65 100644 --- a/xlators/cluster/stripe/src/stripe.h +++ b/xlators/cluster/stripe/src/stripe.h @@ -12,11 +12,6 @@ #ifndef _STRIPE_H_ #define _STRIPE_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "logging.h" #include "defaults.h" diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c index ec0874b354..b6b17baa87 100644 --- a/xlators/debug/error-gen/src/error-gen.c +++ b/xlators/debug/error-gen/src/error-gen.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "error-gen.h" #include "statedump.h" diff --git a/xlators/debug/error-gen/src/error-gen.h b/xlators/debug/error-gen/src/error-gen.h index d92c230624..351f5dc99d 100644 --- a/xlators/debug/error-gen/src/error-gen.h +++ b/xlators/debug/error-gen/src/error-gen.h @@ -10,11 +10,6 @@ #ifndef _ERROR_GEN_H #define _ERROR_GEN_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "error-gen-mem-types.h" #define GF_FAILURE_DEFAULT 10 diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index f79db1ad19..be47202a4f 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -7,11 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" #include "xlator.h" -#endif /** * xlators/debug/io_stats : diff --git a/xlators/debug/trace/src/trace.h b/xlators/debug/trace/src/trace.h index 62d1bc9c92..3b5f7891d0 100644 --- a/xlators/debug/trace/src/trace.h +++ b/xlators/debug/trace/src/trace.h @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <time.h> #include <errno.h> #include "glusterfs.h" diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c index 1ec41495ca..9b2d79c8eb 100644 --- a/xlators/encryption/crypt/src/atom.c +++ b/xlators/encryption/crypt/src/atom.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 5387f84303..4edd0aeb94 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -10,11 +10,6 @@ #include <ctype.h> #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h index 31bb59d876..c1bfe3fcd0 100644 --- a/xlators/encryption/crypt/src/crypt.h +++ b/xlators/encryption/crypt/src/crypt.h @@ -11,10 +11,6 @@ #ifndef __CRYPT_H__ #define __CRYPT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <openssl/aes.h> #include <openssl/evp.h> #include <openssl/sha.h> diff --git a/xlators/encryption/crypt/src/data.c b/xlators/encryption/crypt/src/data.c index 762fa554ac..2f96ed2bab 100644 --- a/xlators/encryption/crypt/src/data.c +++ b/xlators/encryption/crypt/src/data.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/keys.c b/xlators/encryption/crypt/src/keys.c index 4a1d3bb5a0..05f9e75362 100644 --- a/xlators/encryption/crypt/src/keys.c +++ b/xlators/encryption/crypt/src/keys.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/metadata.c b/xlators/encryption/crypt/src/metadata.c index a4124ab8d6..f99890e13d 100644 --- a/xlators/encryption/crypt/src/metadata.c +++ b/xlators/encryption/crypt/src/metadata.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/rot-13/src/rot-13.c b/xlators/encryption/rot-13/src/rot-13.c index 1bcfe0192f..6ec1b47c87 100644 --- a/xlators/encryption/rot-13/src/rot-13.c +++ b/xlators/encryption/rot-13/src/rot-13.c @@ -10,11 +10,6 @@ #include <ctype.h> #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/encryption/rot-13/src/rot-13.h b/xlators/encryption/rot-13/src/rot-13.h index 3e9fc19c77..a201751343 100644 --- a/xlators/encryption/rot-13/src/rot-13.h +++ b/xlators/encryption/rot-13/src/rot-13.h @@ -10,11 +10,6 @@ #ifndef __ROT_13_H__ #define __ROT_13_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - typedef struct { gf_boolean_t encrypt_write; gf_boolean_t decrypt_read; diff --git a/xlators/features/arbiter/src/arbiter.c b/xlators/features/arbiter/src/arbiter.c index 87145da568..b404597be9 100644 --- a/xlators/features/arbiter/src/arbiter.c +++ b/xlators/features/arbiter/src/arbiter.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "arbiter.h" #include "arbiter-mem-types.h" #include "glusterfs.h" diff --git a/xlators/features/arbiter/src/arbiter.h b/xlators/features/arbiter/src/arbiter.h index 69ce9cb4fa..6ccc3add3b 100644 --- a/xlators/features/arbiter/src/arbiter.h +++ b/xlators/features/arbiter/src/arbiter.h @@ -11,11 +11,6 @@ #ifndef _ARBITER_H #define _ARBITER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "locking.h" #include "common-utils.h" diff --git a/xlators/features/barrier/src/barrier.c b/xlators/features/barrier/src/barrier.c index 9620a73e71..f3f62d6c2d 100644 --- a/xlators/features/barrier/src/barrier.c +++ b/xlators/features/barrier/src/barrier.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "barrier.h" #include "defaults.h" #include "call-stub.h" diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c index 26ad97a16e..b1be962a6e 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <math.h> #include <ctype.h> #include <sys/uio.h> diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c index 8149083057..a645085fd5 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <ctype.h> #include <sys/uio.h> diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.h b/xlators/features/bit-rot/src/bitd/bit-rot.h index 40e02ebf37..e702f3ac72 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.h +++ b/xlators/features/bit-rot/src/bitd/bit-rot.h @@ -10,11 +10,6 @@ #ifndef __BIT_ROT_H__ #define __BIT_ROT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/bit-rot/src/stub/bit-rot-common.h b/xlators/features/bit-rot/src/stub/bit-rot-common.h index a8285d2b56..7ad5e8a80c 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-common.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-common.h @@ -11,11 +11,6 @@ #ifndef __BIT_ROT_COMMON_H__ #define __BIT_ROT_COMMON_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "bit-rot-object-version.h" diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index 524c235b54..9e403b4285 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -11,11 +11,6 @@ #include <ctype.h> #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.h b/xlators/features/bit-rot/src/stub/bit-rot-stub.h index e1e7b383f4..ae69a619d8 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.h +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.h @@ -10,11 +10,6 @@ #ifndef __BIT_ROT_STUB_H__ #define __BIT_ROT_STUB_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/changelog/src/changelog-encoders.c b/xlators/features/changelog/src/changelog-encoders.c index ea395e11f9..2808b65411 100644 --- a/xlators/features/changelog/src/changelog-encoders.c +++ b/xlators/features/changelog/src/changelog-encoders.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "changelog-encoders.h" size_t diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index a7d3e955fd..11e60dcbf4 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "logging.h" diff --git a/xlators/features/changelog/src/changelog-rt.c b/xlators/features/changelog/src/changelog-rt.c index c147f68ca8..c262820c64 100644 --- a/xlators/features/changelog/src/changelog-rt.c +++ b/xlators/features/changelog/src/changelog-rt.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "logging.h" diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c index b07009d3f8..91b0ae7a6e 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "logging.h" diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.h b/xlators/features/changetimerecorder/src/changetimerecorder.h index 6a963a56a2..2a8bbd18c5 100644 --- a/xlators/features/changetimerecorder/src/changetimerecorder.h +++ b/xlators/features/changetimerecorder/src/changetimerecorder.h @@ -11,11 +11,6 @@ #ifndef __CTR_H #define __CTR_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/features/changetimerecorder/src/ctr-helper.h b/xlators/features/changetimerecorder/src/ctr-helper.h index 87b80e6035..af371cf9d9 100644 --- a/xlators/features/changetimerecorder/src/ctr-helper.h +++ b/xlators/features/changetimerecorder/src/ctr-helper.h @@ -12,11 +12,6 @@ #define __CTR_HELPER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "ctr_mem_types.h" #include "iatt.h" diff --git a/xlators/features/compress/src/cdc-helper.c b/xlators/features/compress/src/cdc-helper.c index 79d60a4924..21f529c265 100644 --- a/xlators/features/compress/src/cdc-helper.c +++ b/xlators/features/compress/src/cdc-helper.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" diff --git a/xlators/features/compress/src/cdc.c b/xlators/features/compress/src/cdc.c index 67fc52505e..e33d4efc1a 100644 --- a/xlators/features/compress/src/cdc.c +++ b/xlators/features/compress/src/cdc.c @@ -10,11 +10,6 @@ #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "logging.h" diff --git a/xlators/features/filter/src/filter.c b/xlators/features/filter/src/filter.c index 1d4887b714..3fd7dc8c8f 100644 --- a/xlators/features/filter/src/filter.c +++ b/xlators/features/filter/src/filter.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/xlators/features/ganesha/src/ganesha.c b/xlators/features/ganesha/src/ganesha.c index fe9f14864b..859915420a 100644 --- a/xlators/features/ganesha/src/ganesha.c +++ b/xlators/features/ganesha/src/ganesha.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "ganesha.h" #include "ganesha-mem-types.h" diff --git a/xlators/features/ganesha/src/ganesha.h b/xlators/features/ganesha/src/ganesha.h index f30723da46..86320e9da2 100644 --- a/xlators/features/ganesha/src/ganesha.h +++ b/xlators/features/ganesha/src/ganesha.h @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "ganesha-mem-types.h" diff --git a/xlators/features/gfid-access/src/gfid-access.c b/xlators/features/gfid-access/src/gfid-access.c index d5054432d7..b4de9c91b6 100644 --- a/xlators/features/gfid-access/src/gfid-access.c +++ b/xlators/features/gfid-access/src/gfid-access.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "gfid-access.h" #include "inode.h" #include "byte-order.h" diff --git a/xlators/features/gfid-access/src/gfid-access.h b/xlators/features/gfid-access/src/gfid-access.h index 2449c5f683..2b5e4fd418 100644 --- a/xlators/features/gfid-access/src/gfid-access.h +++ b/xlators/features/gfid-access/src/gfid-access.h @@ -10,11 +10,6 @@ #ifndef __GFID_ACCESS_H__ #define __GFID_ACCESS_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c index 7bb88c0a0a..bca476427c 100644 --- a/xlators/features/glupy/src/glupy.c +++ b/xlators/features/glupy/src/glupy.c @@ -12,11 +12,6 @@ #include <sys/uio.h> #include <Python.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/features/glupy/src/glupy.h b/xlators/features/glupy/src/glupy.h index e61d000b88..1488c55c33 100644 --- a/xlators/features/glupy/src/glupy.h +++ b/xlators/features/glupy/src/glupy.h @@ -11,10 +11,6 @@ #ifndef __GLUPY_H__ #define __GLUPY_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include "mem-types.h" enum { diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c index 0c962bbc6f..03e1075b13 100644 --- a/xlators/features/index/src/index.c +++ b/xlators/features/index/src/index.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "index.h" #include "options.h" #include "glusterfs3-xdr.h" diff --git a/xlators/features/locks/src/clear.c b/xlators/features/locks/src/clear.c index 75593b8988..640c6bb555 100644 --- a/xlators/features/locks/src/clear.c +++ b/xlators/features/locks/src/clear.c @@ -12,11 +12,6 @@ #include <limits.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/src/clear.h b/xlators/features/locks/src/clear.h index 511f3f74ae..78fc5ae339 100644 --- a/xlators/features/locks/src/clear.h +++ b/xlators/features/locks/src/clear.h @@ -10,11 +10,6 @@ #ifndef __CLEAR_H__ #define __CLEAR_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat-errno.h" #include "stack.h" #include "call-stub.h" diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 5b1b2f9f44..0abc9353c9 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -12,11 +12,6 @@ #include <limits.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index 04ffd6d387..701121b90b 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 9860e9f907..df882f508f 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h index b72cbe0a67..8c24eb8cb9 100644 --- a/xlators/features/locks/src/locks.h +++ b/xlators/features/locks/src/locks.h @@ -10,11 +10,6 @@ #ifndef __POSIX_LOCKS_H__ #define __POSIX_LOCKS_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat-errno.h" #include "stack.h" #include "call-stub.h" diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 7dca2d0cb5..8d1e67e703 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -12,11 +12,6 @@ #include <limits.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c index 11abd26d85..b0a858f3d8 100644 --- a/xlators/features/locks/src/reservelk.c +++ b/xlators/features/locks/src/reservelk.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/locks/tests/unit-test.c b/xlators/features/locks/tests/unit-test.c index d2cca32dec..dec2ba8590 100644 --- a/xlators/features/locks/tests/unit-test.c +++ b/xlators/features/locks/tests/unit-test.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/mac-compat/src/mac-compat.c b/xlators/features/mac-compat/src/mac-compat.c index 0eaf563e88..795a387d48 100644 --- a/xlators/features/mac-compat/src/mac-compat.c +++ b/xlators/features/mac-compat/src/mac-compat.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "compat-errno.h" diff --git a/xlators/features/marker/src/marker-common.c b/xlators/features/marker/src/marker-common.c index 84a718add9..6ec5e3cc8b 100644 --- a/xlators/features/marker/src/marker-common.c +++ b/xlators/features/marker/src/marker-common.c @@ -7,10 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <fnmatch.h> #include "marker-common.h" diff --git a/xlators/features/marker/src/marker-common.h b/xlators/features/marker/src/marker-common.h index 23dd846cb0..c6ca422dd6 100644 --- a/xlators/features/marker/src/marker-common.h +++ b/xlators/features/marker/src/marker-common.h @@ -10,11 +10,6 @@ #ifndef _MARKER_COMMON_H #define _MARKER_COMMON_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "inode.h" #include "xlator.h" #include "marker.h" diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c index 67801c8640..9a0cf56a3f 100644 --- a/xlators/features/marker/src/marker-quota-helper.c +++ b/xlators/features/marker/src/marker-quota-helper.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "locking.h" #include "marker-quota.h" #include "marker-common.h" diff --git a/xlators/features/marker/src/marker-quota-helper.h b/xlators/features/marker/src/marker-quota-helper.h index 161413debf..b333a0ec52 100644 --- a/xlators/features/marker/src/marker-quota-helper.h +++ b/xlators/features/marker/src/marker-quota-helper.h @@ -11,11 +11,6 @@ #ifndef _MARKER_QUOTA_HELPER_H #define _MARKER_QUOTA_HELPER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "marker.h" #define QUOTA_FREE_CONTRIBUTION_NODE(_contribution) \ diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index e9351ed4e8..97039440eb 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/marker/src/marker-quota.h b/xlators/features/marker/src/marker-quota.h index a81db7fa68..9dfac2e3bb 100644 --- a/xlators/features/marker/src/marker-quota.h +++ b/xlators/features/marker/src/marker-quota.h @@ -10,11 +10,6 @@ #ifndef _MARKER_QUOTA_H #define _MARKER_QUOTA_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "marker-mem-types.h" diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 9e064ef7c5..f28b112cc2 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "libxlator.h" diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index aadd877663..0f98ac960a 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -10,11 +10,6 @@ #ifndef _MARKER_H #define _MARKER_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "marker-quota.h" #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/path-convertor/src/path.c b/xlators/features/path-convertor/src/path.c index 5c52e0a8d5..b0e5d6cc62 100644 --- a/xlators/features/path-convertor/src/path.c +++ b/xlators/features/path-convertor/src/path.c @@ -9,11 +9,6 @@ */ /* TODO: add gf_log to all the cases returning errors */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /** * xlators/features/path-translator: * This translator converts the path it gets into user specified targets. diff --git a/xlators/features/protect/src/prot_client.c b/xlators/features/protect/src/prot_client.c index 500c772bed..dde3abdadc 100644 --- a/xlators/features/protect/src/prot_client.c +++ b/xlators/features/protect/src/prot_client.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/protect/src/prot_dht.c b/xlators/features/protect/src/prot_dht.c index feec6ffd69..1fc8cc1ffd 100644 --- a/xlators/features/protect/src/prot_dht.c +++ b/xlators/features/protect/src/prot_dht.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/protect/src/prot_server.c b/xlators/features/protect/src/prot_server.c index beaee0889b..8ebace240f 100644 --- a/xlators/features/protect/src/prot_server.c +++ b/xlators/features/protect/src/prot_server.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/qemu-block/src/bdrv-xlator.c b/xlators/features/qemu-block/src/bdrv-xlator.c index 5dbe292d6d..dcb8304712 100644 --- a/xlators/features/qemu-block/src/bdrv-xlator.c +++ b/xlators/features/qemu-block/src/bdrv-xlator.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "inode.h" #include "syncop.h" #include "qemu-block.h" diff --git a/xlators/features/qemu-block/src/bh-syncop.c b/xlators/features/qemu-block/src/bh-syncop.c index e8686f6d4b..4374b5abce 100644 --- a/xlators/features/qemu-block/src/bh-syncop.c +++ b/xlators/features/qemu-block/src/bh-syncop.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/qemu-block/src/clock-timer.c b/xlators/features/qemu-block/src/clock-timer.c index fcbec6ad1c..36c08a2e76 100644 --- a/xlators/features/qemu-block/src/clock-timer.c +++ b/xlators/features/qemu-block/src/clock-timer.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/qemu-block/src/coroutine-synctask.c b/xlators/features/qemu-block/src/coroutine-synctask.c index e43988a953..68aef85407 100644 --- a/xlators/features/qemu-block/src/coroutine-synctask.c +++ b/xlators/features/qemu-block/src/coroutine-synctask.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/qemu-block/src/monitor-logging.c b/xlators/features/qemu-block/src/monitor-logging.c index d37c37f0f2..c4dc12c1d5 100644 --- a/xlators/features/qemu-block/src/monitor-logging.c +++ b/xlators/features/qemu-block/src/monitor-logging.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/qemu-block/src/qb-coroutines.c b/xlators/features/qemu-block/src/qb-coroutines.c index 4457576314..0c2fa62bb4 100644 --- a/xlators/features/qemu-block/src/qb-coroutines.c +++ b/xlators/features/qemu-block/src/qb-coroutines.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/qemu-block/src/qemu-block.c b/xlators/features/qemu-block/src/qemu-block.c index 8cc78ff165..89cb3e9b5d 100644 --- a/xlators/features/qemu-block/src/qemu-block.c +++ b/xlators/features/qemu-block/src/qemu-block.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/quiesce/src/quiesce.c b/xlators/features/quiesce/src/quiesce.c index 24c7dc6ed3..3a4100f796 100644 --- a/xlators/features/quiesce/src/quiesce.c +++ b/xlators/features/quiesce/src/quiesce.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "quiesce.h" #include "defaults.h" #include "call-stub.h" diff --git a/xlators/features/quota/src/quota-enforcer-client.c b/xlators/features/quota/src/quota-enforcer-client.c index 01cc447266..4e4c3358fe 100644 --- a/xlators/features/quota/src/quota-enforcer-client.c +++ b/xlators/features/quota/src/quota-enforcer-client.c @@ -28,11 +28,6 @@ #include <semaphore.h> #include <errno.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h index 183f8c1c42..e80316cdef 100644 --- a/xlators/features/quota/src/quota.h +++ b/xlators/features/quota/src/quota.h @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef _QUOTA_H #define _QUOTA_H diff --git a/xlators/features/read-only/src/read-only-common.c b/xlators/features/read-only/src/read-only-common.c index 24e99036b3..ad2eaaa5e2 100644 --- a/xlators/features/read-only/src/read-only-common.c +++ b/xlators/features/read-only/src/read-only-common.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "read-only.h" #include "read-only-mem-types.h" #include "defaults.h" diff --git a/xlators/features/read-only/src/read-only-common.h b/xlators/features/read-only/src/read-only-common.h index c99ba0310b..248ca47b66 100644 --- a/xlators/features/read-only/src/read-only-common.h +++ b/xlators/features/read-only/src/read-only-common.h @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/features/read-only/src/read-only.c b/xlators/features/read-only/src/read-only.c index 173c4f51e2..8733a40abc 100644 --- a/xlators/features/read-only/src/read-only.c +++ b/xlators/features/read-only/src/read-only.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "read-only-common.h" #include "read-only-mem-types.h" diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c index f62ffa3f6f..f117e20628 100644 --- a/xlators/features/read-only/src/worm.c +++ b/xlators/features/read-only/src/worm.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "read-only-common.h" diff --git a/xlators/features/shard/src/shard.h b/xlators/features/shard/src/shard.h index c2093a84ab..5423c03b1f 100644 --- a/xlators/features/shard/src/shard.h +++ b/xlators/features/shard/src/shard.h @@ -12,11 +12,6 @@ #ifndef __SHARD_H__ #define __SHARD_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "compat-errno.h" diff --git a/xlators/features/snapview-client/src/snapview-client.c b/xlators/features/snapview-client/src/snapview-client.c index 2f304aa7d3..5f325af3b3 100644 --- a/xlators/features/snapview-client/src/snapview-client.c +++ b/xlators/features/snapview-client/src/snapview-client.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "snapview-client.h" #include "inode.h" #include "byte-order.h" diff --git a/xlators/features/snapview-client/src/snapview-client.h b/xlators/features/snapview-client/src/snapview-client.h index 9973458884..fb0a15d861 100644 --- a/xlators/features/snapview-client/src/snapview-client.h +++ b/xlators/features/snapview-client/src/snapview-client.h @@ -10,11 +10,6 @@ #ifndef __SNAP_VIEW_CLIENT_H__ #define __SNAP_VIEW_CLIENT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/snapview-server/src/snapview-server-helpers.c b/xlators/features/snapview-server/src/snapview-server-helpers.c index 92ffdf512e..38ca7ae634 100644 --- a/xlators/features/snapview-server/src/snapview-server-helpers.c +++ b/xlators/features/snapview-server/src/snapview-server-helpers.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "snapview-server.h" #include "snapview-server-mem-types.h" diff --git a/xlators/features/snapview-server/src/snapview-server-mgmt.c b/xlators/features/snapview-server/src/snapview-server-mgmt.c index 0fe3687e20..53dd6ff44a 100644 --- a/xlators/features/snapview-server/src/snapview-server-mgmt.c +++ b/xlators/features/snapview-server/src/snapview-server-mgmt.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "snapview-server.h" #include "snapview-server-mem-types.h" #include <pthread.h> diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c index 3415ce0d67..87ba447e2d 100644 --- a/xlators/features/snapview-server/src/snapview-server.c +++ b/xlators/features/snapview-server/src/snapview-server.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "snapview-server.h" #include "snapview-server-mem-types.h" #include "compat-errno.h" diff --git a/xlators/features/snapview-server/src/snapview-server.h b/xlators/features/snapview-server/src/snapview-server.h index c80d3456c3..a682aeed33 100644 --- a/xlators/features/snapview-server/src/snapview-server.h +++ b/xlators/features/snapview-server/src/snapview-server.h @@ -10,11 +10,6 @@ #ifndef __SNAP_VIEW_H__ #define __SNAP_VIEW_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "defaults.h" #include "mem-types.h" diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index b2dd94ab16..d4d717b9ff 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "trash.h" #include "trash-mem-types.h" diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h index 37d8f7b3d8..9a57ac9f67 100644 --- a/xlators/features/trash/src/trash.h +++ b/xlators/features/trash/src/trash.h @@ -10,11 +10,6 @@ #ifndef __TRASH_H__ #define __TRASH_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/features/upcall/src/upcall-cache-invalidation.h b/xlators/features/upcall/src/upcall-cache-invalidation.h index edb8285827..77286b063d 100644 --- a/xlators/features/upcall/src/upcall-cache-invalidation.h +++ b/xlators/features/upcall/src/upcall-cache-invalidation.h @@ -11,11 +11,6 @@ #ifndef __UPCALL_CACHE_INVALIDATION_H__ #define __UPCALL_CACHE_INVALIDATION_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - /* The time period for which a client will be notified of cache_invalidation * events post its last access */ #define CACHE_INVALIDATION_TIMEOUT "60" diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c index b128ab3bdc..f618e2655f 100644 --- a/xlators/features/upcall/src/upcall-internal.c +++ b/xlators/features/upcall/src/upcall-internal.c @@ -12,11 +12,6 @@ #include <fcntl.h> #include <limits.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/upcall/src/upcall-messages.h b/xlators/features/upcall/src/upcall-messages.h index 5472b4a5cb..0cfdfd68b7 100644 --- a/xlators/features/upcall/src/upcall-messages.h +++ b/xlators/features/upcall/src/upcall-messages.h @@ -11,11 +11,6 @@ #ifndef _UPCALL_MESSAGES_H_ #define _UPCALL_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file upcall-messages.h diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c index 5f6c29e1b7..50e621a112 100644 --- a/xlators/features/upcall/src/upcall.c +++ b/xlators/features/upcall/src/upcall.c @@ -13,11 +13,6 @@ #include <limits.h> #include <pthread.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "compat.h" #include "xlator.h" diff --git a/xlators/features/upcall/src/upcall.h b/xlators/features/upcall/src/upcall.h index 295ddc2616..eb1c7df89b 100644 --- a/xlators/features/upcall/src/upcall.h +++ b/xlators/features/upcall/src/upcall.h @@ -10,11 +10,6 @@ #ifndef __UPCALL_H__ #define __UPCALL_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat-errno.h" #include "upcall-mem-types.h" #include "client_t.h" diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h index 20d5a32f24..3329ecf5d4 100644 --- a/xlators/lib/src/libxlator.h +++ b/xlators/lib/src/libxlator.h @@ -11,11 +11,6 @@ #define _LIBXLATOR_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "logging.h" #include "defaults.h" diff --git a/xlators/meta/src/active-link.c b/xlators/meta/src/active-link.c index 99d38597bd..dfa26b695b 100644 --- a/xlators/meta/src/active-link.c +++ b/xlators/meta/src/active-link.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/cmdline-file.c b/xlators/meta/src/cmdline-file.c index 88411f2629..941b8073f4 100644 --- a/xlators/meta/src/cmdline-file.c +++ b/xlators/meta/src/cmdline-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/frames-file.c b/xlators/meta/src/frames-file.c index 0e9777c9da..7d48d7a62d 100644 --- a/xlators/meta/src/frames-file.c +++ b/xlators/meta/src/frames-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/graph-dir.c b/xlators/meta/src/graph-dir.c index 3cd6b482e7..541e806ddb 100644 --- a/xlators/meta/src/graph-dir.c +++ b/xlators/meta/src/graph-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/graphs-dir.c b/xlators/meta/src/graphs-dir.c index 4a538fb617..e5f1319ec2 100644 --- a/xlators/meta/src/graphs-dir.c +++ b/xlators/meta/src/graphs-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/history-file.c b/xlators/meta/src/history-file.c index d88040fe58..eadc9821f8 100644 --- a/xlators/meta/src/history-file.c +++ b/xlators/meta/src/history-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/logfile-link.c b/xlators/meta/src/logfile-link.c index 435cab80c3..d7b16b92ea 100644 --- a/xlators/meta/src/logfile-link.c +++ b/xlators/meta/src/logfile-link.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/logging-dir.c b/xlators/meta/src/logging-dir.c index 783d38e8e1..cfd0c12330 100644 --- a/xlators/meta/src/logging-dir.c +++ b/xlators/meta/src/logging-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/loglevel-file.c b/xlators/meta/src/loglevel-file.c index 6b00d123a2..f9c5a993d7 100644 --- a/xlators/meta/src/loglevel-file.c +++ b/xlators/meta/src/loglevel-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/mallinfo-file.c b/xlators/meta/src/mallinfo-file.c index 38589f515f..a1aec25e3a 100644 --- a/xlators/meta/src/mallinfo-file.c +++ b/xlators/meta/src/mallinfo-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/measure-file.c b/xlators/meta/src/measure-file.c index e4498ab092..7fe9ff390c 100644 --- a/xlators/meta/src/measure-file.c +++ b/xlators/meta/src/measure-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/meminfo-file.c b/xlators/meta/src/meminfo-file.c index 807446cfdc..900976ada3 100644 --- a/xlators/meta/src/meminfo-file.c +++ b/xlators/meta/src/meminfo-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c index c34055bb22..5a8558291b 100644 --- a/xlators/meta/src/meta-defaults.c +++ b/xlators/meta/src/meta-defaults.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/meta-helpers.c b/xlators/meta/src/meta-helpers.c index cd47f0fb54..d01fcb3c67 100644 --- a/xlators/meta/src/meta-helpers.c +++ b/xlators/meta/src/meta-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/meta.c b/xlators/meta/src/meta.c index 09ee71b2e9..2572013671 100644 --- a/xlators/meta/src/meta.c +++ b/xlators/meta/src/meta.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/meta.h b/xlators/meta/src/meta.h index 652ebd7321..d9c56c656a 100644 --- a/xlators/meta/src/meta.h +++ b/xlators/meta/src/meta.h @@ -10,11 +10,6 @@ #ifndef __META_H__ #define __META_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "strfd.h" #define DEFAULT_META_DIR_NAME ".meta" diff --git a/xlators/meta/src/name-file.c b/xlators/meta/src/name-file.c index 8ddd42945d..44c359ef5c 100644 --- a/xlators/meta/src/name-file.c +++ b/xlators/meta/src/name-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/option-file.c b/xlators/meta/src/option-file.c index 4f9067e149..5a8465c5d8 100644 --- a/xlators/meta/src/option-file.c +++ b/xlators/meta/src/option-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/options-dir.c b/xlators/meta/src/options-dir.c index 229d365a9c..e637afb1f7 100644 --- a/xlators/meta/src/options-dir.c +++ b/xlators/meta/src/options-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/private-file.c b/xlators/meta/src/private-file.c index d2402c08bb..8d12b467d7 100644 --- a/xlators/meta/src/private-file.c +++ b/xlators/meta/src/private-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/process_uuid-file.c b/xlators/meta/src/process_uuid-file.c index c16ceaac15..3210de1d48 100644 --- a/xlators/meta/src/process_uuid-file.c +++ b/xlators/meta/src/process_uuid-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/profile-file.c b/xlators/meta/src/profile-file.c index 2a25c15469..7a8d0bf810 100644 --- a/xlators/meta/src/profile-file.c +++ b/xlators/meta/src/profile-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/root-dir.c b/xlators/meta/src/root-dir.c index d104d842cf..b57313fd9a 100644 --- a/xlators/meta/src/root-dir.c +++ b/xlators/meta/src/root-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/subvolume-link.c b/xlators/meta/src/subvolume-link.c index ca71a75154..018d42a53a 100644 --- a/xlators/meta/src/subvolume-link.c +++ b/xlators/meta/src/subvolume-link.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/subvolumes-dir.c b/xlators/meta/src/subvolumes-dir.c index f8d0e8039a..00218b1a8e 100644 --- a/xlators/meta/src/subvolumes-dir.c +++ b/xlators/meta/src/subvolumes-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/top-link.c b/xlators/meta/src/top-link.c index 94b7f7a9f5..97cec0a2b6 100644 --- a/xlators/meta/src/top-link.c +++ b/xlators/meta/src/top-link.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/type-file.c b/xlators/meta/src/type-file.c index 1970f4e33e..f27e4b0a77 100644 --- a/xlators/meta/src/type-file.c +++ b/xlators/meta/src/type-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/version-file.c b/xlators/meta/src/version-file.c index c402453ee9..ace419ea43 100644 --- a/xlators/meta/src/version-file.c +++ b/xlators/meta/src/version-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/view-dir.c b/xlators/meta/src/view-dir.c index 6edd455b07..dc208cb5b6 100644 --- a/xlators/meta/src/view-dir.c +++ b/xlators/meta/src/view-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/volfile-file.c b/xlators/meta/src/volfile-file.c index 899285763e..c6027658fe 100644 --- a/xlators/meta/src/volfile-file.c +++ b/xlators/meta/src/volfile-file.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/meta/src/xlator-dir.c b/xlators/meta/src/xlator-dir.c index 09b7bde62d..910e82b387 100644 --- a/xlators/meta/src/xlator-dir.c +++ b/xlators/meta/src/xlator-dir.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.h b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.h index e6f5d51c7c..7614329457 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_BITD_SVC_H_ #define _GLUSTERD_BITD_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" #define bitd_svc_name "bitd" diff --git a/xlators/mgmt/glusterd/src/glusterd-bitrot.c b/xlators/mgmt/glusterd/src/glusterd-bitrot.c index 08976cf6fb..da1b54ac1d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitrot.c +++ b/xlators/mgmt/glusterd/src/glusterd-bitrot.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 0af86f5685..d8c34b4bfe 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-conn-helper.h b/xlators/mgmt/glusterd/src/glusterd-conn-helper.h index 2431c316fd..80468d6de7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-conn-helper.h +++ b/xlators/mgmt/glusterd/src/glusterd-conn-helper.h @@ -13,11 +13,6 @@ #include "rpc-clnt.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-conn-mgmt.h" glusterd_svc_t * diff --git a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h index 6a058e36c9..5820419dbf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h +++ b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h @@ -13,11 +13,6 @@ #include "rpc-clnt.h" -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - typedef struct glusterd_conn_ glusterd_conn_t; typedef int (*glusterd_conn_notify_t) diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index d4ab77ca5f..7c04948eba 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "glusterd.h" #include "glusterd-op-sm.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index b5020b741d..cffd4624a6 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.h b/xlators/mgmt/glusterd/src/glusterd-geo-rep.h index 2543b9482c..5568b5cf31 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.h +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_GEO_REP_H_ #define _GLUSTERD_GEO_REP_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef GSYNC_CONF_TEMPLATE #define GSYNC_CONF_TEMPLATE GEOREP"/gsyncd_template.conf" #endif diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 564d78796b..c52f7596e2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -7,10 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <inttypes.h> #include "globals.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index f1712685dc..0cb92abca1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "defaults.h" #include "glusterfs.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c index 569f2743dd..fa9cff711a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-hooks.c +++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "globals.h" #include "glusterfs.h" #include "dict.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.h b/xlators/mgmt/glusterd/src/glusterd-hooks.h index 1e99f3472f..cf215716ae 100644 --- a/xlators/mgmt/glusterd/src/glusterd-hooks.h +++ b/xlators/mgmt/glusterd/src/glusterd-hooks.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_HOOKS_H_ #define _GLUSTERD_HOOKS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <fnmatch.h> #define GLUSTERD_GET_HOOKS_DIR(path, version, priv) \ diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c index 0f9c2b2608..394df68a0d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-locks.c +++ b/xlators/mgmt/glusterd/src/glusterd-locks.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.h b/xlators/mgmt/glusterd/src/glusterd-locks.h index de4d8fcd4d..437053d9f3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-locks.h +++ b/xlators/mgmt/glusterd/src/glusterd-locks.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_LOCKS_H_ #define _GLUSTERD_LOCKS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - typedef struct glusterd_mgmt_v3_lock_object_ { uuid_t lock_owner; } glusterd_mgmt_v3_lock_obj; diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c index 449b28cdbf..0d3be8eb40 100644 --- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index f66b8dbf19..d7fb299e91 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_MESSAGES_H_ #define _GLUSTERD_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file glusterd-messages.h diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-mgmt.h index 894bd198ff..e2eb94f86f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt.h +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_MGMT_H_ #define _GLUSTERD_MGMT_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - void gd_mgmt_v3_collate_errors (struct syncargs *args, int op_ret, int op_errno, char *op_errstr, int op_code, uuid_t peerid, u_char *uuid); diff --git a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c index 0a68540ad7..839637d8a1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c +++ b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c @@ -7,10 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <inttypes.h> #include <fnmatch.h> #include <pwd.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.h b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.h index 210336cde8..ca4ce7be8d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_NFS_SVC_H_ #define _GLUSTERD_NFS_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" int diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 4687aa8184..38b5edba67 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -8,10 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <time.h> #include <sys/uio.h> #include <sys/resource.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 6a1baa46f3..749e3806ca 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_OP_SM_H_ #define _GLUSTERD_OP_SM_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #include "compat-uuid.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c index e4dacb80c4..d739d8918c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.c +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" #include "compat-errno.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.h b/xlators/mgmt/glusterd/src/glusterd-pmap.h index 4743439030..dc80c41c35 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.h +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_PMAP_H_ #define _GLUSTERD_PMAP_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #include "compat-uuid.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.h index 9485d78d03..f523517181 100644 --- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.h +++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_PROC_MGMT_H_ #define _GLUSTERD_PROC_MGMT_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - typedef struct glusterd_proc_ glusterd_proc_t; enum proc_flags { diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 7238032b14..1d4e31d011 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.h b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.h index 945d47e68f..6f13775681 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_QUOTAD_SVC_H_ #define _GLUSTERD_QUOTAD_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" int diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index f2708f0059..f044b0ffba 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #include <sys/types.h> #include <unistd.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c index cb9c67cc7d..63d8fc6613 100644 --- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c +++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "cli1-xdr.h" #include "xdr-generic.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 415d04f96f..447fce561c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpc-clnt.h" #include "glusterd1-xdr.h" #include "cli1-xdr.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.h b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.h index e2e3b0d2ba..c38660ebd0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SCRUB_SVC_H_ #define _GLUSTERD_SCRUB_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" typedef struct glusterd_scrubsvc_ glusterd_scrubsvc_t; diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c index 8d8acb1751..9f7d947b7e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c +++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "common-utils.h" #include "glusterd.h" #include "glusterd-utils.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.h b/xlators/mgmt/glusterd/src/glusterd-server-quorum.h index f43cdbbca1..fc9dd5531e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.h +++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_SERVER_QUORUM_H #define _GLUSTERD_SERVER_QUORUM_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - int glusterd_validate_quorum (xlator_t *this, glusterd_op_t op, dict_t *dict, char **op_errstr); diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.h b/xlators/mgmt/glusterd/src/glusterd-shd-svc.h index 469ed5d0af..f1de3536bf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SHD_SVC_H_ #define _GLUSTERD_SHD_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" int diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c index f8228b0ab8..cabe433541 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-sm.c @@ -8,10 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <time.h> #include <sys/uio.h> #include <sys/resource.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h index 60e7514fda..7a7887bb62 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-sm.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_SM_H_ #define _GLUSTERD_SM_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #include "compat-uuid.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc-helper.h b/xlators/mgmt/glusterd/src/glusterd-snapd-svc-helper.h index 5c15e1a82c..4c452b9165 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc-helper.h +++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc-helper.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SNAPD_SVC_HELPER_H_ #define _GLUSTERD_SNAPD_SVC_HELPER_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd.h" void diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h index bc5d39f7ff..055ee47d0a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h +++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SNAPD_SVC_H_ #define _GLUSTERD_SNAPD_SVC_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-svc-mgmt.h" typedef struct glusterd_snapdsvc_ glusterd_snapdsvc_t; diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c index f666d4cc08..a2dbe0e573 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c @@ -7,10 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <inttypes.h> #if defined(GF_LINUX_HOST_OS) diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index fec7494c34..d0216c0f82 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #include <sys/types.h> #include <unistd.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-statedump.c b/xlators/mgmt/glusterd/src/glusterd-statedump.c index 24a479e0c3..6ed6d55071 100644 --- a/xlators/mgmt/glusterd/src/glusterd-statedump.c +++ b/xlators/mgmt/glusterd/src/glusterd-statedump.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "statedump.h" #include "glusterd.h" #include "glusterd-shd-svc.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-statedump.h b/xlators/mgmt/glusterd/src/glusterd-statedump.h index 9917560b54..3ac8659f29 100644 --- a/xlators/mgmt/glusterd/src/glusterd-statedump.h +++ b/xlators/mgmt/glusterd/src/glusterd-statedump.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_STATEDUMP_H_ #define _GLUSTERD_STATEDUMP_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" int diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index cb312ae9a6..4a330c138a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-op-sm.h" #include <inttypes.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h index 5ba0add32c..fdde219663 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.h +++ b/xlators/mgmt/glusterd/src/glusterd-store.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_HA_H_ #define _GLUSTERD_HA_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #include "compat-uuid.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.h b/xlators/mgmt/glusterd/src/glusterd-svc-helper.h index 2af75bc5c9..c1746b4189 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.h +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SVC_HELPER_H_ #define _GLUSTERD_SVC_HELPER_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd.h" #include "glusterd-svc-mgmt.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h index bb4f6f18fc..326d4dfb3c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h +++ b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h @@ -11,11 +11,6 @@ #ifndef _GLUSTERD_SVC_MGMT_H_ #define _GLUSTERD_SVC_MGMT_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-proc-mgmt.h" #include "glusterd-conn-mgmt.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index f90abc19b2..cc409fc632 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -7,10 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <inttypes.h> #if defined(GF_LINUX_HOST_OS) diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 3906449e90..57eecca8fb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_UTILS_H #define _GLUSTERD_UTILS_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <pthread.h> #include "compat-uuid.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index fc8b769983..57c043704c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <fnmatch.h> #include <sys/wait.h> #include <dlfcn.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h index 571a13c02f..e0ecaaa8eb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.h +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_VOLGEN_H_ #define _GLUSTERD_VOLGEN_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #if (HAVE_LIB_XML) #include <libxml/encoding.h> #include <libxml/xmlwriter.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index 1d29d50e13..20fbc678a3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_BD_XLATOR #include <lvm2app.h> #endif diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 02d59eddf5..a09a9d64c7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterd-volgen.h" #include "glusterd-utils.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 3735c62abc..5bdeb753f4 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -8,10 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <time.h> #include <grp.h> #include <sys/uio.h> diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index bca76970c3..8dc0500a36 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -10,11 +10,6 @@ #ifndef _GLUSTERD_H_ #define _GLUSTERD_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <dirent.h> #include <pthread.h> diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index 342d3c93c0..a9705d6c65 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -19,11 +19,6 @@ #include <sys/time.h> #include <fnmatch.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif /* _CONFIG_H */ - #include "glusterfs.h" #include "logging.h" #include "xlator.h" diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c index 2ddb31cd07..979a89f4b3 100644 --- a/xlators/mount/fuse/src/fuse-resolve.c +++ b/xlators/mount/fuse/src/fuse-resolve.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "fuse-bridge.h" static int diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c index 21a92325b7..26fd798653 100644 --- a/xlators/nfs/server/src/acl3.c +++ b/xlators/nfs/server/src/acl3.c @@ -8,11 +8,6 @@ * cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 8197cb1e7c..b12d976bd2 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index 026300e886..18fcdd9a2a 100644 --- a/xlators/nfs/server/src/mount3.h +++ b/xlators/nfs/server/src/mount3.h @@ -11,11 +11,6 @@ #ifndef _MOUNT3_H_ #define _MOUNT3_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index b6791566c2..359835f2cb 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h index 401484c0f3..d60642f603 100644 --- a/xlators/nfs/server/src/nfs-common.h +++ b/xlators/nfs/server/src/nfs-common.h @@ -11,11 +11,6 @@ #ifndef _NFS_COMMON_H_ #define _NFS_COMMON_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <unistd.h> #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index e5990a1e83..819ae98b08 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <grp.h> #include <pwd.h> diff --git a/xlators/nfs/server/src/nfs-fops.h b/xlators/nfs/server/src/nfs-fops.h index bd8cda1848..e511e8ac1d 100644 --- a/xlators/nfs/server/src/nfs-fops.h +++ b/xlators/nfs/server/src/nfs-fops.h @@ -11,11 +11,6 @@ #ifndef _NFS_FOPS_H_ #define _NFS_FOPS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "xlator.h" #include "iobuf.h" diff --git a/xlators/nfs/server/src/nfs-generics.c b/xlators/nfs/server/src/nfs-generics.c index cb32b7f1ba..ccfc0ae87c 100644 --- a/xlators/nfs/server/src/nfs-generics.c +++ b/xlators/nfs/server/src/nfs-generics.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "string.h" diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h index 01876d68e2..c3fb4fca33 100644 --- a/xlators/nfs/server/src/nfs-generics.h +++ b/xlators/nfs/server/src/nfs-generics.h @@ -11,11 +11,6 @@ #ifndef _NFS_GENERICS_H_ #define _NFS_GENERICS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "nfs.h" #include "xlator.h" #include "nfs-fops.h" diff --git a/xlators/nfs/server/src/nfs-inodes.c b/xlators/nfs/server/src/nfs-inodes.c index 32c2f426ff..0dad30ba10 100644 --- a/xlators/nfs/server/src/nfs-inodes.c +++ b/xlators/nfs/server/src/nfs-inodes.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "string.h" #include "inode.h" diff --git a/xlators/nfs/server/src/nfs-inodes.h b/xlators/nfs/server/src/nfs-inodes.h index ba7a571241..9ec94f2bef 100644 --- a/xlators/nfs/server/src/nfs-inodes.h +++ b/xlators/nfs/server/src/nfs-inodes.h @@ -11,11 +11,6 @@ #ifndef _NFS_INODES_H_ #define _NFS_INODES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "xlator.h" #include "iobuf.h" diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h index 77b85649c5..fe4a798b25 100644 --- a/xlators/nfs/server/src/nfs-messages.h +++ b/xlators/nfs/server/src/nfs-messages.h @@ -10,11 +10,6 @@ #ifndef _NFS_MESSAGES_H_ #define _NFS_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file nfs-messages.h diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 8b4bc75ea0..e057b17c3d 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -13,11 +13,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h index 15aec5d7da..107140bc72 100644 --- a/xlators/nfs/server/src/nfs.h +++ b/xlators/nfs/server/src/nfs.h @@ -11,11 +11,6 @@ #ifndef __NFS_H__ #define __NFS_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c index 7c9b92e458..3feeae39da 100644 --- a/xlators/nfs/server/src/nfs3-fh.c +++ b/xlators/nfs/server/src/nfs3-fh.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-fh.h b/xlators/nfs/server/src/nfs3-fh.h index eb969e44e2..3af36cc98b 100644 --- a/xlators/nfs/server/src/nfs3-fh.h +++ b/xlators/nfs/server/src/nfs3-fh.h @@ -11,11 +11,6 @@ #ifndef _NFS_FH_H_ #define _NFS_FH_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "xdr-nfs3.h" #include "iatt.h" diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index 5bb34c138c..42f4f68d3b 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <inttypes.h> #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-helpers.h b/xlators/nfs/server/src/nfs3-helpers.h index 626aa159d3..2e358d4b01 100644 --- a/xlators/nfs/server/src/nfs3-helpers.h +++ b/xlators/nfs/server/src/nfs3-helpers.h @@ -10,11 +10,6 @@ #ifndef _NFS3_HELPER_H_ #define _NFS3_HELPER_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "nfs3.h" diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index d66ac5d00b..a239d289d1 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3.h b/xlators/nfs/server/src/nfs3.h index f1b89fe17a..b55cb84863 100644 --- a/xlators/nfs/server/src/nfs3.h +++ b/xlators/nfs/server/src/nfs3.h @@ -11,11 +11,6 @@ #ifndef _NFS3_H_ #define _NFS3_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c index a1127a3069..7343fea8cd 100644 --- a/xlators/nfs/server/src/nlm4.c +++ b/xlators/nfs/server/src/nlm4.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h index 0ab03d8c57..c7da5d6219 100644 --- a/xlators/nfs/server/src/nlm4.h +++ b/xlators/nfs/server/src/nlm4.h @@ -11,11 +11,6 @@ #ifndef _NLM4_H_ #define _NLM4_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <signal.h> #include "rpcsvc.h" diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c index bfda85d492..4982a1dd61 100644 --- a/xlators/performance/io-cache/src/io-cache.c +++ b/xlators/performance/io-cache/src/io-cache.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/io-cache/src/io-cache.h b/xlators/performance/io-cache/src/io-cache.h index 46d758a660..c677bcd93f 100644 --- a/xlators/performance/io-cache/src/io-cache.h +++ b/xlators/performance/io-cache/src/io-cache.h @@ -11,11 +11,6 @@ #ifndef __IO_CACHE_H #define __IO_CACHE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include "compat-errno.h" diff --git a/xlators/performance/io-cache/src/ioc-inode.c b/xlators/performance/io-cache/src/ioc-inode.c index 86a54bb14c..0d7dee638f 100644 --- a/xlators/performance/io-cache/src/ioc-inode.c +++ b/xlators/performance/io-cache/src/ioc-inode.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "io-cache.h" #include "ioc-mem-types.h" diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c index 416cd5fe44..dce883fbd9 100644 --- a/xlators/performance/io-cache/src/page.c +++ b/xlators/performance/io-cache/src/page.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c index 148e55ab29..fa51b600d1 100644 --- a/xlators/performance/io-threads/src/io-threads.c +++ b/xlators/performance/io-threads/src/io-threads.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "call-stub.h" #include "defaults.h" #include "glusterfs.h" diff --git a/xlators/performance/io-threads/src/io-threads.h b/xlators/performance/io-threads/src/io-threads.h index 1a9dee9ae2..d8eea2cf77 100644 --- a/xlators/performance/io-threads/src/io-threads.h +++ b/xlators/performance/io-threads/src/io-threads.h @@ -11,11 +11,6 @@ #ifndef __IOT_H #define __IOT_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "compat-errno.h" #include "glusterfs.h" diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c index 51c07339fd..78cbfb57f9 100644 --- a/xlators/performance/md-cache/src/md-cache.c +++ b/xlators/performance/md-cache/src/md-cache.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/quick-read/src/quick-read.h b/xlators/performance/quick-read/src/quick-read.h index 6f0a054173..0697bf5fb1 100644 --- a/xlators/performance/quick-read/src/quick-read.h +++ b/xlators/performance/quick-read/src/quick-read.h @@ -11,11 +11,6 @@ #ifndef __QUICK_READ_H #define __QUICK_READ_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/read-ahead/src/page.c b/xlators/performance/read-ahead/src/page.c index 6e5b52c5e2..b1f69119fa 100644 --- a/xlators/performance/read-ahead/src/page.c +++ b/xlators/performance/read-ahead/src/page.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/read-ahead/src/read-ahead.c b/xlators/performance/read-ahead/src/read-ahead.c index 7ea9f40a1c..ec0b0e46f7 100644 --- a/xlators/performance/read-ahead/src/read-ahead.c +++ b/xlators/performance/read-ahead/src/read-ahead.c @@ -15,11 +15,6 @@ - ensure efficient memory management in case of random seek */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/read-ahead/src/read-ahead.h b/xlators/performance/read-ahead/src/read-ahead.h index d1d768c34f..debcd8fdeb 100644 --- a/xlators/performance/read-ahead/src/read-ahead.h +++ b/xlators/performance/read-ahead/src/read-ahead.h @@ -11,11 +11,6 @@ #ifndef __READ_AHEAD_H #define __READ_AHEAD_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c index 1a567a03ea..ec2d691a30 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead.c +++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c @@ -23,11 +23,6 @@ * preloads on the directory. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "call-stub.h" diff --git a/xlators/performance/symlink-cache/src/symlink-cache.c b/xlators/performance/symlink-cache/src/symlink-cache.c index c65629b699..bd9f805e2c 100644 --- a/xlators/performance/symlink-cache/src/symlink-cache.c +++ b/xlators/performance/symlink-cache/src/symlink-cache.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index 3cb0d449bb..3a735233e2 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/playground/template/src/template.c b/xlators/playground/template/src/template.c index 37a7794a07..c4db42debd 100644 --- a/xlators/playground/template/src/template.c +++ b/xlators/playground/template/src/template.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "template.h" int32_t diff --git a/xlators/playground/template/src/template.h b/xlators/playground/template/src/template.h index d6aced5010..2e9752cac0 100644 --- a/xlators/playground/template/src/template.h +++ b/xlators/playground/template/src/template.h @@ -10,11 +10,6 @@ #ifndef __TEMPLATE_H__ #define __TEMPLATE_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "logging.h" #include "dict.h" diff --git a/xlators/protocol/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c index 181d091bd4..6965da01b7 100644 --- a/xlators/protocol/auth/addr/src/addr.c +++ b/xlators/protocol/auth/addr/src/addr.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <fnmatch.h> #include <sys/socket.h> #include <netdb.h> diff --git a/xlators/protocol/auth/login/src/login.c b/xlators/protocol/auth/login/src/login.c index b53c5ccba2..e799dd22c1 100644 --- a/xlators/protocol/auth/login/src/login.c +++ b/xlators/protocol/auth/login/src/login.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <fnmatch.h> #include "authenticate.h" diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c index 78b9cef197..2cbad0ca78 100644 --- a/xlators/protocol/client/src/client-callback.c +++ b/xlators/protocol/client/src/client-callback.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "client.h" #include "rpc-clnt.h" #include "defaults.h" diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index b4c4604eb9..ce7b8e714e 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "fd-lk.h" #include "client.h" #include "xlator.h" diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index be5e7b5773..a8e39ede51 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "client.h" #include "fd.h" diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index d4021f53dd..d08565de7a 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "client.h" #include "rpc-common-xdr.h" #include "glusterfs3-xdr.h" diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 5745de096e..63cc81a514 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "client.h" #include "xlator.h" #include "defaults.h" diff --git a/xlators/protocol/server/src/authenticate.c b/xlators/protocol/server/src/authenticate.c index 8b45c41a59..da9911bed7 100644 --- a/xlators/protocol/server/src/authenticate.c +++ b/xlators/protocol/server/src/authenticate.c @@ -10,11 +10,6 @@ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/xlators/protocol/server/src/authenticate.h b/xlators/protocol/server/src/authenticate.h index d4d43e4987..3f80231ee0 100644 --- a/xlators/protocol/server/src/authenticate.h +++ b/xlators/protocol/server/src/authenticate.h @@ -11,11 +11,6 @@ #ifndef _AUTHENTICATE_H #define _AUTHENTICATE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 556b0e21e7..6d34fe8e35 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "server.h" #include "server-helpers.h" #include "rpc-common-xdr.h" diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 24d617f929..7820e1ce90 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "server.h" #include "server-helpers.h" #include "gidcache.h" diff --git a/xlators/protocol/server/src/server-messages.h b/xlators/protocol/server/src/server-messages.h index f604086821..795af5f28b 100644 --- a/xlators/protocol/server/src/server-messages.h +++ b/xlators/protocol/server/src/server-messages.h @@ -11,11 +11,6 @@ #ifndef _PS_MESSAGES_H__ #define _PS_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file server-messages.h diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c index e9491da5cd..aa1410e733 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/server/src/server-resolve.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "server.h" #include "server-helpers.h" #include "server-messages.h" diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 99b801100f..d31b956e02 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <openssl/md5.h> #include "server.h" diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index ca00dc0913..eed1d254a1 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -9,11 +9,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <sys/time.h> #include <sys/resource.h> diff --git a/xlators/storage/bd/src/bd-aio.c b/xlators/storage/bd/src/bd-aio.c index 9dc13b3ec6..191d23d10b 100644 --- a/xlators/storage/bd/src/bd-aio.c +++ b/xlators/storage/bd/src/bd-aio.c @@ -13,11 +13,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <lvm2app.h> #include <sys/uio.h> diff --git a/xlators/storage/bd/src/bd-aio.h b/xlators/storage/bd/src/bd-aio.h index 16f686a4ca..82386e0b07 100644 --- a/xlators/storage/bd/src/bd-aio.h +++ b/xlators/storage/bd/src/bd-aio.h @@ -11,11 +11,6 @@ #ifndef _BD_AIO_H #define _BD_AIO_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c index 8aaffa6b27..cf50ba5e7d 100644 --- a/xlators/storage/bd/src/bd-helper.c +++ b/xlators/storage/bd/src/bd-helper.c @@ -1,7 +1,3 @@ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <lvm2app.h> #ifdef HAVE_LIBAIO #include <libaio.h> diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c index 4ef94810f9..f732b85f03 100644 --- a/xlators/storage/bd/src/bd.c +++ b/xlators/storage/bd/src/bd.c @@ -17,10 +17,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <lvm2app.h> #include <openssl/md5.h> #include <time.h> diff --git a/xlators/storage/bd/src/bd.h b/xlators/storage/bd/src/bd.h index 3491349f2e..bdaf6f032d 100644 --- a/xlators/storage/bd/src/bd.h +++ b/xlators/storage/bd/src/bd.h @@ -18,11 +18,6 @@ #ifndef _BD_H #define _BD_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_LIBAIO #include <libaio.h> #endif diff --git a/xlators/storage/posix/src/posix-aio.c b/xlators/storage/posix/src/posix-aio.c index c3bbddd673..1818da6e34 100644 --- a/xlators/storage/posix/src/posix-aio.c +++ b/xlators/storage/posix/src/posix-aio.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" #include "posix.h" diff --git a/xlators/storage/posix/src/posix-aio.h b/xlators/storage/posix/src/posix-aio.h index 5bde716019..e9dd6467e5 100644 --- a/xlators/storage/posix/src/posix-aio.h +++ b/xlators/storage/posix/src/posix-aio.h @@ -10,11 +10,6 @@ #ifndef _POSIX_AIO_H #define _POSIX_AIO_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" diff --git a/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c index 6182fd8a63..9ebb2069f9 100644 --- a/xlators/storage/posix/src/posix-handle.c +++ b/xlators/storage/posix/src/posix-handle.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <errno.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/xlators/storage/posix/src/posix-handle.h b/xlators/storage/posix/src/posix-handle.h index e0b5b67e20..d73ff9e655 100644 --- a/xlators/storage/posix/src/posix-handle.h +++ b/xlators/storage/posix/src/posix-handle.h @@ -10,11 +10,6 @@ #ifndef _POSIX_HANDLE_H #define _POSIX_HANDLE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <limits.h> #include <sys/types.h> #include "xlator.h" diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 9018a739f8..4bfb9bbf29 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define __XOPEN_SOURCE 500 #include <stdint.h> diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index d38964143b..ef0b3c0f59 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define __XOPEN_SOURCE 500 #include <openssl/md5.h> diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h index d53a488ff6..b85338e930 100644 --- a/xlators/storage/posix/src/posix.h +++ b/xlators/storage/posix/src/posix.h @@ -10,11 +10,6 @@ #ifndef _POSIX_H #define _POSIX_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <unistd.h> #include <sys/types.h> |