summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-rebalance.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-07-28 12:11:12 -0400
committerJeff Darcy <jdarcy@redhat.com>2015-09-01 04:55:15 -0700
commit0773ca67fdb60a142207759fa6c07a69882ce59c (patch)
tree027101fce644fe17e58c78321b1632f38aaed166 /xlators/cluster/dht/src/dht-rebalance.c
parent038dfe57cf0c5944b0392332dbf5a00bb1208150 (diff)
all: reduce "inline" usage
There are three kinds of inline functions: plain inline, extern inline, and static inline. All three have been removed from .c files, except those in "contrib" which aren't our problem. Inlines in .h files, which are overwhelmingly "static inline" already, have generally been left alone. Over time we should be able to "lower" these into .c files, but that has to be done in a case-by-case fashion requiring more manual effort. This part was easy to do automatically without (as far as I can tell) any ill effect. In the process, several pieces of dead code were flagged by the compiler, and were removed. Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155 BUG: 1245331 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/11769 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-rebalance.c')
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 6b3299c4990..3d549b0fb00 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -367,7 +367,7 @@ out:
gf_defrag_handle_hardlink for description of "returning -2")
-1 : failure
*/
-static inline int
+static int
__is_file_migratable (xlator_t *this, loc_t *loc,
struct iatt *stbuf, dict_t *xattrs, int flags,
gf_defrag_info_t *defrag)
@@ -421,7 +421,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_rebalance_create_dst_file (xlator_t *to, xlator_t *from, loc_t *loc, struct iatt *stbuf,
fd_t **dst_fd, dict_t *xattr)
{
@@ -577,7 +577,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
struct iatt *stbuf, int flag)
{
@@ -687,7 +687,7 @@ out:
return ret;
}
-static inline int
+static int
__dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst,
uint64_t ia_size, int hole_exists)
{
@@ -742,7 +742,7 @@ __dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst
}
-static inline int
+static int
__dht_rebalance_open_src_file (xlator_t *from, xlator_t *to, loc_t *loc,
struct iatt *stbuf, fd_t **src_fd,
gf_boolean_t *clean_src)