diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-05-18 16:26:02 +0200 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-29 05:43:17 -0700 |
| commit | 8a9328e37b8c63d60583184dc8dab12f85810682 (patch) | |
| tree | 0fa017379bf5e9dfaa2e6d8132c73cc1090a3d52 | |
| parent | 5d912230a7d4f9979c10ff15da724624bd8e069d (diff) | |
build: do not #include "config.h" in each file
Instead of including config.h in each file, and have the additional
config.h included from the compiler commandline (-include option).
When a .c file tests for a certain #define, and config.h was not
included, incorrect assumtions were made. With this change, it can not
happen again.
BUG: 1222319
Change-Id: I4f9097b8740b81ecfe8b218d52ca50361f74cb64
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10808
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
394 files changed, 1 insertions, 1950 deletions
diff --git a/api/src/gfapi-messages.h b/api/src/gfapi-messages.h index 2c59af24113..4c9b3f66221 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 11843c15b4d..bb657695489 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 2159d6795ad..d69c3fc1883 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 60e285d3ae7..287c48a13ad 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 5653f4d46c0..fc392947e1e 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 9b71821b00c..3c526f8a828 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 ccfeb6d87f1..9f8c159f073 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 2390822e5df..03b5d938d90 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 551312411a0..1fe84b3ebc3 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 2716dd094af..80ab2b0f211 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 690a104183a..d71f622ba11 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 da6603cc1f6..3ce88394925 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 5ea1edc9cac..99448fcae56 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 94fa3e9c671..9a4426a3a7d 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 7c1651936c7..d00dfac6e60 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 ade1c8ebb37..bca37d9c509 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 290028f6510..8aca451fece 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 525ec4bab72..4f4813bae76 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 c9283b5b875..be9fd961804 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 26f337c3c27..10fc39cd6b4 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 c4abe3be0b0..1adf7d6e572 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 1a09854224b..e70e1c3b6db 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 ce900b0a3e4..7f1365a49da 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 1eba414c116..d9253bbb89e 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 ba3b7a58735..1e47380f4cc 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 1cff44be4d0..4a84ae56a44 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 61ae4e497fc..b772caa665f 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 d183b0507fa..f439cef1592 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 128dcf9e15f..911ea334909 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 954338be915..af4a2f55aff 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 84257e66b09..9e6c90eba41 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 64c0514c8ac..bfea62061bd 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 a681951c27d..3712259c65b 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 4bcef6ae33f..bda336e348a 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 c361405d5eb..6691259f518 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 d8ab82a5d20..3674596ad71 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 65e52081dd3..6f46157e697 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 93e7b45a69e..0538a3298cb 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 1522257dffe..458a751c2f4 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 aa9d4216fd3..c70d97bc5d4 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 80836a326d5..95e134b78b0 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 1414da90731..b7174c8a939 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 a4ec7625409..68d23974b35 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 ffc92e72724..23e25b16edc 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 a9004e96a50..46cb2a3ca55 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 92420f3734e..9703fdc0f3d 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 b64f63b5eb4..de5d47cdfee 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 0daceb0d5a6..b32d38f6aa6 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 35564e46ea8..ab93f6c1f12 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 eac57bc01ad..b01ef24bb8e 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 613f9017b0d..1a191f340eb 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 c1b9157d882..5a98ec38ca7 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 99c0eb6441d..c602d08b278 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 faeaf411941..098a66ace15 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 977794df5cb..57f3de18f1c 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 72a1c89a741..5f6650dd910 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 04bfde7fa38..5b6921eafe2 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 8b62be1d4d0..0d222305d01 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 0cd035f875f..f6ee181768c 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 bd1165ec50c..a875049dfec 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 6f20185f80b..10e22af004e 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 d860d63b308..d352cc798b8 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 709ec3b3ce3..e3a864bf111 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 f79165b221e..62f7ab87800 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 06ae37e796b..fed464e11cd 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 a404d9c8cd0..e89f94662aa 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 c010db2a682..47096de5410 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 50815599347..83646ebda5a 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 969d13e5044..78f54a628d1 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 79c6992af0b..a66cdc188db 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 e8fca2db916..90eebee2ab5 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 f19fe9e1002..515b4372e8a 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 4d3b010b200..32feebf3f6e 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 75dce0ea3b6..33d81879917 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 05a3d4332cf..83b545850c8 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 f2d2ef95032..e0cc45eeb60 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 351741f4297..42d2d75d8aa 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 6b7c98a3547..4a726c6f00b 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 3eda05c2dbc..002d48629bc 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 349fa92d64f..81393136abb 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 81eae5a9105..a4e39702b70 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 f41706a9d37..7779fada109 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 0828b8a64fa..dc257f6cfcc 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 c1ea38cf770..7a6d0d14e17 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 0d845cdeb38..1aa2079f097 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 e64b350ec58..220a280c705 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 0356e66210e..f7a4deee02f 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 628f3499956..117454092cb 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 ca30f99650e..d7dbfb413be 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 c3fc166b731..5670b8e840b 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 b030341abb4..774fdc8da3a 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 27351f66911..74ebfe0d1ff 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 17f8874a6a4..0429bd31120 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 d7cd1d965e5..bf97c0690d2 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 db99484cb81..ebcfec73cef 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 036b215e0c0..fb7d2f13605 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 c42c2a2c2fe..cd9e2c73d32 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 51351e82283..7046e42d546 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 23fbf37360d..149a831951d 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 d0572a16333..df0bab5dc43 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 be95d25b1b1..d151d541cee 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 027e2ca1ffb..02e467e68a7 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 39b8f240a1e..596ac99640f 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 d016668b9a3..88a7637b887 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 4663ef7966a..82e3f5baac4 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 810d1961b9d..4a6d2ea9131 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 c08d872f8c2..e8d615a872e 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 89fb6cb17d7..7d665d34d53 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 cf4536dc9bd..449861f075f 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 0957de25bb1..616b0a20f61 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 82a84dd5fcc..ece2bc8379a 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 2a84e264b81..e30d2ece992 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 6cdb5d37eaf..040aced6a97 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 b8e2c96945f..628daea5547 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 50efe9dfadd..6344037b44a 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 f478fea4daa..4d0a5627381 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 984ed9c6095..1237b261b14 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 8a2c0e46e40..05b4cc02923 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 7fed62a5361..9cb6d2fca6b 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 3db4010e997..931785c2c5b 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 52bdead934b..b7e761bedf5 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 f1da8b05201..ebfadf40e5c 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 f3d1f8b0b14..c1b116ed9c8 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 7567fe9f851..f5664f08a25 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 cb3648c07bd..4c092f19a79 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 11c0c9c8cd9..ea38d037817 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 ba9c3eeb6ea..a45a763a2fa 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 fe9367597a2..cdcef2d54ed 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 26efe93de99..7af5f217a20 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 855d3a3680e..3d28ac22ab1 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 ff8f5866f10..21855723d52 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 3a1a9422d46..d42ef867e2b 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 5eb65bf0397..96f99141a59 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 621c613d08c..83efdf1f0a8 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 72b3df022da..478d6cea2f5 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 2f85066569d..19bea0a0ae2 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 78e3ef4233b..896997e67f7 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 7d04376abfc..f4560da5ca9 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 da8f13fc428..103a7f8d637 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 14df3187097..dc995ff31d1 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 eb4c356e3c2..28cfe77d916 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 3ab73d4ef5b..92ebd02f995 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 4e4e9869685..f3344c8c976 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 c881a361804..6d3d20823cd 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 2fef13adbd1..8a15fb2a2b9 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 3934df5ec64..e1e09d12a42 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 72d6d9c10e5..43519d97542 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 0071dfa265d..c86a0a9b75b 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 b575da0b8f0..39f9ba58988 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 7d4ea6b7ebe..246ef2af0be 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 faf871d49be..6544f4208f5 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 742ec46f107..6071eab55ee 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 851397b68d3..c5f828ae6d1 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 aa2b23c29f1..fbb56dbc554 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 150d9e49f93..1e2fcb4e659 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 ec0874b354a..b6b17baa87f 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 d92c2306240..351f5dc99d6 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 f79db1ad19a..be47202a4f3 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 62d1bc9c921..3b5f7891d00 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 1ec41495ca1..9b2d79c8eb4 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 5387f84303c..4edd0aeb940 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 31bb59d8765..c1bfe3fcd0c 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 762fa554ac2..2f96ed2bab5 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 4a1d3bb5a09..05f9e75362a 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 a4124ab8d6b..f99890e13dd 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 1bcfe0192f6..6ec1b47c87b 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 3e9fc19c776..a2017513437 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 87145da5680..b404597be9d 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 69ce9cb4fa3..6ccc3add3b3 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 9620a73e71b..f3f62d6c2d9 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 26ad97a16e8..b1be962a6e6 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 81490830570..a645085fd58 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 40e02ebf378..e702f3ac72d 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 a8285d2b560..7ad5e8a80c6 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 524c235b549..9e403b4285d 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 e1e7b383f42..ae69a619d81 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 ea395e11f90..2808b654119 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 a7d3e955fd2..11e60dcbf4a 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 c147f68ca85..c262820c64c 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 b07009d3f8f..91b0ae7a6e5 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 6a963a56a2f..2a8bbd18c5b 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 87b80e60354..af371cf9d9d 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 79d60a4924b..21f529c2652 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 67fc52505e5..e33d4efc1a1 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 1d4887b7143..3fd7dc8c8fb 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 fe9f14864b1..859915420ac 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 f30723da46d..86320e9da28 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 d5054432d76..b4de9c91b65 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 2449c5f6835..2b5e4fd4184 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 7bb88c0a0ae..bca476427c8 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 e61d000b889..1488c55c331 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 0c962bbc6f3..03e1075b133 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 75593b8988c..640c6bb5553 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 511f3f74ae5..78fc5ae3398 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 5b1b2f9f446..0abc9353c9e 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 04ffd6d387b..701121b90b9 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 9860e9f9079..df882f508f8 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 b72cbe0a67b..8c24eb8cb9a 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 7dca2d0cb5f..8d1e67e703c 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 11abd26d85f..b0a858f3d80 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 d2cca32dec3..dec2ba85909 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 0eaf563e889..795a387d484 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 84a718add97..6ec5e3cc8bc 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 23dd846cb0a..c6ca422dd6a 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 67801c86403..9a0cf56a3fe 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 161413debfa..b333a0ec52f 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 e9351ed4e88..97039440eb6 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 a81db7fa684..9dfac2e3bb5 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 9e064ef7c54..f28b112cc29 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 aadd8776637..0f98ac960a3 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 5c52e0a8d53..b0e5d6cc625 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 500c772bedd..dde3abdadc8 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 feec6ffd69c..1fc8cc1ffde 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 beaee0889b7..8ebace240f3 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 5dbe292d6d7..dcb8304712d 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 e8686f6d4ba..4374b5abcee 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 fcbec6ad1cd..36c08a2e766 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 e43988a953f..68aef854072 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 d37c37f0f29..c4dc12c1d5e 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 4457576314e..0c2fa62bb4f 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 8cc78ff165c..89cb3e9b5d2 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 24c7dc6ed31..3a4100f796e 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 01cc4472664..4e4c3358fe2 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 183f8c1c42e..e80316cdeff 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 24e99036b3c..ad2eaaa5e26 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 c99ba0310bb..248ca47b660 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 173c4f51e2a..8733a40abce 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 f62ffa3f6f3..f117e206285 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 c2093a84ab3..5423c03b1fa 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 2f304aa7d3f..5f325af3b37 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 9973458884b..fb0a15d8615 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 92ffdf512ef..38ca7ae6342 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 0fe3687e204..53dd6ff44af 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 3415ce0d671..87ba447e2d7 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 c80d3456c30..a682aeed33e 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 b2dd94ab161..d4d717b9ffc 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 37d8f7b3d85..9a57ac9f67e 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 edb8285827f..77286b063d8 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 b128ab3bdc9..f618e2655fc 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 5472b4a5cbd..0cfdfd68b77 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 5f6c29e1b79..50e621a1127 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 295ddc26167..eb1c7df89be 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 20d5a32f248..3329ecf5d4d 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 99d38597bdf..dfa26b695b3 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 88411f2629b..941b8073f4f 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 0e9777c9da2..7d48d7a62d4 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 3cd6b482e74..541e806ddb5 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 4a538fb6176..e5f1319ec26 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 d88040fe58f..eadc9821f83 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 435cab80c33..d7b16b92eae 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 783d38e8e12..cfd0c123308 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 6b00d123a2c..f9c5a993d73 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 38589f515ff..a1aec25e3a6 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 e4498ab092e..7fe9ff390c0 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 807446cfdc4..900976ada3b 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 c34055bb221..5a8558291ba 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 cd47f0fb54a..d01fcb3c679 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 09ee71b2e9e..25720136714 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 652ebd7321c..d9c56c656ad 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 8ddd42945d7..44c359ef5c8 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 4f9067e1490..5a8465c5d8b 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 229d365a9c7..e637afb1f73 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 d2402c08bb4..8d12b467d75 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 c16ceaac150..3210de1d484 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 2a25c154699..7a8d0bf810e 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 d104d842cf9..b57313fd9ad 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 ca71a751541..018d42a53a1 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 f8d0e8039a1..00218b1a8ec 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 94b7f7a9f56..97cec0a2b62 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 1970f4e33e8..f27e4b0a777 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 c402453ee96..ace419ea439 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 6edd455b072..dc208cb5b65 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 899285763e0..c6027658fee 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 09b7bde62de..910e82b3871 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 e6f5d51c7cc..7614329457a 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 08976cf6fb3..da1b54ac1df 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 0af86f56854..d8c34b4bfe7 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 2431c316fd4..80468d6de75 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 6a058e36c94..5820419dbf5 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 d4ab77ca5f9..7c04948ebab 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 b5020b741d2..cffd4624a6d 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 2543b9482c1..5568b5cf316 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 564d78796be..c52f7596e29 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 f1712685dcb..0cb92abca16 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 569f2743dda..fa9cff711ad 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 1e99f3472fb..cf215716aee 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 0f9c2b26084..394df68a0da 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 de4d8fcd4d5..437053d9f38 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 449b28cdbf1..0d3be8eb405 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 f66b8dbf19d..d7fb299e91f 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 894bd198ff3..e2eb94f86fd 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 0a68540ad7c..839637d8a13 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 210336cde83..ca4ce7be8d5 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 4687aa81846..38b5edba67b 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 6a1baa46f39..749e3806ca6 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 e4dacb80c4a..d739d8918cc 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 47434390303..dc80c41c35b 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 9485d78d03e..f5235171816 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 7238032b141..1d4e31d0116 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 945d47e68f6..6f13775681e 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 f2708f0059d..f044b0ffbaa 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 cb9c67cc7dc..63d8fc66132 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 415d04f96f1..447fce561c0 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 e2e3b0d2ba2..c38660ebd0b 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 8d8acb17513..9f7d947b7ee 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 f43cdbbca10..fc9dd5531e4 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 469ed5d0af2..f1de3536bf4 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 f8228b0ab83..cabe4335416 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 60e7514fdae..7a7887bb62e 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 5c15e1a82c7..4c452b91658 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 bc5d39f7ffb..055ee47d0a0 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 f666d4cc08e..a2dbe0e5738 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 fec7494c341..d0216c0f82b 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 24a479e0c35..6ed6d55071a 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 9917560b542..3ac8659f293 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 cb312ae9a63..4a330c138a4 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 5ba0add32c3..fdde2196633 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 2af75bc5c9a..c1746b4189c 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 bb4f6f18fc8..326d4dfb3c9 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 f90abc19b2e..cc409fc632f 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 3906449e902..57eecca8fb1 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 fc8b7699833..57c043704c3 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 571a13c02f4..e0ecaaa8ebf 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 1d29d50e13e..20fbc678a30 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 02d59eddf5d..a09a9d64c7c 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 3735c62abc1..5bdeb753f4a 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 bca76970c3a..8dc0500a36d 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 342d3c93c0f..a9705d6c654 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 2ddb31cd076..979a89f4b31 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 21a92325b72..26fd7986534 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 8197cb1e7ca..b12d976bd21 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 026300e886f..18fcdd9a2a7 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 b6791566c2c..359835f2cbd 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 401484c0f3c..d60642f6039 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 e5990a1e834..819ae98b081 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 bd8cda18481..e511e8ac1de 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 cb32b7f1bab..ccfc0ae87c5 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 01876d68e2b..c3fb4fca339 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 32c2f426ff4..0dad30ba10e 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 ba7a5712418..9ec94f2befe 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 77b85649c56..fe4a798b256 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 8b4bc75ea00..e057b17c3d6 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 15aec5d7da9..107140bc720 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 7c9b92e4587..3feeae39dae 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 eb969e44e22..3af36cc98b0 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 5bb34c138cf..42f4f68d3b0 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 626aa159d3a..2e358d4b016 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 d66ac5d00b5..a239d289d13 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 f1b89fe17a8..b55cb848638 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 a1127a30695..7343fea8cd6 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 0ab03d8c575..c7da5d62193 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 bfda85d4926..4982a1dd611 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 46d758a6608..c677bcd93f4 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 86a54bb14ca..0d7dee638f3 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 416cd5fe44e..dce883fbd94 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 148e55ab297..fa51b600d1e 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 1a9dee9ae2c..d8eea2cf77a 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 51c07339fdf..78cbfb57f96 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 6f0a0541731..0697bf5fb14 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 6e5b52c5e27..b1f69119fa3 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 7ea9f40a1c8..ec0b0e46f73 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 d1d768c34fb..debcd8fdeb4 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 1a567a03ea8..ec2d691a303 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 c65629b6993..bd9f805e2c8 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 3cb0d449bbc..3a735233e22 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 37a7794a07e..c4db42debd0 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 d6aced50107..2e9752cac09 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 181d091bd49..6965da01b7a 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 b53c5ccba21..e799dd22c1f 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 78b9cef197d..2cbad0ca78e 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 b4c4604eb9f..ce7b8e714e2 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 be5e7b57739..a8e39ede515 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 d4021f53dd5..d08565de7af 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 5745de096e0..63cc81a514d 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 8b45c41a59b..da9911bed71 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 d4d43e49873..3f80231ee0a 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 556b0e21e7f..6d34fe8e35d 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 24d617f9291..7820e1ce907 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 f604086821f..795af5f28bd 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 e9491da5cda..aa1410e7336 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 99b801100f9..d31b956e022 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 ca00dc09133..eed1d254a1d 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 9dc13b3ec60..191d23d10b0 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 16f686a4caa..82386e0b072 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 8aaffa6b27a..cf50ba5e7d9 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 4ef94810f99..f732b85f030 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 3491349f2e4..bdaf6f032d9 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 c3bbddd6737..1818da6e34c 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 5bde716019a..e9dd6467e5e 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 6182fd8a630..9ebb2069f96 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 e0b5b67e20f..d73ff9e655a 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 9018a739f83..4bfb9bbf29b 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 d38964143ba..ef0b3c0f59b 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 d53a488ff6e..b85338e930e 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> |