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>

7 files changed, 15 insertions, 17 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c
index 220c6b022f5..5ed3146ac4e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-hooks.c
+++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c
@@ -64,7 +64,7 @@ char glusterd_hook_dirnames[GD_OP_MAX][256] =
 };
 #undef EMPTY
 
-static inline gf_boolean_t
+static gf_boolean_t
 glusterd_is_hook_enabled (char *script)
 {
         return (script[0] == 'S' && (fnmatch ("*.rpmsave", script, 0) != 0)
diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
index f3278af8d9c..8fa68cf3434 100644
--- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
+++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c
@@ -181,7 +181,7 @@ out:
         return reconfigured;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 _is_contributing_to_quorum (gd_quorum_contrib_t contrib)
 {
         if ((contrib == QUORUM_UP) || (contrib == QUORUM_DOWN))
@@ -189,7 +189,7 @@ _is_contributing_to_quorum (gd_quorum_contrib_t contrib)
         return _gf_false;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 _does_quorum_meet (int active_count, int quorum_count)
 {
         return (active_count >= quorum_count);
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index 02f4ff6a176..8ce6648dbcf 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -9168,7 +9168,7 @@ glusterd_handle_snapshot (rpcsvc_request_t *req)
         return glusterd_big_locked_handler (req, glusterd_handle_snapshot_fn);
 }
 
-static inline void
+static void
 glusterd_free_snap_op (glusterd_snap_op_t *snap_op)
 {
         if (snap_op) {
@@ -9179,7 +9179,7 @@ glusterd_free_snap_op (glusterd_snap_op_t *snap_op)
         }
 }
 
-static inline void
+static void
 glusterd_free_missed_snapinfo (glusterd_missed_snap_info *missed_snapinfo)
 {
         glusterd_snap_op_t *snap_opinfo = NULL;
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index c16f25f0d6f..ca02b10b572 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -2919,7 +2919,7 @@ out:
         return volinfo;
 }
 
-static inline void
+static void
 glusterd_store_set_options_path (glusterd_conf_t *conf, char *path, size_t len)
 {
         snprintf (path, len, "%s/options", conf->workdir);
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
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index f021aaec73c..c9c29b3a0a4 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -254,7 +254,7 @@ xlator_get_option (xlator_t *xl, char *key, char **value)
         return dict_get_str (xl->options, key, value);
 }
 
-static inline xlator_t *
+static xlator_t *
 first_of (volgen_graph_t *graph)
 {
         return (xlator_t *)graph->graph.first;
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 8e13b41f24b..6fdad81ba45 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -370,7 +370,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 glusterd_program_register (xlator_t *this, rpcsvc_t *svc,
                            rpcsvc_program_t *prog)
 {