summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-02-26 13:59:02 +0100
committerRaghavendra G <rgowdapp@redhat.com>2015-02-26 09:14:06 -0800
commitf364d963b63a13979d07f7871a3c02b205e20bed (patch)
treea4a116a5003ea1801d595eaa838790ba1145eacc /xlators
parent0e3fd04e93b163f27ecbea4a3a777c041b4352b4 (diff)
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 <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9760 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/dht/src/dht-common.h2
-rw-r--r--xlators/cluster/dht/src/dht-helper.c2
2 files changed, 2 insertions, 2 deletions
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;