summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/common-utils.c8
-rw-r--r--libglusterfs/src/fd.c4
-rw-r--r--libglusterfs/src/gfdb/gfdb_data_store.c2
-rw-r--r--libglusterfs/src/gfdb/gfdb_sqlite3.c22
-rw-r--r--libglusterfs/src/gfdb/gfdb_sqlite3_helper.c14
-rw-r--r--libglusterfs/src/rbthash.c4
-rw-r--r--libglusterfs/src/rot-buffs.c36
-rw-r--r--libglusterfs/src/timer.c2
8 files changed, 46 insertions, 46 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 2d61b40fd0c..303ee665440 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2485,7 +2485,7 @@ out:
* nr
*/
-inline int32_t
+int32_t
gf_roundup_power_of_two (int32_t nr)
{
int32_t result = 1;
@@ -2509,7 +2509,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;
@@ -3390,7 +3390,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;
@@ -3406,7 +3406,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 eb1e83b87a3..373f8da0f48 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -303,7 +303,7 @@ out:
}
-inline void
+void
gf_fd_put (fdtable_t *fdtable, int32_t fd)
{
fd_t *fdptr = NULL;
@@ -350,7 +350,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 8559a626e18..e1786a6ab06 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 9fd2d181c45..4b1163d3ce4 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);
@@ -288,7 +288,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 68e0991bff2..0e27e00ed05 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
@@ -20,7 +20,7 @@
*
* ****************************************************************************/
-static inline int
+static int
gf_sql_delete_all (gf_sql_connection_t *sql_conn,
char *gfid)
{
@@ -118,7 +118,7 @@ out:
return ret;
}
-static inline int
+static int
gf_sql_delete_link (gf_sql_connection_t *sql_conn,
char *gfid,
char *pargfid,
@@ -201,7 +201,7 @@ out:
-static inline int
+static int
gf_sql_update_link_flags (gf_sql_connection_t *sql_conn,
char *gfid,
char *pargfid,
@@ -303,7 +303,7 @@ out:
}
-static inline int
+static int
gf_sql_insert_link (gf_sql_connection_t *sql_conn,
char *gfid,
char *pargfid,
@@ -416,7 +416,7 @@ out:
}
-static inline int
+static int
gf_sql_update_link (gf_sql_connection_t *sql_conn,
char *gfid,
char *pargfid,
@@ -537,7 +537,7 @@ out:
return ret;
}
-static inline int
+static int
gf_sql_insert_write_wind_time (gf_sql_connection_t *sql_conn,
char *gfid,
gfdb_time_t *wind_time)
@@ -618,7 +618,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..4f3eb35fa96 100644
--- a/libglusterfs/src/rot-buffs.c
+++ b/libglusterfs/src/rot-buffs.c
@@ -46,7 +46,7 @@ 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 c3069d6fe18..acd34d8b2a8 100644
--- a/libglusterfs/src/timer.c
+++ b/libglusterfs/src/timer.c
@@ -120,7 +120,7 @@ unlock:
return -1;
}
-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);