From f364d963b63a13979d07f7871a3c02b205e20bed Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 26 Feb 2015 13:59:02 +0100 Subject: dht: fix for dht_lock_count() compile error dht-common.h includes a function definition with "inline", but the function is not declared in the header. Dropping the "inline" compile directive so that linking against .o files works correctly. BUG: 1196650 Change-Id: I105be591125b29cd455769b0c4ff22d6e139227d Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/9760 Tested-by: Gluster Build System Reviewed-by: Shyamsundar Ranganathan Reviewed-by: Raghavendra G Tested-by: Raghavendra G --- xlators/cluster/dht/src/dht-common.h | 2 +- xlators/cluster/dht/src/dht-helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 27fe9adab56..9e0228aa279 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -907,7 +907,7 @@ dht_lock_new (xlator_t *this, xlator_t *xl, loc_t *loc, short type, void dht_lock_array_free (dht_lock_t **lk_array, int count); -inline int32_t +int32_t dht_lock_count (dht_lock_t **lk_array, int lk_count); int diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index f6b3362da4f..bf21f39a3a7 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -1431,7 +1431,7 @@ dht_inodelk_cleanup_cbk (call_frame_t *frame, void *cookie, return 0; } -inline int32_t +int32_t dht_lock_count (dht_lock_t **lk_array, int lk_count) { int i = 0, locked = 0; -- cgit