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/features/changelog/src/changelog-helpers.c | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'xlators/features/changelog/src/changelog-helpers.c') diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c index 73963779418..d692753f084 100644 --- a/xlators/features/changelog/src/changelog-helpers.c +++ b/xlators/features/changelog/src/changelog-helpers.c @@ -62,7 +62,7 @@ changelog_thread_cleanup (xlator_t *this, pthread_t thr_id) return ret; } -inline void * +void * changelog_get_usable_buffer (changelog_local_t *local) { changelog_log_data_t *cld = NULL; @@ -77,7 +77,7 @@ changelog_get_usable_buffer (changelog_local_t *local) return cld->cld_iobuf->ptr; } -static inline int +static int changelog_selector_index (unsigned int selector) { return (ffs (selector) - 1); @@ -186,7 +186,7 @@ changelog_cleanup_event_selection (xlator_t *this, return LOCK_DESTROY (&selection->reflock); } -static inline void +static void changelog_perform_dispatch (xlator_t *this, changelog_priv_t *priv, void *mem, size_t size) { @@ -216,7 +216,7 @@ changelog_dispatch_event (xlator_t *this, } } -inline void +void changelog_set_usable_record_and_length (changelog_local_t *local, size_t len, int xr) { @@ -256,7 +256,7 @@ changelog_local_cleanup (xlator_t *xl, changelog_local_t *local) mem_put (local); } -inline int +int changelog_write (int fd, char *buffer, size_t len) { ssize_t size = 0; @@ -925,7 +925,7 @@ changelog_start_next_change (xlator_t *this, /** * return the length of entry */ -inline size_t +size_t changelog_entry_length () { return sizeof (changelog_log_data_t); @@ -1013,7 +1013,7 @@ out: return ret; } -inline int +int changelog_handle_change (xlator_t *this, changelog_priv_t *priv, changelog_log_data_t *cld) { @@ -1555,7 +1555,7 @@ changelog_inode_ctx_get (xlator_t *this, * then there is no need to record an update (as the equality of the two version * signifies an update was recorded in the current time slice). */ -inline void +void changelog_update (xlator_t *this, changelog_priv_t *priv, changelog_local_t *local, changelog_log_type type) { @@ -1623,7 +1623,7 @@ changelog_update (xlator_t *this, changelog_priv_t *priv, * not incremented fop count but color is assigned black. */ -inline void +void changelog_color_fop_and_inc_cnt (xlator_t *this, changelog_priv_t *priv, changelog_local_t *local) { @@ -1639,7 +1639,7 @@ changelog_color_fop_and_inc_cnt (xlator_t *this, changelog_priv_t *priv, } /* Increments the respective fop counter based on the fop color */ -inline void +void changelog_inc_fop_cnt (xlator_t *this, changelog_priv_t *priv, changelog_local_t *local) { @@ -1669,7 +1669,7 @@ changelog_inc_fop_cnt (xlator_t *this, changelog_priv_t *priv, } /* Decrements the respective fop counter based on the fop color */ -inline void +void changelog_dec_fop_cnt (xlator_t *this, changelog_priv_t *priv, changelog_local_t *local) { @@ -1719,7 +1719,7 @@ changelog_dec_fop_cnt (xlator_t *this, changelog_priv_t *priv, /* Write to a pipe setup between changelog main thread and changelog * rollover thread to initiate explicit rollover of changelog journal. */ -inline int +int changelog_barrier_notify (changelog_priv_t *priv, char *buf) { int ret = 0; @@ -1731,7 +1731,7 @@ changelog_barrier_notify (changelog_priv_t *priv, char *buf) } /* Clean up flags set on barrier notification */ -inline void +void changelog_barrier_cleanup (xlator_t *this, changelog_priv_t *priv, struct list_head *queue) { -- cgit