diff options
Diffstat (limited to 'xlators/cluster')
31 files changed, 7 insertions, 95 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 27ee9d5f16b..96f13ce2cee 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -18,9 +18,7 @@ #include <glusterfs/glusterfs.h> #include "afr.h" #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> #include <glusterfs/hashfn.h> -#include <glusterfs/logging.h> #include <glusterfs/list.h> #include <glusterfs/call-stub.h> #include <glusterfs/defaults.h> diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index e7ba4a5ddcc..f9fd48893ff 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -10,7 +10,6 @@ #include <libgen.h> #include <unistd.h> -#include <fnmatch.h> #include <sys/time.h> #include <stdlib.h> #include <signal.h> @@ -18,16 +17,10 @@ #include <glusterfs/glusterfs.h> #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> -#include <glusterfs/hashfn.h> -#include <glusterfs/logging.h> #include <glusterfs/list.h> -#include <glusterfs/call-stub.h> -#include <glusterfs/defaults.h> #include <glusterfs/common-utils.h> #include <glusterfs/compat-errno.h> #include <glusterfs/compat.h> -#include <glusterfs/checksum.h> #include "afr.h" #include "afr-transaction.h" diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 84e2a344624..82a72fddd67 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -10,7 +10,6 @@ #include <libgen.h> #include <unistd.h> -#include <fnmatch.h> #include <sys/time.h> #include <stdlib.h> #include <signal.h> @@ -18,11 +17,8 @@ #include <glusterfs/glusterfs.h> #include "afr.h" #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> -#include <glusterfs/hashfn.h> #include <glusterfs/logging.h> #include <glusterfs/list.h> -#include <glusterfs/call-stub.h> #include <glusterfs/defaults.h> #include <glusterfs/common-utils.h> #include <glusterfs/compat-errno.h> diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 523a5b48880..9204add5b15 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -18,11 +18,8 @@ #include <glusterfs/glusterfs.h> #include "afr.h" #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> -#include <glusterfs/hashfn.h> #include <glusterfs/logging.h> #include <glusterfs/list.h> -#include <glusterfs/call-stub.h> #include <glusterfs/byte-order.h> #include <glusterfs/defaults.h> #include <glusterfs/common-utils.h> diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index 7b16c5b0afb..8e9de3e12a6 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -8,9 +8,7 @@ cases as published by the Free Software Foundation. */ -#include <libgen.h> #include <unistd.h> -#include <fnmatch.h> #include <sys/time.h> #include <stdlib.h> #include <signal.h> @@ -18,11 +16,7 @@ #include <glusterfs/glusterfs.h> #include "afr.h" #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> -#include <glusterfs/hashfn.h> #include <glusterfs/logging.h> -#include <glusterfs/list.h> -#include <glusterfs/call-stub.h> #include <glusterfs/defaults.h> #include <glusterfs/common-utils.h> #include <glusterfs/compat-errno.h> diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index dd568160521..1747a079fa6 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -8,9 +8,7 @@ cases as published by the Free Software Foundation. */ -#include <libgen.h> #include <unistd.h> -#include <fnmatch.h> #include <sys/time.h> #include <stdlib.h> #include <signal.h> @@ -18,11 +16,7 @@ #include <glusterfs/glusterfs.h> #include "afr.h" #include <glusterfs/dict.h> -#include <glusterfs/xlator.h> -#include <glusterfs/hashfn.h> #include <glusterfs/logging.h> -#include <glusterfs/list.h> -#include <glusterfs/call-stub.h> #include <glusterfs/defaults.h> #include <glusterfs/common-utils.h> #include <glusterfs/compat-errno.h> @@ -30,10 +24,6 @@ #include <glusterfs/byte-order.h> #include <glusterfs/statedump.h> -#include "afr-inode-read.h" -#include "afr-inode-write.h" -#include "afr-dir-read.h" -#include "afr-dir-write.h" #include "afr-transaction.h" gf_boolean_t diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index e1edb380204..04b5f1c2fe6 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -10,15 +10,13 @@ /* TODO: add NS locking */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "libxlator.h" #include "dht-common.h" #include "dht-lock.h" -#include <glusterfs/defaults.h> #include <glusterfs/byte-order.h> #include <glusterfs/quota-common-utils.h> #include <glusterfs/upcall-utils.h> +#include "glusterfs/compat-errno.h" // for ENODATA on BSD #include <sys/time.h> #include <libgen.h> diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index c516271228e..0389b534d5f 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -9,8 +9,6 @@ */ #include <regex.h> -#include <signal.h> -#include <fnmatch.h> #include "dht-mem-types.h" #include "dht-messages.h" diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c index 4d3905ab741..27097ca2475 100644 --- a/xlators/cluster/dht/src/dht-diskusage.c +++ b/xlators/cluster/dht/src/dht-diskusage.c @@ -10,11 +10,7 @@ /* TODO: add NS locking */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" -#include "dht-messages.h" -#include <glusterfs/defaults.h> #include <sys/time.h> #include <glusterfs/events.h> diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c index 3def6b17666..c1405edbdd4 100644 --- a/xlators/cluster/dht/src/dht-hashfn.c +++ b/xlators/cluster/dht/src/dht-hashfn.c @@ -8,8 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" #include <glusterfs/hashfn.h> diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 4c57e0d2efc..c7bc8c3aaf2 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -8,10 +8,9 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-lock.h" +#include "glusterfs/compat-errno.h" // for ENODATA on BSD static void dht_free_fd_ctx(dht_fd_ctx_t *fd_ctx) diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c index 35bd3fbd25e..9cbb0f72171 100644 --- a/xlators/cluster/dht/src/dht-layout.c +++ b/xlators/cluster/dht/src/dht-layout.c @@ -8,11 +8,8 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" #include <glusterfs/byte-order.h> -#include "dht-messages.h" #include "unittest/unittest.h" #define layout_base_size (sizeof(dht_layout_t)) diff --git a/xlators/cluster/dht/src/dht-linkfile.c b/xlators/cluster/dht/src/dht-linkfile.c index e17c354bea6..2f4e1813be0 100644 --- a/xlators/cluster/dht/src/dht-linkfile.c +++ b/xlators/cluster/dht/src/dht-linkfile.c @@ -8,11 +8,8 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include <glusterfs/compat.h> #include "dht-common.h" -#include "dht-messages.h" int dht_linkfile_lookup_cbk(call_frame_t *frame, void *cookie, xlator_t *this, diff --git a/xlators/cluster/dht/src/dht-lock.h b/xlators/cluster/dht/src/dht-lock.h index 1cea8ae51ea..6485c03fb6e 100644 --- a/xlators/cluster/dht/src/dht-lock.h +++ b/xlators/cluster/dht/src/dht-lock.h @@ -11,7 +11,6 @@ #ifndef _DHT_LOCK_H #define _DHT_LOCK_H -#include <glusterfs/xlator.h> #include "dht-common.h" void diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 2580dd24ed2..ea63c3c5e74 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -9,12 +9,11 @@ */ #include "dht-common.h" -#include <glusterfs/xlator.h> #include <glusterfs/syscall.h> -#include <signal.h> #include <fnmatch.h> #include <signal.h> #include <glusterfs/events.h> +#include "glusterfs/compat-errno.h" // for ENODATA on BSD #define GF_DISK_SECTOR_SIZE 512 #define DHT_REBALANCE_PID 4242 /* Change it if required */ diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index 893b4513628..861e2fb4f9f 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -11,8 +11,6 @@ /* TODO: link(oldpath, newpath) fails if newpath already exists. DHT should * delete the newpath if it gets EEXISTS from link() call. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" #include "dht-lock.h" #include <glusterfs/defaults.h> diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index f5dfff9a11f..b140aad4c69 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -8,10 +8,7 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/glusterfs.h> -#include <glusterfs/xlator.h> #include "dht-common.h" -#include "dht-messages.h" #include "dht-lock.h" #include <glusterfs/glusterfs-acl.h> diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 934eace1ad1..53de8292704 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -8,7 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/statedump.h> #include "dht-common.h" struct xlator_fops dht_pt_fops = { diff --git a/xlators/cluster/ec/src/ec-common.h b/xlators/cluster/ec/src/ec-common.h index bf6c97d6aff..7296091fc90 100644 --- a/xlators/cluster/ec/src/ec-common.h +++ b/xlators/cluster/ec/src/ec-common.h @@ -11,8 +11,7 @@ #ifndef __EC_COMMON_H__ #define __EC_COMMON_H__ -#include <glusterfs/xlator.h> - +#include "glusterfs/compat-errno.h" // for ENODATA on BSD #include "ec-data.h" typedef enum { EC_DATA_TXN, EC_METADATA_TXN } ec_txn_t; diff --git a/xlators/cluster/ec/src/ec-data.c b/xlators/cluster/ec/src/ec-data.c index 8d2d9a1dfa2..06388833546 100644 --- a/xlators/cluster/ec/src/ec-data.c +++ b/xlators/cluster/ec/src/ec-data.c @@ -8,7 +8,6 @@ cases as published by the Free Software Foundation. */ -#include "ec-mem-types.h" #include "ec-helpers.h" #include "ec-common.h" #include "ec-data.h" diff --git a/xlators/cluster/ec/src/ec-dir-read.c b/xlators/cluster/ec/src/ec-dir-read.c index 8310d4a1a8c..c3c6b89dba7 100644 --- a/xlators/cluster/ec/src/ec-dir-read.c +++ b/xlators/cluster/ec/src/ec-dir-read.c @@ -8,15 +8,11 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> - #include "ec.h" #include "ec-messages.h" #include "ec-helpers.h" #include "ec-common.h" #include "ec-combine.h" -#include "ec-method.h" #include "ec-fops.h" /**************************************************************** diff --git a/xlators/cluster/ec/src/ec-dir-write.c b/xlators/cluster/ec/src/ec-dir-write.c index 0b8ee219f87..bd2544af862 100644 --- a/xlators/cluster/ec/src/ec-dir-write.c +++ b/xlators/cluster/ec/src/ec-dir-write.c @@ -8,9 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> - #include "ec.h" #include "ec-messages.h" #include "ec-helpers.h" diff --git a/xlators/cluster/ec/src/ec-galois.c b/xlators/cluster/ec/src/ec-galois.c index ee7662f52ce..6e4990c71f5 100644 --- a/xlators/cluster/ec/src/ec-galois.c +++ b/xlators/cluster/ec/src/ec-galois.c @@ -10,9 +10,6 @@ #include <string.h> -#include <glusterfs/mem-pool.h> -#include <glusterfs/list.h> - #include "ec-mem-types.h" #include "ec-gf8.h" #include "ec-helpers.h" diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c index acc16b5d80f..6e7bd4bc7b2 100644 --- a/xlators/cluster/ec/src/ec-generic.c +++ b/xlators/cluster/ec/src/ec-generic.c @@ -8,8 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> #include <glusterfs/byte-order.h> #include "ec.h" @@ -17,7 +15,6 @@ #include "ec-helpers.h" #include "ec-common.h" #include "ec-combine.h" -#include "ec-method.h" #include "ec-fops.h" /* FOP: flush */ diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c index 237fea22356..b9fb8686a6d 100644 --- a/xlators/cluster/ec/src/ec-heal.c +++ b/xlators/cluster/ec/src/ec-heal.c @@ -8,7 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> #include <glusterfs/defaults.h> #include <glusterfs/compat-errno.h> #include <glusterfs/byte-order.h> @@ -17,7 +16,6 @@ #include <glusterfs/cluster-syncop.h> #include "ec.h" -#include "ec-mem-types.h" #include "ec-types.h" #include "ec-messages.h" #include "ec-helpers.h" diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c index 5948a588be1..956e73c2088 100644 --- a/xlators/cluster/ec/src/ec-heald.c +++ b/xlators/cluster/ec/src/ec-heald.c @@ -8,7 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> #include <glusterfs/defaults.h> #include <glusterfs/compat-errno.h> #include "ec.h" diff --git a/xlators/cluster/ec/src/ec-heald.h b/xlators/cluster/ec/src/ec-heald.h index 8184cf4147c..6c7da4edc10 100644 --- a/xlators/cluster/ec/src/ec-heald.h +++ b/xlators/cluster/ec/src/ec-heald.h @@ -11,9 +11,9 @@ #ifndef __EC_HEALD_H__ #define __EC_HEALD_H__ -#include <glusterfs/xlator.h> - -#include "ec-types.h" +#include "ec-types.h" // for ec_t +#include "glusterfs/dict.h" // for dict_t +#include "glusterfs/globals.h" // for xlator_t int ec_xl_op(xlator_t *this, dict_t *input, dict_t *output); diff --git a/xlators/cluster/ec/src/ec-inode-read.c b/xlators/cluster/ec/src/ec-inode-read.c index f87a94a1cf7..602c47d3673 100644 --- a/xlators/cluster/ec/src/ec-inode-read.c +++ b/xlators/cluster/ec/src/ec-inode-read.c @@ -8,9 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> - #include "ec.h" #include "ec-messages.h" #include "ec-helpers.h" diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c index ea5514065ea..46f18c8807c 100644 --- a/xlators/cluster/ec/src/ec-inode-write.c +++ b/xlators/cluster/ec/src/ec-inode-write.c @@ -8,10 +8,6 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> - -#include "ec.h" #include "ec-messages.h" #include "ec-helpers.h" #include "ec-common.h" diff --git a/xlators/cluster/ec/src/ec-locks.c b/xlators/cluster/ec/src/ec-locks.c index ffcac074c4d..8e84977d2b3 100644 --- a/xlators/cluster/ec/src/ec-locks.c +++ b/xlators/cluster/ec/src/ec-locks.c @@ -8,13 +8,9 @@ cases as published by the Free Software Foundation. */ -#include <glusterfs/xlator.h> -#include <glusterfs/defaults.h> - #include "ec-helpers.h" #include "ec-common.h" #include "ec-combine.h" -#include "ec-method.h" #include "ec-fops.h" #include "ec-messages.h" diff --git a/xlators/cluster/ec/src/ec-method.h b/xlators/cluster/ec/src/ec-method.h index 2489fc84226..f91233b2f88 100644 --- a/xlators/cluster/ec/src/ec-method.h +++ b/xlators/cluster/ec/src/ec-method.h @@ -11,8 +11,6 @@ #ifndef __EC_METHOD_H__ #define __EC_METHOD_H__ -#include <glusterfs/xlator.h> - #include "ec-types.h" #include "ec-galois.h" |