summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnoop C S <achiraya@redhat.com>2015-05-29 16:33:09 +0530
committerVenky Shankar <vshankar@redhat.com>2015-06-01 06:56:04 -0700
commitf266dc6be5b401a7a813adc958d978eb9207cd63 (patch)
tree8a13a05e788c22d2223dd66c05319f53c7095efa
parentcabb28a028b70172c45c72598e1ac43fbed08411 (diff)
features/changelog: Remove inline keyword to avoid warnings (gcc v5.1.1)v3.7.1
Backport of http://review.gluster.org/11004 When compiled with gcc5, following warnings were displayed and volume start failed: changelog-helpers.h:499:1: warning: inline function 'changelog_dispatch_event' declared but never defined changelog_dispatch_event (xlator_t *, changelog_priv_t *, changelog_event_t *); gf-changelog-journal-handler.c:692:17: warning: 'list_add_tail' is static but used in inline function 'gf_changelog_queue_journal' which is not static list_add_tail (&entry->list, &jnl_proc->entries); Fix is to remove the keyword from function prototype and definitions. Change-Id: I188b35b7ca087a94d7a48a052b05a6d845e3b74b BUG: 1226853 Signed-off-by: Anoop C S <achiraya@redhat.com> Reviewed-on: http://review.gluster.org/11030 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-journal-handler.c2
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog-reborp.c4
-rw-r--r--xlators/features/changelog/src/changelog-helpers.c12
-rw-r--r--xlators/features/changelog/src/changelog-helpers.h12
-rw-r--r--xlators/features/changelog/src/changelog-rpc.c2
5 files changed, 16 insertions, 16 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
index e5bc38f..2975b06 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c
@@ -671,7 +671,7 @@ gf_changelog_process (void *data)
return NULL;
}
-inline void
+void
gf_changelog_queue_journal (gf_changelog_processor_t *jnl_proc,
changelog_event_t *event)
{
diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
index 457d829..2a1e56a 100644
--- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c
+++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c
@@ -197,7 +197,7 @@ gf_changelog_reborp_init_rpc_listner (xlator_t *this,
*
* @FIXME: cleanup this bugger once server filters events.
*/
-inline void
+void
gf_changelog_invoke_callback (gf_changelog_t *entry,
struct iovec **vec, int payloadcnt)
{
@@ -236,7 +236,7 @@ __is_expected_sequence (struct gf_event_list *ev, struct gf_event *event)
return (ev->next_seq == event->seq);
}
-inline int
+int
__can_process_event (struct gf_event_list *ev, struct gf_event **event)
{
*event = list_first_entry (&ev->events, struct gf_event, list);
diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c
index 847b9d2..7e518f1 100644
--- a/xlators/features/changelog/src/changelog-helpers.c
+++ b/xlators/features/changelog/src/changelog-helpers.c
@@ -105,7 +105,7 @@ changelog_selector_index (unsigned int selector)
return (ffs (selector) - 1);
}
-inline int
+int
changelog_ev_selected (xlator_t *this,
changelog_ev_selector_t *selection,
unsigned int selector)
@@ -121,7 +121,7 @@ changelog_ev_selected (xlator_t *this,
&& (selection->ref[idx] > 0));
}
-inline void
+void
changelog_select_event (xlator_t *this,
changelog_ev_selector_t *selection,
unsigned int selector)
@@ -143,7 +143,7 @@ changelog_select_event (xlator_t *this,
UNLOCK (&selection->reflock);
}
-inline void
+void
changelog_deselect_event (xlator_t *this,
changelog_ev_selector_t *selection,
unsigned int selector)
@@ -165,7 +165,7 @@ changelog_deselect_event (xlator_t *this,
UNLOCK (&selection->reflock);
}
-inline int
+int
changelog_init_event_selection (xlator_t *this,
changelog_ev_selector_t *selection)
{
@@ -187,7 +187,7 @@ changelog_init_event_selection (xlator_t *this,
return 0;
}
-inline int
+int
changelog_cleanup_event_selection (xlator_t *this,
changelog_ev_selector_t *selection)
{
@@ -226,7 +226,7 @@ changelog_perform_dispatch (xlator_t *this,
rbuf_write_complete (opaque);
}
-inline void
+void
changelog_dispatch_event (xlator_t *this,
changelog_priv_t *priv, changelog_event_t *ev)
{
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index 4416b9c..6219d8d 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -486,17 +486,17 @@ changelog_fill_entry_buf (call_frame_t *frame, xlator_t *this,
loc_t *loc, changelog_local_t **local);
/* event selection routines */
-inline void changelog_select_event (xlator_t *,
+void changelog_select_event (xlator_t *,
changelog_ev_selector_t *, unsigned int);
-inline void changelog_deselect_event (xlator_t *,
+void changelog_deselect_event (xlator_t *,
changelog_ev_selector_t *, unsigned int);
-inline int changelog_init_event_selection (xlator_t *,
+int changelog_init_event_selection (xlator_t *,
changelog_ev_selector_t *);
-inline int changelog_cleanup_event_selection (xlator_t *,
+int changelog_cleanup_event_selection (xlator_t *,
changelog_ev_selector_t *);
-inline int changelog_ev_selected (xlator_t *,
+int changelog_ev_selected (xlator_t *,
changelog_ev_selector_t *, unsigned int);
-inline void
+void
changelog_dispatch_event (xlator_t *, changelog_priv_t *, changelog_event_t *);
changelog_inode_ctx_t *
diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c
index ffbc61e..c7c0fff 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);
}
-inline changelog_rpc_clnt_t *
+static inline changelog_rpc_clnt_t *
changelog_rpc_clnt_init (xlator_t *this,
changelog_probe_req *rpc_req, changelog_clnt_t *c_clnt)
{