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>

2 files changed, 10 insertions, 10 deletions

diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c
index 1ec41495ca1..9497b97538a 100644
--- a/xlators/encryption/crypt/src/atom.c
+++ b/xlators/encryption/crypt/src/atom.c
@@ -851,7 +851,7 @@ static struct iovec *get_iovec_hole_full(call_frame_t *frame,
 	return conf->avec + (conf->off_in_head ? 1 : 0);
 }
 
-static inline struct iovec *get_iovec_hole_tail(call_frame_t *frame,
+static struct iovec *get_iovec_hole_tail(call_frame_t *frame,
 						uint32_t count)
 {
 	struct avec_config *conf = get_hole_conf(frame);
@@ -859,7 +859,7 @@ static inline struct iovec *get_iovec_hole_tail(call_frame_t *frame,
 	return conf->avec + (conf->blocks_in_pool - 1);
 }
 
-static inline struct iovec *get_iovec_data_head(call_frame_t *frame,
+static struct iovec *get_iovec_data_head(call_frame_t *frame,
 						uint32_t count)
 {
 	struct avec_config *conf = get_data_conf(frame);
@@ -867,7 +867,7 @@ static inline struct iovec *get_iovec_data_head(call_frame_t *frame,
 	return conf->avec;
 }
 
-static inline struct iovec *get_iovec_data_full(call_frame_t *frame,
+static struct iovec *get_iovec_data_full(call_frame_t *frame,
 						uint32_t count)
 {
 	struct avec_config *conf = get_data_conf(frame);
@@ -875,7 +875,7 @@ static inline struct iovec *get_iovec_data_full(call_frame_t *frame,
 	return conf->avec + (conf->off_in_head ? 1 : 0) + count;
 }
 
-static inline struct iovec *get_iovec_data_tail(call_frame_t *frame,
+static struct iovec *get_iovec_data_tail(call_frame_t *frame,
 						uint32_t count)
 {
 	struct avec_config *conf = get_data_conf(frame);
diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c
index 57ae72731ba..a3c786f5b0a 100644
--- a/xlators/encryption/crypt/src/crypt.c
+++ b/xlators/encryption/crypt/src/crypt.c
@@ -693,13 +693,13 @@ void set_local_io_params_ftruncate(call_frame_t *frame,
 	}
 }
 
-static inline void submit_head(call_frame_t *frame, xlator_t *this)
+static void submit_head(call_frame_t *frame, xlator_t *this)
 {
 	crypt_local_t *local = frame->local;
 	submit_partial(frame, this, local->fd, HEAD_ATOM);
 }
 
-static inline void submit_tail(call_frame_t *frame, xlator_t *this)
+static void submit_tail(call_frame_t *frame, xlator_t *this)
 {
 	crypt_local_t *local = frame->local;
 	submit_partial(frame, this, local->fd, TAIL_ATOM);
@@ -730,14 +730,14 @@ static void submit_data(call_frame_t *frame, xlator_t *this)
  * heplers called by writev_cbk, fruncate_cbk in ordered mode
  */
 
-static inline int32_t should_submit_hole(crypt_local_t *local)
+static int32_t should_submit_hole(crypt_local_t *local)
 {
 	struct avec_config *conf = &local->hole_conf;
 
 	return conf->avec != NULL;
 }
 
-static inline int32_t should_resume_submit_hole(crypt_local_t *local)
+static int32_t should_resume_submit_hole(crypt_local_t *local)
 {
 	struct avec_config *conf = &local->hole_conf;
 
@@ -754,7 +754,7 @@ static inline int32_t should_resume_submit_hole(crypt_local_t *local)
 		return conf->cursor < conf->acount;
 }
 
-static inline int32_t should_resume_submit_data(call_frame_t *frame)
+static int32_t should_resume_submit_data(call_frame_t *frame)
 {
 	crypt_local_t *local = frame->local;
 	struct avec_config *conf = &local->data_conf;
@@ -767,7 +767,7 @@ static inline int32_t should_resume_submit_data(call_frame_t *frame)
 	return 0;
 }
 
-static inline int32_t should_submit_data_after_hole(crypt_local_t *local)
+static int32_t should_submit_data_after_hole(crypt_local_t *local)
 {
 	return local->data_conf.avec != NULL;
 }