From 50ae3e67e4f294925fc840d3f83b77f7072af54d Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Wed, 18 Nov 2015 12:28:42 -0500 Subject: 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 Reviewed-on: http://review.gluster.org/12646 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- xlators/debug/io-stats/src/io-stats.c | 4 ++-- xlators/debug/trace/src/trace.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/debug') diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index f79db1ad19a..52fd537d972 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -154,7 +154,7 @@ struct ios_local { struct volume_options options[]; -inline static int +static int is_fop_latency_started (call_frame_t *frame) { GF_ASSERT (frame); @@ -514,7 +514,7 @@ out: return 0; } -static inline int +static int ios_stats_cleanup (xlator_t *this, inode_t *inode) { diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c index 94d32a70cca..5bbd07ad32a 100644 --- a/xlators/debug/trace/src/trace.c +++ b/xlators/debug/trace/src/trace.c @@ -19,7 +19,7 @@ */ #define TRACE_STAT_TO_STR(buf, str) trace_stat_to_str (buf, str, sizeof (str)) -static inline void +static void trace_stat_to_str(struct iatt *buf, char *str, size_t len) { char atime_buf[256] = {0,}; -- cgit