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>

67 files changed, 228 insertions, 298 deletions

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 68c407d5b4f..2c3d01bb961 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -1320,7 +1320,7 @@ out:
         return ret;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 cli_is_key_spl (char *key)
 {
         return (strcmp (key, "group") == 0);
diff --git a/extras/test/ld-preload-test/ld-preload-lib.c b/extras/test/ld-preload-test/ld-preload-lib.c
index 88afd14c3e7..8f74a25cf68 100644
--- a/extras/test/ld-preload-test/ld-preload-lib.c
+++ b/extras/test/ld-preload-test/ld-preload-lib.c
@@ -43,7 +43,7 @@
 #define PRELOAD_ERRNO_VERF      6449
 #define set_errno()             (errno = PRELOAD_ERRNO_VERF)
 
-inline void
+void
 intercept (char *call, int tabs)
 {
         while (tabs > 0) {
diff --git a/extras/test/ld-preload-test/ld-preload-test.c b/extras/test/ld-preload-test/ld-preload-test.c
index 78772f59818..cf8dd52c3e1 100644
--- a/extras/test/ld-preload-test/ld-preload-test.c
+++ b/extras/test/ld-preload-test/ld-preload-test.c
@@ -51,7 +51,7 @@
 
 
 #define PRELOAD_ERRNO_VERF      6449
-inline void
+void
 check_err(int ret, char *call, int tabs)
 {
         while (tabs > 0) {
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index ef29d9983bd..81e01bf6108 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2490,7 +2490,7 @@ out:
  * nr
  */
 
-inline int32_t
+int32_t
 gf_roundup_power_of_two (int32_t nr)
 {
         int32_t result = 1;
@@ -2514,7 +2514,7 @@ out:
  * power of two is returned.
  */
 
-inline int32_t
+int32_t
 gf_roundup_next_power_of_two (int32_t nr)
 {
         int32_t result = 1;
@@ -3394,7 +3394,7 @@ out:
         return running;
 }
 
-static inline int
+static int
 dht_is_linkfile_key (dict_t *this, char *key, data_t *value, void *data)
 {
         gf_boolean_t *linkfile_key_found = NULL;
@@ -3410,7 +3410,7 @@ out:
 }
 
 
-inline gf_boolean_t
+gf_boolean_t
 dht_is_linkfile (struct iatt *buf, dict_t *dict)
 {
         gf_boolean_t linkfile_key_found = _gf_false;
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index d4a6e6a40bb..297d7036216 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -308,7 +308,7 @@ out:
 }
 
 
-inline void
+void
 gf_fd_put (fdtable_t *fdtable, int32_t fd)
 {
         fd_t *fdptr = NULL;
@@ -356,7 +356,7 @@ unlock_out:
 }
 
 
-inline void
+void
 gf_fdptr_put (fdtable_t *fdtable, fd_t *fd)
 {
         fdentry_t *fde   = NULL;
diff --git a/libglusterfs/src/gfdb/gfdb_data_store.c b/libglusterfs/src/gfdb/gfdb_data_store.c
index 267dc839e92..42c2b8b41da 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store.c
+++ b/libglusterfs/src/gfdb/gfdb_data_store.c
@@ -124,7 +124,7 @@ out:
 
 /*Internal Function:
  * Delete connection node from the list*/
-static inline int
+static int
 delete_conn_node (gfdb_conn_node_t *_conn_node)
 {
         int ret = -1;
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c
index 6611eff275c..abd96b7e68d 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c
@@ -17,7 +17,7 @@
  *                      Util functions
  *
  * ***************************************************************************/
-inline gf_sql_connection_t *
+gf_sql_connection_t *
 gf_sql_connection_init ()
 {
         gf_sql_connection_t *gf_sql_conn = NULL;
@@ -33,7 +33,7 @@ gf_sql_connection_init ()
         return gf_sql_conn;
 }
 
-inline void
+void
 gf_sql_connection_fini (gf_sql_connection_t **sql_connection)
 {
         if (!sql_connection)
@@ -42,7 +42,7 @@ gf_sql_connection_fini (gf_sql_connection_t **sql_connection)
         *sql_connection = NULL;
 }
 
-inline const char *
+const char *
 gf_sql_jm2str (gf_sql_journal_mode_t jm)
 {
         switch (jm) {
@@ -64,7 +64,7 @@ gf_sql_jm2str (gf_sql_journal_mode_t jm)
         return NULL;
 }
 
-inline gf_sql_journal_mode_t
+gf_sql_journal_mode_t
 gf_sql_str2jm (const char *jm_str)
 {
         if (!jm_str) {
@@ -85,7 +85,7 @@ gf_sql_str2jm (const char *jm_str)
         return gf_sql_jm_invalid;
 }
 
-inline const char *
+const char *
 gf_sql_av_t2str (gf_sql_auto_vacuum_t sql_av)
 {
         switch (sql_av) {
@@ -101,7 +101,7 @@ gf_sql_av_t2str (gf_sql_auto_vacuum_t sql_av)
         return NULL;
 }
 
-inline gf_sql_auto_vacuum_t
+gf_sql_auto_vacuum_t
 gf_sql_str2av_t (const char *av_str)
 {
         if (!av_str) {
@@ -116,7 +116,7 @@ gf_sql_str2av_t (const char *av_str)
         return gf_sql_sync_invalid;
 }
 
-inline const char *
+const char *
 gf_sync_t2str (gf_sql_sync_t sql_sync)
 {
         switch (sql_sync) {
@@ -132,7 +132,7 @@ gf_sync_t2str (gf_sql_sync_t sql_sync)
         return NULL;
 }
 
-inline gf_sql_sync_t
+gf_sql_sync_t
 gf_sql_str2sync_t (const char *sync_str)
 {
         if (!sync_str) {
@@ -149,7 +149,7 @@ gf_sql_str2sync_t (const char *sync_str)
 
 
 /*TODO replace GF_CALLOC by mem_pool or iobuff if required for performace */
-static inline char *
+static char *
 sql_stmt_init ()
 {
         char *sql_stmt = NULL;
@@ -168,7 +168,7 @@ out:
 }
 
 /*TODO replace GF_FREE by mem_pool or iobuff if required for performace */
-static inline void
+static void
 sql_stmt_fini (char **sql_stmt)
 {
         GF_FREE (*sql_stmt);
@@ -296,7 +296,7 @@ out:
 
 
 
-static inline int
+static int
 apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict)
 {
         int ret = -1;
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
index b2e52078c1c..906fdd261f7 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
@@ -123,7 +123,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 gf_sql_delete_link (gf_sql_connection_t  *sql_conn,
                    char                 *gfid,
                    char                 *pargfid,
@@ -209,7 +209,7 @@ out:
 
 
 
-static inline int
+static int
 gf_sql_update_link_flags (gf_sql_connection_t  *sql_conn,
                    char                 *gfid,
                    char                 *pargfid,
@@ -314,7 +314,7 @@ out:
 }
 
 
-static inline int
+static int
 gf_sql_insert_link (gf_sql_connection_t  *sql_conn,
                    char                 *gfid,
                    char                 *pargfid,
@@ -406,7 +406,7 @@ out:
 }
 
 
-static inline int
+static int
 gf_sql_update_link (gf_sql_connection_t  *sql_conn,
                    char                 *gfid,
                    char                 *pargfid,
@@ -602,7 +602,7 @@ out:
 
 
 /*Update write/read times for both wind and unwind*/
-static inline int
+static int
 gf_update_time (gf_sql_connection_t    *sql_conn,
                 char                    *gfid,
                 gfdb_time_t             *update_time,
diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c
index 47c6d012831..52d8a15fd2c 100644
--- a/libglusterfs/src/rbthash.c
+++ b/libglusterfs/src/rbthash.c
@@ -231,7 +231,7 @@ rbthash_deinit_entry (rbthash_table_t *tbl, rbthash_entry_t *entry)
 }
 
 
-static inline struct rbthash_bucket *
+static struct rbthash_bucket *
 rbthash_entry_bucket (rbthash_table_t *tbl, rbthash_entry_t * entry)
 {
         int     nbucket = 0;
@@ -312,7 +312,7 @@ err:
         return ret;
 }
 
-static inline struct rbthash_bucket *
+static struct rbthash_bucket *
 rbthash_key_bucket (rbthash_table_t *tbl, void *key, int keylen)
 {
         uint32_t        keyhash = 0;
diff --git a/libglusterfs/src/rot-buffs.c b/libglusterfs/src/rot-buffs.c
index 19399b824f4..a3d9ebad110 100644
--- a/libglusterfs/src/rot-buffs.c
+++ b/libglusterfs/src/rot-buffs.c
@@ -40,13 +40,13 @@
 #define RVEC_LOW_WATERMARK_COUNT  1
 #define RVEC_HIGH_WATERMARK_COUNT (1 << 4)
 
-static inline
+static
 rbuf_list_t *rbuf_current_buffer (rbuf_t *rbuf)
 {
         return rbuf->current;
 }
 
-static inline void
+static void
 rlist_mark_waiting (rbuf_list_t *rlist)
 {
         LOCK (&rlist->c_lock);
@@ -56,44 +56,44 @@ rlist_mark_waiting (rbuf_list_t *rlist)
         UNLOCK (&rlist->c_lock);
 }
 
-static inline int
+static int
 __rlist_has_waiter (rbuf_list_t *rlist)
 {
         return (rlist->awaiting == _gf_true);
 }
 
-static inline void *
+static void *
 rbuf_alloc_rvec ()
 {
         return GF_CALLOC (1, RLIST_IOV_MELDED_ALLOC_SIZE, gf_common_mt_rvec_t);
 }
 
-static inline void
+static void
 rlist_reset_vector_usage (rbuf_list_t *rlist)
 {
         rlist->used = 1;
 }
 
-static inline void
+static void
 rlist_increment_vector_usage (rbuf_list_t *rlist)
 {
         rlist->used++;
 }
 
-static inline void
+static void
 rlist_increment_total_usage (rbuf_list_t *rlist)
 {
         rlist->total++;
 }
 
-static inline int
+static int
 rvec_in_watermark_range (rbuf_list_t *rlist)
 {
         return ((rlist->total >= RVEC_LOW_WATERMARK_COUNT)
                     && (rlist->total <= RVEC_HIGH_WATERMARK_COUNT));
 }
 
-static inline void
+static void
 rbuf_reset_rvec (rbuf_iovec_t *rvec)
 {
         /* iov_base is _never_ modified */
@@ -101,7 +101,7 @@ rbuf_reset_rvec (rbuf_iovec_t *rvec)
 }
 
 /* TODO: alloc multiple rbuf_iovec_t */
-static inline int
+static int
 rlist_add_new_vec (rbuf_list_t *rlist)
 {
         rbuf_iovec_t *rvec = NULL;
@@ -123,7 +123,7 @@ rlist_add_new_vec (rbuf_list_t *rlist)
         return 0;
 }
 
-static inline void
+static void
 rlist_free_rvec (rbuf_iovec_t *rvec)
 {
         if (!rvec)
@@ -132,7 +132,7 @@ rlist_free_rvec (rbuf_iovec_t *rvec)
         GF_FREE (rvec);
 }
 
-static inline void
+static void
 rlist_purge_all_rvec (rbuf_list_t *rlist)
 {
         rbuf_iovec_t *rvec = NULL;
@@ -145,7 +145,7 @@ rlist_purge_all_rvec (rbuf_list_t *rlist)
         }
 }
 
-static inline void
+static void
 rlist_shrink_rvec (rbuf_list_t *rlist, unsigned long long shrink)
 {
         rbuf_iovec_t *rvec = NULL;
@@ -156,7 +156,7 @@ rlist_shrink_rvec (rbuf_list_t *rlist, unsigned long long shrink)
         }
 }
 
-static inline void
+static void
 rbuf_purge_rlist (rbuf_t *rbuf)
 {
         rbuf_list_t *rlist = NULL;
@@ -257,7 +257,7 @@ rbuf_dtor (rbuf_t *rbuf)
         GF_FREE (rbuf);
 }
 
-static inline char *
+static char *
 rbuf_adjust_write_area (struct iovec *iov, size_t bytes)
 {
         char *wbuf = NULL;
@@ -267,7 +267,7 @@ rbuf_adjust_write_area (struct iovec *iov, size_t bytes)
         return wbuf;
 }
 
-static inline char *
+static char *
 rbuf_alloc_write_area (rbuf_list_t *rlist, size_t bytes)
 {
         int           ret = 0;
@@ -324,7 +324,7 @@ rbuf_reserve_write_area (rbuf_t *rbuf, size_t bytes, void **opaque)
         return wbuf;
 }
 
-static inline void
+static void
 rbuf_notify_waiter (rbuf_list_t *rlist)
 {
         pthread_mutex_lock (&rlist->b_lock);
@@ -411,7 +411,7 @@ rbuf_get_buffer (rbuf_t *rbuf,
  * routine (for buffer consumption).
  */
 
-static inline void
+static void
 __rbuf_wait_for_writers (rbuf_list_t *rlist)
 {
         while (rlist->completed != rlist->pending)
@@ -422,7 +422,7 @@ __rbuf_wait_for_writers (rbuf_list_t *rlist)
 #define M_E 2.7
 #endif
 
-static inline void
+static void
 rlist_shrink_vector (rbuf_list_t *rlist)
 {
         unsigned long long shrink = 0;
diff --git a/libglusterfs/src/timer.c b/libglusterfs/src/timer.c
index 8344c9bc5d5..2ffe6dff865 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -137,7 +137,7 @@ gf_timer_call_cancel (glusterfs_ctx_t *ctx,
         return 0;
 }
 
-static inline void __delete_entry (gf_timer_t *event) {
+static void __delete_entry (gf_timer_t *event) {
         event->next->prev = event->prev;
         event->prev->next = event->next;
         GF_FREE (event);
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 790436a4f2d..e6efb412561 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -777,7 +777,7 @@ out:
 }
 
 
-inline void
+void
 rpc_clnt_set_connected (rpc_clnt_connection_t *conn)
 {
         if (!conn) {
@@ -960,7 +960,7 @@ rpc_clnt_connection_deinit (rpc_clnt_connection_t *conn)
 }
 
 
-static inline int
+static int
 rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
                           dict_t *options, char *name)
 {
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index bf4fcad09ff..0904dbee716 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -553,7 +553,7 @@ out:
 
 
 
-inline int
+int
 rpc_transport_register_notify (rpc_transport_t *trans,
                                rpc_transport_notify_t notify, void *mydata)
 {
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 8307d2f4923..daf1932b90d 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -325,7 +325,7 @@ err:
 /* this procedure can only pass 4 arguments to registered notifyfn. To send more
  * arguments call wrapper->notify directly.
  */
-static inline void
+static void
 rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
                        void *data)
 {
@@ -348,7 +348,7 @@ out:
 }
 
 
-static inline int
+static int
 rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
                rpc_transport_t *new_trans)
 {
@@ -1354,7 +1354,7 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
 
 
 /* Register the program with the local portmapper service. */
-inline int
+int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
 {
         int                ret   = -1; /* FAIL */
@@ -1377,7 +1377,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
 {
         int ret = -1;
@@ -1561,7 +1561,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
 {
         if (!trans) {
@@ -1572,7 +1572,7 @@ rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
 }
 
 
-inline int
+int
 rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
                            struct sockaddr_storage *sa, socklen_t sasize)
 {
@@ -1821,7 +1821,7 @@ out:
 }
 
 
-inline int
+int
 rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program)
 {
         int               ret                = -1;
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 25eef7b97ee..34972deef09 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -1733,7 +1733,7 @@ out:
 }
 
 
-static inline void
+static void
 __gf_rdma_deregister_mr (gf_rdma_device_t *device,
                          struct ibv_mr **mr, int count)
 {
@@ -2135,7 +2135,7 @@ out:
 }
 
 
-static inline void
+static void
 __gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr,
                              gf_rdma_reply_info_t *reply_info, int credits)
 {
@@ -2286,7 +2286,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 __gf_rdma_register_local_mr_for_rdma (gf_rdma_peer_t *peer,
                                       struct iovec *vector, int count,
                                       gf_rdma_post_context_t *ctx)
@@ -3382,7 +3382,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                           size_t bytes_in_post)
 {
@@ -3957,7 +3957,7 @@ out:
 }
 
 
-static inline int32_t
+static int32_t
 gf_rdma_recv_request (gf_rdma_peer_t *peer, gf_rdma_post_t *post,
                       gf_rdma_read_chunk_t *readch)
 {
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index c5ab22f9941..b3a80d9ceb1 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -1186,7 +1186,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_msg (rpc_transport_t *this)
 {
         int                           ret            = 0;
@@ -1255,7 +1255,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_request (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1272,7 +1272,7 @@ __socket_read_simple_request (rpc_transport_t *this)
 #define rpc_progver_addr(buf) (buf + RPC_MSGTYPE_SIZE + 8)
 #define rpc_procnum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 12)
 
-static inline int
+static int
 __socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vector_sizer)
 {
         socket_private_t *priv                   = NULL;
@@ -1444,7 +1444,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 __socket_read_request (rpc_transport_t *this)
 {
         socket_private_t *priv               = NULL;
@@ -1525,7 +1525,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_accepted_successful_reply (rpc_transport_t *this)
 {
         socket_private_t *priv              = NULL;
@@ -1652,7 +1652,7 @@ out:
 #define rpc_reply_verflen_addr(fragcurrent) ((char *)fragcurrent - 4)
 #define rpc_reply_accept_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
-static inline int
+static int
 __socket_read_accepted_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1748,7 +1748,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_denied_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1758,7 +1758,7 @@ __socket_read_denied_reply (rpc_transport_t *this)
 #define rpc_reply_status_addr(fragcurrent) ((char *)fragcurrent - 4)
 
 
-static inline int
+static int
 __socket_read_vectored_reply (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1824,7 +1824,7 @@ out:
 }
 
 
-static inline int
+static int
 __socket_read_simple_reply (rpc_transport_t *this)
 {
         return __socket_read_simple_msg (this);
@@ -1832,7 +1832,7 @@ __socket_read_simple_reply (rpc_transport_t *this)
 
 #define rpc_xid_addr(buf) (buf)
 
-static inline int
+static int
 __socket_read_reply (rpc_transport_t *this)
 {
         socket_private_t   *priv         = NULL;
@@ -1907,7 +1907,7 @@ out:
 
 
 /* returns the number of bytes yet to be read in a fragment */
-static inline int
+static int
 __socket_read_frag (rpc_transport_t *this)
 {
         socket_private_t *priv           = NULL;
@@ -1984,7 +1984,7 @@ out:
 }
 
 
-static inline void
+static void
 __socket_reset_priv (socket_private_t *priv)
 {
         struct gf_sock_incoming   *in    = NULL;
diff --git a/tests/utils/arequal-checksum.c b/tests/utils/arequal-checksum.c
index d4e8688b9be..aede4f48adb 100644
--- a/tests/utils/arequal-checksum.c
+++ b/tests/utils/arequal-checksum.c
@@ -70,7 +70,7 @@ add_to_list (char *arg);
 void
 get_absolute_path (char directory[], char *arg);
 
-static inline int roof(int a, int b)
+static int roof(int a, int b)
 {
         return ((((a)+(b)-1)/((b)?(b):1))*(b));
 }
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 11d270e8007..474ab9b5020 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1618,7 +1618,7 @@ afr_read_subvol_decide (inode_t *inode, xlator_t *this,
         return data_subvol;
 }
 
-static inline int
+static int
 afr_first_up_child (call_frame_t *frame, xlator_t *this)
 {
         afr_private_t       *priv  = NULL;
@@ -3194,7 +3194,7 @@ afr_parallel_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         return 0;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 afr_is_conflicting_lock_present (int32_t op_ret, int32_t op_errno)
 {
         if (op_ret == -1 && op_errno == EAGAIN)
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c
index 8175a219ced..53bb7920089 100644
--- a/xlators/cluster/afr/src/afr-lk-common.c
+++ b/xlators/cluster/afr/src/afr-lk-common.c
@@ -996,7 +996,7 @@ afr_copy_locked_nodes (call_frame_t *frame, xlator_t *this)
 
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 afr_is_entrylk (afr_internal_lock_t *int_lock,
                 afr_transaction_type trans_type)
 {
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index 310e927769e..b58767c0277 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -104,7 +104,7 @@ out:
 	return ret;
 }
 
-static inline uint64_t
+static uint64_t
 mtime_ns(struct iatt *ia)
 {
         uint64_t ret;
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 2b4a150a02c..46809cff11a 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -137,7 +137,7 @@ afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent)
 }
 
 static uint64_t pump_pid = 0;
-static inline void
+static void
 pump_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent)
 {
         afr_update_loc_gfids (loc, iatt, parent);
diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c
index 2a9ad37f452..2abeec077ae 100644
--- a/xlators/cluster/dht/src/dht-diskusage.c
+++ b/xlators/cluster/dht/src/dht-diskusage.c
@@ -338,7 +338,7 @@ out:
 	return avail_subvol;
 }
 
-static inline
+static
 int32_t dht_subvol_has_err (dht_conf_t *conf, xlator_t *this,
                                          dht_layout_t *layout)
 {
diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c
index 72b3df022da..9bd7c7d8e9e 100644
--- a/xlators/cluster/dht/src/dht-hashfn.c
+++ b/xlators/cluster/dht/src/dht-hashfn.c
@@ -44,7 +44,7 @@ dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
 }
 
 
-static inline
+static
 gf_boolean_t
 dht_munge_name (const char *original, char *modified, size_t len, regex_t *re)
 {
@@ -77,13 +77,6 @@ dht_hash_compute (xlator_t *this, int type, const char *name, uint32_t *hash_p)
         size_t           len                    = 0;
         gf_boolean_t     munged                 = _gf_false;
 
-        /*
-         * It wouldn't be safe to use alloca in an inline function that doesn't
-         * actually get inlined, and it wouldn't be efficient to do a real
-         * allocation, so we use alloca here (if needed) and pass that to the
-         * inline.
-         */
-
         if (priv->extra_regex_valid) {
                 len = strlen(name) + 1;
                 rsync_friendly_name = alloca(len);
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index ca427a0625a..9cb56c54c54 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -30,7 +30,7 @@ dht_free_mig_info (void *data)
         return;
 }
 
-static inline int
+static int
 dht_inode_ctx_set_mig_info (xlator_t *this, inode_t *inode,
                             xlator_t *src_subvol, xlator_t *dst_subvol)
 {
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 94dfaf64f6d..a9fceb366f0 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -389,7 +389,7 @@ out:
          gf_defrag_handle_hardlink for description of "returning -2")
     -1 : failure
 */
-static inline int
+static int
 __is_file_migratable (xlator_t *this, loc_t *loc,
                       struct iatt *stbuf, dict_t *xattrs, int flags,
                                 gf_defrag_info_t *defrag)
@@ -634,7 +634,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 __dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
                         struct iatt *stbuf, int flag)
 {
@@ -744,7 +744,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 __dht_rebalance_migrate_data (xlator_t *from, xlator_t *to, fd_t *src, fd_t *dst,
                               uint64_t ia_size, int hole_exists)
 {
@@ -861,7 +861,7 @@ __tier_migrate_data (gf_defrag_info_t *defrag, xlator_t *from, xlator_t *to, fd_
 }
 
 
-static inline int
+static int
 __dht_rebalance_open_src_file (xlator_t *from, xlator_t *to, loc_t *loc,
                                struct iatt *stbuf, fd_t **src_fd,
                                gf_boolean_t *clean_src)
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 515069af417..d7d68ab621e 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -387,7 +387,7 @@ out:
         return fixit;
 }
 
-inline int
+int
 dht_layout_span (dht_layout_t *layout)
 {
         int i = 0, count = 0;
@@ -1284,7 +1284,7 @@ dht_selfheal_layout_alloc_start (xlator_t *this, loc_t *loc,
         return start;
 }
 
-static inline int
+static int
 dht_get_layout_count (xlator_t *this, dht_layout_t *layout, int new_layout)
 {
         int i = 0;
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index 944d3af50c3..0aa511f33a8 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -1068,7 +1068,7 @@ out:
         return ret;
 }
 
-static inline int
+static int
 tier_migrate_files_using_qfile (demotion_args_t *comp,
                                 query_cbk_args_t *query_cbk_args,
                                 char *qfile)
diff --git a/xlators/cluster/ec/src/ec-data.c b/xlators/cluster/ec/src/ec-data.c
index 73e7ad84d14..28bf988d09d 100644
--- a/xlators/cluster/ec/src/ec-data.c
+++ b/xlators/cluster/ec/src/ec-data.c
@@ -108,7 +108,7 @@ void ec_cbk_data_destroy(ec_cbk_data_t * cbk)
  * heal to complete as healing big file/directory could take a while. Which
  * will lead to hang on the mount.
  */
-static inline gf_boolean_t
+static gf_boolean_t
 ec_needs_graceful_completion (ec_fop_data_t *fop)
 {
         if ((fop->id != EC_FOP_HEAL) && (fop->id != EC_FOP_FHEAL))
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c
index 34ffea011d2..78479129620 100644
--- a/xlators/cluster/stripe/src/stripe.c
+++ b/xlators/cluster/stripe/src/stripe.c
@@ -4464,7 +4464,7 @@ stripe_is_bd (dict_t *this, char *key, data_t *value, void *data)
         return 0;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 stripe_setxattr_is_bd (dict_t *dict)
 {
         gf_boolean_t is_bd = _gf_false;
@@ -4633,7 +4633,7 @@ out:
         return ret;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 stripe_fsetxattr_is_special (dict_t *dict)
 {
         gf_boolean_t is_spl = _gf_false;
@@ -5574,7 +5574,7 @@ err:
         return 0;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 stripe_is_special_xattr (const char *name)
 {
         gf_boolean_t    is_spl = _gf_false;
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,};
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;
 }
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
index 9a9a9a6bb70..9f865f121c7 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
@@ -48,7 +48,7 @@ struct br_fsscan_entry {
  * NOTE: On success @xattr is not unref'd as @sign points
  * to the dictionary value.
  */
-static inline int32_t
+static int32_t
 bitd_fetch_signature (xlator_t *this, br_child_t *child,
                       fd_t *fd, dict_t **xattr, br_isignature_out_t **sign)
 {
@@ -151,7 +151,7 @@ bitd_scrub_post_compute_check (xlator_t *this,
 
 }
 
-static inline int32_t
+static int32_t
 bitd_signature_staleness (xlator_t *this,
                           br_child_t *child, fd_t *fd,
                           int *stale, unsigned long *version)
@@ -212,7 +212,7 @@ bitd_scrub_pre_compute_check (xlator_t *this, br_child_t *child,
         return ret;
 }
 
-/* static inline int */
+/* static int */
 int
 bitd_compare_ckum (xlator_t *this,
                    br_isignature_out_t *sign,
@@ -464,13 +464,13 @@ wait_for_scrubbing (xlator_t *this, struct br_scanfs *fsscan)
         pthread_cleanup_pop (0);
 }
 
-static inline void
+static void
 _br_fsscan_inc_entry_count (struct br_scanfs *fsscan)
 {
         fsscan->entries++;
 }
 
-static inline void
+static void
 _br_fsscan_dec_entry_count (struct br_scanfs *fsscan)
 {
         if (--fsscan->entries == 0) {
@@ -638,7 +638,7 @@ br_update_scrub_finish_time (xlator_t *this, char *timestr, struct timeval *tv)
         }
 }
 
-static inline void
+static void
 br_fsscanner_log_time (xlator_t *this, br_child_t *child, const char *sfx)
 {
         char           timestr[1024] = {0,};
@@ -694,7 +694,7 @@ br_fsscanner_wait_until_kicked (xlator_t *this, struct br_scanfs *fsscan)
         pthread_cleanup_pop (0);
 }
 
-static inline void
+static void
 br_fsscanner_entry_control (xlator_t *this, br_child_t *child)
 {
         struct br_scanfs *fsscan = &child->fsscan;
@@ -708,7 +708,7 @@ br_fsscanner_entry_control (xlator_t *this, br_child_t *child)
         UNLOCK (&child->lock);
 }
 
-static inline void
+static void
 br_fsscanner_exit_control (xlator_t *this, br_child_t *child)
 {
         struct br_scanfs *fsscan = &child->fsscan;
@@ -795,7 +795,7 @@ br_kickstart_scanner (struct gf_tw_timer_list *timer,
 
 }
 
-static inline uint32_t
+static uint32_t
 br_fsscan_calculate_delta (uint32_t times)
 {
         return times;
@@ -1010,7 +1010,7 @@ br_scrubber_calc_scale (xlator_t *this,
 
 }
 
-static inline br_child_t *
+static br_child_t *
 _br_scrubber_get_next_child (struct br_scrubber *fsscrub)
 {
         br_child_t *child = NULL;
@@ -1021,7 +1021,7 @@ _br_scrubber_get_next_child (struct br_scrubber *fsscrub)
         return child;
 }
 
-static inline void
+static void
 _br_scrubber_get_entry (br_child_t *child, struct br_fsscan_entry **fsentry)
 {
         struct br_scanfs *fsscan = &child->fsscan;
@@ -1033,7 +1033,7 @@ _br_scrubber_get_entry (br_child_t *child, struct br_fsscan_entry **fsentry)
         list_del_init (&(*fsentry)->list);
 }
 
-static inline void
+static void
 _br_scrubber_find_scrubbable_entry (struct br_scrubber *fsscrub,
                                      struct br_fsscan_entry **fsentry)
 {
@@ -1264,7 +1264,7 @@ br_scrubber_configure (xlator_t *this, br_private_t *priv,
         return ret;
 }
 
-static inline int32_t
+static int32_t
 br_scrubber_fetch_option (xlator_t *this,
                           char *opt, dict_t *options, char **value)
 {
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c b/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
index d9543416540..f8b9b75d575 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot-tbf.c
@@ -55,7 +55,7 @@ typedef struct br_tbf_throttle {
  */
 #define BR_TBF_TOKENGEN_INTERVAL_USEC  600000
 
-static inline br_tbf_throttle_t *
+static br_tbf_throttle_t *
 br_tbf_init_throttle (unsigned long tokens_required)
 {
         br_tbf_throttle_t *throttle = NULL;
@@ -137,7 +137,7 @@ void *br_tbf_tokengenerator (void *arg)
  * under br_tbf_mod() context) and br_tbf_throttle(). *bucket is
  * updated _after_ all the required variables are initialized.
  */
-static inline int32_t
+static int32_t
 br_tbf_init_bucket (br_tbf_t *tbf, br_tbf_opspec_t *spec)
 {
         int ret = 0;
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
index 9ec2e42bbf6..0eba4472a33 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot.c
@@ -123,7 +123,7 @@ br_brick_fini (void *xl, char *brick, void *data)
  * FIX: Send the string length as part of the signature struct and
  *      change stub to handle this change.
  */
-static inline br_isignature_t *
+static br_isignature_t *
 br_prepare_signature (const unsigned char *sign,
                       unsigned long hashlen,
                       int8_t hashtype, br_object_t *object)
@@ -186,7 +186,7 @@ out:
 /**
  * Do a lookup on the gfid present within the object.
  */
-static inline int32_t
+static int32_t
 br_object_lookup (xlator_t *this, br_object_t *object,
                   struct iatt *iatt, inode_t **linked_inode)
 {
@@ -234,7 +234,7 @@ out:
  * know that open is being done by bitd because syncop framework does not allow
  * passing xdata -- may be use frame->root->pid itself.
  */
-static inline int32_t
+static int32_t
 br_object_open (xlator_t *this,
                 br_object_t *object, inode_t *inode, fd_t **openfd)
 {
@@ -377,14 +377,14 @@ br_calculate_obj_checksum (unsigned char *md,
         return ret;
 }
 
-static inline int32_t
+static int32_t
 br_object_checksum (unsigned char *md,
                     br_object_t *object, fd_t *fd, struct iatt *iatt)
 {
         return br_calculate_obj_checksum (md, object->child, fd,  iatt);
 }
 
-static inline int32_t
+static int32_t
 br_object_read_sign (inode_t *linked_inode, fd_t *fd, br_object_t *object,
                      struct iatt *iatt)
 {
@@ -457,7 +457,7 @@ br_object_read_sign (inode_t *linked_inode, fd_t *fd, br_object_t *object,
         return ret;
 }
 
-static inline int br_object_sign_softerror (int32_t op_errno)
+static int br_object_sign_softerror (int32_t op_errno)
 {
         return ((op_errno == ENOENT) || (op_errno == ESTALE)
                 || (op_errno == ENODATA));
@@ -567,7 +567,7 @@ br_object_resign (xlator_t *this,
  * some form of priority scheduling and/or read burstness to avoid starving
  * (or kicking) client I/O's.
  */
-static inline int32_t br_sign_object (br_object_t *object)
+static int32_t br_sign_object (br_object_t *object)
 {
         int32_t         ret           = -1;
         inode_t        *linked_inode  = NULL;
@@ -636,7 +636,7 @@ static inline int32_t br_sign_object (br_object_t *object)
         return ret;
 }
 
-static inline br_object_t *__br_pick_object (br_private_t *priv)
+static br_object_t *__br_pick_object (br_private_t *priv)
 {
         br_object_t *object = NULL;
 
@@ -724,7 +724,7 @@ br_add_object_to_queue (struct gf_tw_timer_list *timer,
         return;
 }
 
-static inline br_object_t *
+static br_object_t *
 br_initialize_object (xlator_t *this, br_child_t *child, changelog_event_t *ev)
 {
         br_object_t *object = NULL;
@@ -746,7 +746,7 @@ out:
         return object;
 }
 
-static inline struct gf_tw_timer_list *
+static struct gf_tw_timer_list *
 br_initialize_timer (xlator_t *this, br_object_t *object, br_child_t *child,
                      changelog_event_t *ev)
 {
@@ -877,17 +877,7 @@ br_fill_brick_spec (struct gf_brick_spec *brick, char *path)
         brick->disconnected = NULL;
 }
 
-static inline gf_boolean_t
-br_time_equal (br_child_t *child, struct timeval *tv)
-{
-        if ((child->tv.tv_sec == tv->tv_sec) &&
-            (child->tv.tv_usec == tv->tv_usec))
-                return _gf_true;
-
-        return _gf_false;
-}
-
-static inline gf_boolean_t
+static gf_boolean_t
 br_check_object_need_sign (xlator_t *this, dict_t *xattr, br_child_t *child)
 {
         int32_t              ret       = -1;
@@ -1716,7 +1706,7 @@ notify (xlator_t *this, int32_t event, void *data, ...)
  * Initialize signer specific structures, spawn worker threads.
  */
 
-static inline void
+static void
 br_fini_signer (xlator_t *this, br_private_t *priv)
 {
         int i = 0;
@@ -1728,7 +1718,7 @@ br_fini_signer (xlator_t *this, br_private_t *priv)
         pthread_cond_destroy (&priv->object_cond);
 }
 
-static inline int32_t
+static int32_t
 br_init_signer (xlator_t *this, br_private_t *priv)
 {
         int i = 0;
diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
index 7f455f2f510..bbb2c92acf3 100644
--- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c
+++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
@@ -247,7 +247,7 @@ fini (xlator_t *this)
 	return;
 }
 
-static inline int
+static int
 br_stub_alloc_versions (br_version_t **obuf,
                         br_signature_t **sbuf, size_t signaturelen)
 {
@@ -277,13 +277,13 @@ br_stub_alloc_versions (br_version_t **obuf,
         return -1;
 }
 
-static inline void
+static void
 br_stub_dealloc_versions (void *mem)
 {
         GF_FREE (mem);
 }
 
-static inline br_stub_local_t *
+static br_stub_local_t *
 br_stub_alloc_local (xlator_t *this)
 {
         br_stub_private_t *priv = this->private;
@@ -291,13 +291,13 @@ br_stub_alloc_local (xlator_t *this)
         return mem_get0 (priv->local_pool);
 }
 
-static inline void
+static void
 br_stub_dealloc_local (br_stub_local_t *ptr)
 {
         mem_put (ptr);
 }
 
-static inline int
+static int
 br_stub_prepare_version_request (xlator_t *this, dict_t *dict,
                                 br_version_t *obuf, unsigned long oversion)
 {
@@ -310,7 +310,7 @@ br_stub_prepare_version_request (xlator_t *this, dict_t *dict,
                                     (void *)obuf, sizeof (br_version_t));
 }
 
-static inline int
+static int
 br_stub_prepare_signing_request (dict_t *dict,
                                  br_signature_t *sbuf,
                                  br_isignature_t *sign, size_t signaturelen)
@@ -329,7 +329,7 @@ br_stub_prepare_signing_request (dict_t *dict,
  * context, hence the inode is marked dirty. this routine also
  * initializes the transient inode version.
  */
-static inline int
+static int
 br_stub_init_inode_versions (xlator_t *this, fd_t *fd, inode_t *inode,
                              unsigned long version, gf_boolean_t markdirty,
                              gf_boolean_t bad_object)
@@ -370,7 +370,7 @@ free_ctx:
 /**
  * modify the ongoing version of an inode.
  */
-static inline int
+static int
 br_stub_mod_inode_versions (xlator_t *this,
                             fd_t *fd, inode_t *inode, unsigned long version)
 {
@@ -395,7 +395,7 @@ unblock:
         return ret;
 }
 
-static inline void
+static void
 br_stub_fill_local (br_stub_local_t *local,
                     call_stub_t *stub, fd_t *fd, inode_t *inode, uuid_t gfid,
                     int versioningtype, unsigned long memversion)
@@ -410,7 +410,7 @@ br_stub_fill_local (br_stub_local_t *local,
         gf_uuid_copy (local->u.context.gfid, gfid);
 }
 
-static inline void
+static void
 br_stub_cleanup_local (br_stub_local_t *local)
 {
         local->fopstub = NULL;
@@ -696,7 +696,7 @@ br_stub_fd_versioning (xlator_t *this, call_frame_t *frame,
         return ret;
 }
 
-static inline int
+static int
 br_stub_perform_incversioning (xlator_t *this,
                                call_frame_t *frame, call_stub_t *stub,
                                fd_t *fd, br_stub_inode_ctx_t *ctx)
@@ -804,7 +804,7 @@ orderq (struct list_head *elem1, struct list_head *elem2)
         return (s1->v > s2->v);
 }
 
-static inline int
+static int
 br_stub_compare_sign_version (xlator_t *this,
                               inode_t *inode,
                               br_signature_t *sbuf,
@@ -854,7 +854,7 @@ br_stub_compare_sign_version (xlator_t *this,
         return ret;
 }
 
-static inline int
+static int
 br_stub_prepare_signature (xlator_t *this,
                            dict_t *dict, inode_t *inode,
                            br_isignature_t *sign, int *fakesuccess)
@@ -1548,7 +1548,7 @@ br_stub_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         return 0;
 }
 
-static inline void
+static void
 br_stub_send_stub_init_time (call_frame_t *frame, xlator_t *this)
 {
         int op_ret = 0;
@@ -2369,7 +2369,7 @@ unwind:
  * successfully allocate the dict? Posix does not treat call back xdata
  * creattion failure as the lookup failure.
  */
-static inline int32_t
+static int32_t
 br_stub_lookup_version (xlator_t *this,
                         uuid_t gfid, inode_t *inode, dict_t *xattr)
 {
@@ -2812,7 +2812,7 @@ br_stub_noop (call_frame_t *frame, void *cookie, xlator_t *this,
         return 0;
 }
 
-static inline void
+static void
 br_stub_send_ipc_fop (xlator_t *this, fd_t *fd, unsigned long releaseversion,
                       int sign_info)
 {
diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
index 2a1e56ae79e..19c43cc8211 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
@@ -87,55 +87,6 @@ gf_changelog_connection_janitor (void *arg)
         return NULL;
 }
 
-static inline void
-__gf_changelog_set_conn_state (gf_changelog_t *entry,
-                               gf_changelog_conn_state_t state)
-{
-        entry->connstate = state;
-}
-
-/**
- * state check login to gaurd access object after free
- */
-static inline void
-gf_changelog_check_event (gf_private_t *priv,
-                          gf_changelog_t *entry, rpcsvc_event_t event)
-{
-        gf_boolean_t needfree = _gf_false;
-        gf_changelog_conn_state_t laststate;
-        /**
-         * need to handle couple of connection states to gaurd correct
-         * freeing of object.
-         */
-        LOCK (&entry->statelock);
-        {
-                laststate = entry->connstate;
-                if (event == RPCSVC_EVENT_ACCEPT) {
-                        __gf_changelog_set_conn_state
-                                (entry, GF_CHANGELOG_CONN_STATE_ACCEPTED);
-
-                        if (laststate == GF_CHANGELOG_CONN_STATE_DISCONNECTED)
-                                needfree = _gf_true;
-                }
-
-                if (event == RPCSVC_EVENT_DISCONNECT) {
-                        __gf_changelog_set_conn_state
-                                (entry, GF_CHANGELOG_CONN_STATE_DISCONNECTED);
-
-                        if (laststate == GF_CHANGELOG_CONN_STATE_ACCEPTED)
-                                needfree = _gf_true;
-                }
-        }
-        UNLOCK (&entry->statelock);
-
-        /**
-         * TODO:
-         * Handle the  race between ACCEPT and DISCONNECT in the
-         * reconnect code. So purging of entry is deliberately
-         * avoided here. It will be handled in the reconnect code.
-         */
-}
-
 int
 gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
                                    rpcsvc_event_t event, void *data)
@@ -173,8 +124,6 @@ gf_changelog_reborp_rpcsvc_notify (rpcsvc_t *rpc, void *mydata,
                 break;
         }
 
-        /* gf_changelog_check_event (priv, entry, event); */
-
         return 0;
 }
 
@@ -230,7 +179,7 @@ gf_changelog_invoke_callback (gf_changelog_t *entry,
  * dynamically allocated and ordered.
  */
 
-inline int
+int
 __is_expected_sequence (struct gf_event_list *ev, struct gf_event *event)
 {
         return (ev->next_seq == event->seq);
diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c
index bc953369343..c528a24f017 100644
--- a/xlators/features/changelog/lib/src/gf-changelog.c
+++ b/xlators/features/changelog/lib/src/gf-changelog.c
@@ -44,7 +44,7 @@
  */
 xlator_t *master = NULL;
 
-static inline
+static
 gf_private_t *gf_changelog_alloc_priv ()
 {
         int ret = 0;
diff --git a/xlators/features/changelog/src/changelog-encoders.c b/xlators/features/changelog/src/changelog-encoders.c
index ea395e11f90..4e06abfb5ce 100644
--- a/xlators/features/changelog/src/changelog-encoders.c
+++ b/xlators/features/changelog/src/changelog-encoders.c
@@ -133,7 +133,7 @@ del_entry_free_fn (void *data)
  * try to write all data in one shot
  */
 
-static inline void
+static void
 changelog_encode_write_xtra (changelog_log_data_t *cld,
                              char *buffer, size_t *off, gf_boolean_t encode)
 {
diff --git a/xlators/features/changelog/src/changelog-ev-handle.c b/xlators/features/changelog/src/changelog-ev-handle.c
index ca7443cfd22..bcce28ebd7e 100644
--- a/xlators/features/changelog/src/changelog-ev-handle.c
+++ b/xlators/features/changelog/src/changelog-ev-handle.c
@@ -42,7 +42,7 @@ changelog_event_dispatch_cbk (struct rpc_req *req,
 }
 
 /* dispatcher RPC */
-inline int
+int
 changelog_dispatch_vec (call_frame_t *frame, xlator_t *this,
                         struct rpc_clnt *rpc, struct ev_rpc_vec *vec)
 {
@@ -241,7 +241,7 @@ changelog_ev_cleanup_connections (xlator_t *this, changelog_clnt_t *c_clnt)
  * a performance bottleneck.
  */
 
-static inline changelog_rpc_clnt_t *
+static changelog_rpc_clnt_t *
 get_client (changelog_clnt_t *c_clnt, struct list_head **next)
 {
         changelog_rpc_clnt_t *crpc = NULL;
@@ -260,7 +260,7 @@ get_client (changelog_clnt_t *c_clnt, struct list_head **next)
         return crpc;
 }
 
-static inline void
+static void
 put_client (changelog_clnt_t *c_clnt, changelog_rpc_clnt_t *crpc)
 {
         LOCK (&c_clnt->active_lock);
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)
 {
diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c
index c7c0fffa9f5..005ac15c3c7 100644
--- a/xlators/features/changelog/src/changelog-rpc.c
+++ b/xlators/features/changelog/src/changelog-rpc.c
@@ -187,7 +187,7 @@ changelog_rpc_clnt_cleanup (changelog_rpc_clnt_t *crpc)
         GF_FREE (crpc);
 }
 
-static inline changelog_rpc_clnt_t *
+static changelog_rpc_clnt_t *
 changelog_rpc_clnt_init (xlator_t *this,
                          changelog_probe_req *rpc_req, changelog_clnt_t *c_clnt)
 {
diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c
index 09dd55626d4..8898d51344f 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -2454,7 +2454,7 @@ changelog_barrier_pthread_init (xlator_t *this, changelog_priv_t *priv)
 }
 
 /* Destroy barrier related condition variables and locks */
-static inline void
+static void
 changelog_barrier_pthread_destroy (changelog_priv_t *priv)
 {
         pthread_mutex_destroy (&priv->bn.bnotify_mutex);
diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.c b/xlators/features/changetimerecorder/src/changetimerecorder.c
index de42c3f629b..47de911d200 100644
--- a/xlators/features/changetimerecorder/src/changetimerecorder.c
+++ b/xlators/features/changetimerecorder/src/changetimerecorder.c
@@ -79,7 +79,7 @@ What is pending:
 /* This function doesnot write anything to the db,
  * just created the local variable
  * for the frame and sets values for the ctr_db_record */
-static inline int
+static int
 ctr_lookup_wind(call_frame_t                    *frame,
                 xlator_t                        *this,
                 gf_ctr_inode_context_t          *ctr_inode_cx)
@@ -151,7 +151,7 @@ out:
 
 /* This function inserts the ctr_db_record populated by ctr_lookup_wind
  * in to the db. It also destroys the frame->local created by ctr_lookup_wind */
-static inline int
+static int
 ctr_lookup_unwind (call_frame_t          *frame,
                    xlator_t              *this)
 {
diff --git a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
index b5a54c0b5e4..c5900eac929 100644
--- a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
+++ b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
@@ -17,7 +17,7 @@
         (ctr_hard_link->list.next == ctr_hard_link->list.prev)
 
 
-static inline void
+static void
 fini_ctr_hard_link (ctr_hard_link_t **ctr_hard_link) {
 
         GF_ASSERT (ctr_hard_link);
@@ -246,7 +246,7 @@ out:
 
 
 /* Delete all hardlinks */
-static inline int
+static int
 ctr_delete_all_hard_link (xlator_t *this,
                           ctr_xlator_ctx_t *ctr_xlator_ctx)
 {
@@ -277,7 +277,7 @@ ctr_delete_all_hard_link (xlator_t *this,
 
 
 /* Please lock the inode before using this function */
-static inline ctr_xlator_ctx_t *
+static ctr_xlator_ctx_t *
 __get_ctr_xlator_ctx (xlator_t  *this,
                       inode_t   *inode)
 {
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 3a717def2f6..18df622c7aa 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -33,7 +33,7 @@ __index_dequeue (struct list_head *callstubs)
         return stub;
 }
 
-inline static void
+static void
 __index_enqueue (struct list_head *callstubs, call_stub_t *stub)
 {
         list_add_tail (&stub->list, callstubs);
@@ -720,7 +720,7 @@ xattrop_index_action (xlator_t *this, inode_t *inode, dict_t *xattr,
         return;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 index_xattrop_track (xlator_t *this, gf_xattrop_flags_t flags, dict_t *dict)
 {
         index_priv_t *priv = this->private;
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 04ffd6d387b..a4b5969a189 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -98,7 +98,7 @@ names_conflict (const char *n1, const char *n2)
 }
 
 
-static inline int
+static int
 __same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
 {
         return (is_same_lkowner (&l1->owner, &l2->owner) &&
@@ -106,7 +106,7 @@ __same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
 }
 
 /* Just as in inodelk, allow conflicting name locks from same (lk_owner, conn)*/
-static inline int
+static int
 __conflicting_entrylks (pl_entry_lock_t *l1, pl_entry_lock_t *l2)
 {
         if (names_conflict (l1->basename, l2->basename)
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index 9860e9f9079..cfff4fa23b2 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -23,19 +23,19 @@
 #include "locks.h"
 #include "common.h"
 
-inline void
+void
 __delete_inode_lock (pl_inode_lock_t *lock)
 {
         list_del_init (&lock->list);
 }
 
-static inline void
+static void
 __pl_inodelk_ref (pl_inode_lock_t *lock)
 {
         lock->ref++;
 }
 
-inline void
+void
 __pl_inodelk_unref (pl_inode_lock_t *lock)
 {
         lock->ref--;
@@ -46,7 +46,7 @@ __pl_inodelk_unref (pl_inode_lock_t *lock)
 }
 
 /* Check if 2 inodelks are conflicting on type. Only 2 shared locks don't conflict */
-static inline int
+static int
 inodelk_type_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
 {
         if (l2->fl_type == F_WRLCK || l1->fl_type == F_WRLCK)
@@ -120,7 +120,7 @@ inodelk_overlap (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
 }
 
 /* Returns true if the 2 inodelks have the same owner */
-static inline int
+static int
 same_inodelk_owner (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
 {
         return (is_same_lkowner (&l1->owner, &l2->owner) &&
@@ -831,7 +831,7 @@ pl_finodelk (call_frame_t *frame, xlator_t *this,
 
 }
 
-static inline int32_t
+static int32_t
 __get_inodelk_dom_count (pl_dom_list_t *dom)
 {
         pl_inode_lock_t     *lock   = NULL;
diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c
index 11abd26d85f..df3562f90ba 100644
--- a/xlators/features/locks/src/reservelk.c
+++ b/xlators/features/locks/src/reservelk.c
@@ -71,7 +71,7 @@ out:
         return ret_lock;
 }
 
-static inline int
+static int
 __same_owner_reservelk (posix_lock_t *l1, posix_lock_t *l2)
 {
         return (is_same_lkowner (&l1->owner, &l2->owner));
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 5504cf55c1f..0a9d3a74560 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2419,7 +2419,7 @@ out:
         return ret;
 }
 
-static inline gf_boolean_t
+static gf_boolean_t
 marker_xattr_cleanup_cmd (dict_t *dict)
 {
         return (dict_get (dict, VIRTUAL_QUOTA_XATTR_CLEANUP_KEY) != NULL);
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index 940baea7081..b65956b2660 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -185,7 +185,7 @@ out:
 }
 
 
-static inline quota_local_t *
+static quota_local_t *
 quota_local_new ()
 {
         quota_local_t *local = NULL;
@@ -268,7 +268,7 @@ quota_dentry_del (quota_inode_ctx_t *ctx, const char *name, uuid_t par)
         UNLOCK (&ctx->lock);
 }
 
-static inline inode_t*
+static inode_t*
 __quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
 {
         inode_t *parent            = NULL;
@@ -278,7 +278,7 @@ __quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
         return parent;
 }
 
-static inline inode_t*
+static inode_t*
 quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)
 {
         inode_t *parent            = NULL;
@@ -509,7 +509,7 @@ out:
                 inode_unref (cur_inode);
 }
 
-static inline void
+static void
 quota_link_count_decrement (call_frame_t *frame)
 {
         call_frame_t   *tmpframe   = NULL;
@@ -553,7 +553,7 @@ out:
         return;
 }
 
-static inline void
+static void
 quota_handle_validate_error (call_frame_t *frame, int32_t op_ret,
                              int32_t op_errno)
 {
@@ -649,7 +649,7 @@ unwind:
 }
 
 
-static inline uint64_t
+static uint64_t
 quota_time_elapsed (struct timeval *now, struct timeval *then)
 {
         return (now->tv_sec - then->tv_sec);
@@ -674,7 +674,7 @@ quota_timeout (struct timeval *tv, int32_t timeout)
 /* Return: 1 if new entry added
  *         0 no entry added
  */
-static inline int32_t
+static int32_t
 quota_add_parent (struct list_head *list, char *name, uuid_t pgfid)
 {
         quota_dentry_t *entry = NULL;
@@ -706,7 +706,7 @@ out:
  * context and add unique parent to the list
  * Returns number of dentry added to the list
  */
-static inline int32_t
+static int32_t
 quota_add_parents_from_ctx (quota_inode_ctx_t *ctx, struct list_head *list)
 {
         int                ret     = 0;
@@ -1414,7 +1414,7 @@ out:
         return parent;
 }
 
-static inline int
+static int
 quota_get_limits (xlator_t *this, dict_t *dict, int64_t *hard_lim,
                   int64_t *soft_lim, int64_t *object_hard_limit,
                   int64_t *object_soft_limit)
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)
 {
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 6ea794a111d..72dd60c4ed4 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -602,7 +602,7 @@ fuse_lookup (xlator_t *this, fuse_in_header_t *finh, void *msg)
         return;
 }
 
-static inline void
+static void
 do_forget(xlator_t *this, uint64_t unique, uint64_t nodeid, uint64_t nlookup)
 {
 	inode_t *fuse_inode = fuse_ino_to_inode(nodeid, this);
diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c
index a670f4f6dac..46a1d711246 100644
--- a/xlators/mount/fuse/src/fuse-resolve.c
+++ b/xlators/mount/fuse/src/fuse-resolve.c
@@ -398,7 +398,7 @@ out:
 }
 
 
-static inline int
+static int
 fuse_migrate_fd_error (xlator_t *this, fd_t *fd)
 {
         fuse_fd_ctx_t *fdctx = NULL;
diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c
index 2d9af4e8c79..730e0a97d20 100644
--- a/xlators/nfs/server/src/auth-cache.c
+++ b/xlators/nfs/server/src/auth-cache.c
@@ -184,7 +184,7 @@ out:
  *
  * @return: true when the auth_cache_entry is expired, false otherwise.
  */
-static inline int
+static int
 _auth_cache_expired (struct auth_cache *cache, struct auth_cache_entry *entry)
 {
         return ((time (NULL) - entry->timestamp) > cache->ttl_sec);
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index f2b7cd1151c..1ca76b2e897 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -67,7 +67,7 @@ typedef ssize_t (*mnt3_serializer) (struct iovec outmsg, void *args);
 extern void *
 mount3udp_thread (void *argv);
 
-static inline void
+static void
 mnt3_export_free (struct mnt3_export *exp)
 {
         if (!exp)
@@ -207,7 +207,7 @@ out:
  *
  * Not for external use.
  */
-inline void
+void
 __mountdict_remove (struct mount3_state *ms, struct mountentry *me)
 {
         dict_del (ms->mountdict, me->hashkey);
@@ -1914,7 +1914,7 @@ out:
  * a write operation.
  *
  */
-inline int
+int
 mnt3_check_cached_fh (struct mount3_state *ms, struct nfs3_fh *fh,
                       const char *host_addr, gf_boolean_t is_write_op)
 {
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index f2219d21003..985d08b01eb 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -263,7 +263,7 @@ nfs3_errno_to_nfsstat3 (int errnum)
  * 0 which means something came wrong from upper layer(s). If it
  * happens by any means, then set NFS3 status to NFS3ERR_SERVERFAULT.
  */
-inline nfsstat3
+nfsstat3
 nfs3_cbk_errno_status (int32_t op_ret, int32_t op_errno)
 {
         if ((op_ret == -1) && (op_errno == 0)) {
@@ -3967,7 +3967,7 @@ __nfs3_fh_auth_get_peer (const rpcsvc_request_t *req, char *peer)
  *          -EACCES for completely unauthorized fop
  *          -EROFS  for unauthorized write operations (rm, mkdir, write)
  */
-inline int
+int
 nfs3_fh_auth_nfsop (nfs3_call_state_t *cs, gf_boolean_t is_write_op)
 {
         struct nfs_state    *nfs = NULL;
diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index 7eea867218f..62bedb6e644 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -31,7 +31,7 @@ ioc_get_priority (ioc_table_t *table, const char *path);
 struct volume_options options[];
 
 
-static inline uint32_t
+static uint32_t
 ioc_hashfn (void *data, int len)
 {
         off_t offset;
@@ -44,7 +44,7 @@ ioc_hashfn (void *data, int len)
 /* TODO: This function is not used, uncomment when we find a
          usage for this function.
 
-static inline ioc_inode_t *
+static ioc_inode_t *
 ioc_inode_reupdate (ioc_inode_t *ioc_inode)
 {
         ioc_table_t *table = NULL;
@@ -58,7 +58,7 @@ ioc_inode_reupdate (ioc_inode_t *ioc_inode)
 }
 
 
-static inline ioc_inode_t *
+static ioc_inode_t *
 ioc_get_inode (dict_t *dict, char *name)
 {
         ioc_inode_t *ioc_inode      = NULL;
@@ -499,7 +499,7 @@ out:
         return ret;
 }
 
-static inline uint32_t
+static uint32_t
 is_match (const char *path, const char *pattern)
 {
         int32_t ret = 0;
diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c
index 8aaffa6b27a..23bd46bf85e 100644
--- a/xlators/storage/bd/src/bd-helper.c
+++ b/xlators/storage/bd/src/bd-helper.c
@@ -569,7 +569,7 @@ out:
         return ret;
 }
 
-inline void
+void
 bd_update_amtime(struct iatt *iatt, int flag)
 {
         struct timespec ts = {0, };
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 380b5b676dc..8132f57ffdb 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3225,7 +3225,7 @@ _handle_setxattr_keyvalue_pair (dict_t *d, char *k, data_t *v,
 }
 
 #ifdef GF_DARWIN_HOST_OS
-static inline int
+static int
 map_xattr_flags(int flags)
 {
         /* DARWIN has different defines on XATTR_ flags.