diff options
author | Yaniv Kaul <ykaul@redhat.com> | 2019-06-09 13:31:31 +0300 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2019-06-14 16:50:32 +0000 |
commit | 0a6fe8551ac9807a8b6ad62241ec8048cf9f9025 (patch) | |
tree | 7f6d6b7920ed775c75ca7b4a3dd14aceef5eec38 /xlators/features | |
parent | 65e3624091e895ca32cd91468552589f34d17595 (diff) |
multiple files: another attempt to remove includes
There are many include statements that are not needed.
A previous more ambitious attempt failed because of *BSD plafrom
(see https://review.gluster.org/#/c/glusterfs/+/21929/ )
Now trying a more conservative reduction.
It does not solve all circular deps that we have, but it
does reduce some of them. There is just too much to handle
reasonably (dht-common.h includes dht-lock.h which includes
dht-common.h ...), but it does reduce the overall number of lines
of include we need to look at in the future to understand and fix
the mess later one.
Change-Id: I550cd001bdefb8be0fe67632f783c0ef6bee3f9f
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/features')
-rw-r--r-- | xlators/features/bit-rot/src/bitd/bit-rot.c | 3 | ||||
-rw-r--r-- | xlators/features/bit-rot/src/stub/bit-rot-stub.c | 1 | ||||
-rw-r--r-- | xlators/features/locks/src/common.c | 2 | ||||
-rw-r--r-- | xlators/features/locks/src/common.h | 1 | ||||
-rw-r--r-- | xlators/features/locks/src/inodelk.c | 4 | ||||
-rw-r--r-- | xlators/features/locks/src/posix.c | 4 | ||||
-rw-r--r-- | xlators/features/namespace/src/namespace.c | 1 | ||||
-rw-r--r-- | xlators/features/quota/src/quota.c | 4 | ||||
-rw-r--r-- | xlators/features/quota/src/quota.h | 3 | ||||
-rw-r--r-- | xlators/features/quota/src/quotad.c | 1 | ||||
-rw-r--r-- | xlators/features/read-only/src/read-only.c | 1 | ||||
-rw-r--r-- | xlators/features/read-only/src/read-only.h | 5 | ||||
-rw-r--r-- | xlators/features/snapview-server/src/snapview-server.h | 2 |
13 files changed, 4 insertions, 28 deletions
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c index 49528eabf71..6d0c0b5cead 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot.c @@ -9,10 +9,7 @@ */ #include <ctype.h> -#include <sys/uio.h> -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include <glusterfs/logging.h> #include <glusterfs/compat-errno.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 c3f81bcbb7b..e6d64de99a9 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -13,7 +13,6 @@ #include <signal.h> #include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include <glusterfs/logging.h> #include "changelog.h" #include <glusterfs/compat-errno.h> diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index ad1ce6c604d..429ce32803e 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -14,9 +14,7 @@ #include <glusterfs/glusterfs.h> #include <glusterfs/compat.h> -#include <glusterfs/xlator.h> #include <glusterfs/logging.h> -#include <glusterfs/common-utils.h> #include <glusterfs/syncop.h> #include "locks.h" diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h index 55603ef9c42..4006062606e 100644 --- a/xlators/features/locks/src/common.h +++ b/xlators/features/locks/src/common.h @@ -10,7 +10,6 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include <glusterfs/lkowner.h> /*dump locks format strings */ #define RANGE_FMT "type=%s, whence=%hd, start=%llu, len=%llu" #define ENTRY_FMT "type=%s on basename=%s" diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 95afc902ffa..cf556ea12a2 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -9,16 +9,14 @@ */ #include <glusterfs/glusterfs.h> #include <glusterfs/compat.h> -#include <glusterfs/xlator.h> +#include <glusterfs/dict.h> #include <glusterfs/logging.h> -#include <glusterfs/common-utils.h> #include <glusterfs/list.h> #include <glusterfs/upcall-utils.h> #include "locks.h" #include "clear.h" #include "common.h" -#include "pl-messages.h" void __delete_inode_lock(pl_inode_lock_t *lock) diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index d723d798804..c37752da945 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -12,11 +12,8 @@ #include <limits.h> #include <pthread.h> -#include <glusterfs/glusterfs.h> #include <glusterfs/compat.h> -#include <glusterfs/xlator.h> #include <glusterfs/logging.h> -#include <glusterfs/common-utils.h> #include "locks.h" #include "common.h" @@ -24,7 +21,6 @@ #include "clear.h" #include <glusterfs/defaults.h> #include <glusterfs/syncop.h> -#include "pl-messages.h" #ifndef LLONG_MAX #define LLONG_MAX LONG_LONG_MAX /* compat with old gcc */ diff --git a/xlators/features/namespace/src/namespace.c b/xlators/features/namespace/src/namespace.c index 59045e8647b..86c5ebee900 100644 --- a/xlators/features/namespace/src/namespace.c +++ b/xlators/features/namespace/src/namespace.c @@ -16,7 +16,6 @@ #include <sys/types.h> #include <glusterfs/defaults.h> -#include <glusterfs/glusterfs.h> #include <glusterfs/hashfn.h> #include <glusterfs/logging.h> #include "namespace.h" diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index c787028e7b3..c014c99cbd2 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -7,13 +7,9 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include <fnmatch.h> #include "quota.h" -#include <glusterfs/common-utils.h> -#include <glusterfs/defaults.h> #include <glusterfs/statedump.h> -#include <glusterfs/quota-common-utils.h> #include "quota-messages.h" #include <glusterfs/events.h> diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h index a5a99cac090..00012c22f46 100644 --- a/xlators/features/quota/src/quota.h +++ b/xlators/features/quota/src/quota.h @@ -10,10 +10,7 @@ #ifndef _QUOTA_H #define _QUOTA_H -#include <glusterfs/xlator.h> #include <glusterfs/call-stub.h> -#include <glusterfs/defaults.h> -#include <glusterfs/common-utils.h> #include "quota-mem-types.h" #include <glusterfs/glusterfs.h> #include <glusterfs/compat.h> diff --git a/xlators/features/quota/src/quotad.c b/xlators/features/quota/src/quotad.c index 146ec749930..643f25c9c2a 100644 --- a/xlators/features/quota/src/quotad.c +++ b/xlators/features/quota/src/quotad.c @@ -9,7 +9,6 @@ */ #include "quota.h" #include "quotad-aggregator.h" -#include <glusterfs/common-utils.h> int qd_notify(xlator_t *this, int32_t event, void *data, ...) diff --git a/xlators/features/read-only/src/read-only.c b/xlators/features/read-only/src/read-only.c index ac966633c34..48654998e63 100644 --- a/xlators/features/read-only/src/read-only.c +++ b/xlators/features/read-only/src/read-only.c @@ -7,7 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include <glusterfs/defaults.h> #include "read-only-common.h" #include "read-only-mem-types.h" #include "read-only.h" diff --git a/xlators/features/read-only/src/read-only.h b/xlators/features/read-only/src/read-only.h index fc32f82f8c5..aced5d3c577 100644 --- a/xlators/features/read-only/src/read-only.h +++ b/xlators/features/read-only/src/read-only.h @@ -11,8 +11,9 @@ #ifndef __READONLY_H__ #define __READONLY_H__ -#include "read-only-mem-types.h" -#include <glusterfs/xlator.h> +#include <stdint.h> // for uint64_t, uint8_t +#include <sys/time.h> // for time_t +#include "glusterfs/glusterfs.h" // for gf_boolean_t typedef struct { uint8_t worm : 1; diff --git a/xlators/features/snapview-server/src/snapview-server.h b/xlators/features/snapview-server/src/snapview-server.h index 42f22404b68..6472422e715 100644 --- a/xlators/features/snapview-server/src/snapview-server.h +++ b/xlators/features/snapview-server/src/snapview-server.h @@ -19,10 +19,8 @@ #include <ctype.h> #include <sys/uio.h> #include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include <glusterfs/logging.h> #include "glfs.h" -#include <glusterfs/common-utils.h> #include "glfs-handles.h" #include "glfs-internal.h" #include "glusterfs3-xdr.h" |