summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-utils.c
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2015-11-18 12:28:42 -0500
committerNiels de Vos <ndevos@redhat.com>2016-01-18 01:02:34 -0800
commit50ae3e67e4f294925fc840d3f83b77f7072af54d (patch)
treed682399e0b506b09d3106ea69c0518ea6cd8e0d8 /xlators/mgmt/glusterd/src/glusterd-utils.c
parentf3e03c9d47b7438a6f124e01e2f459c2b72b1c29 (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. backport of Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155, http://review.gluster.org/11769, BUG: 1245331 Change-Id: Iba1efb0bc578ea4a5e9bf76b7bd93dc1be9eba44 BUG: 1283302 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/12646 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index d02fbe5f22f..281aff8f867 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -4935,7 +4935,7 @@ glusterd_calc_dist_leaf_count (int rcount, int scount)
return (rcount ? rcount : 1) * (scount ? scount : 1);
}
-inline int
+int
glusterd_get_dist_leaf_count (glusterd_volinfo_t *volinfo)
{
int rcount = volinfo->replica_count;
@@ -5787,7 +5787,7 @@ out:
return ret;
}
-inline int
+int
glusterd_rb_check_bricks (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *src, glusterd_brickinfo_t *dst)
{
@@ -6510,8 +6510,8 @@ out:
return ret;
}
-static inline int
-glusterd_is_replica_volume (int type)
+static int
+is_replica_volume (int type)
{
if (type == GF_CLUSTER_TYPE_REPLICATE ||
type == GF_CLUSTER_TYPE_STRIPE_REPLICATE)
@@ -6523,13 +6523,11 @@ glusterd_is_volume_replicate (glusterd_volinfo_t *volinfo)
{
gf_boolean_t replicates = _gf_false;
if (volinfo->type == GF_CLUSTER_TYPE_TIER) {
- replicates = glusterd_is_replica_volume
- (volinfo->tier_info.cold_type) |
- glusterd_is_replica_volume
- (volinfo->tier_info.hot_type);
+ replicates = is_replica_volume (volinfo->tier_info.cold_type) |
+ is_replica_volume (volinfo->tier_info.hot_type);
return replicates;
}
- return glusterd_is_replica_volume ((volinfo->type));
+ return is_replica_volume ((volinfo->type));
}
gf_boolean_t