From 28397cae4102ac3f08576ebaf071ad92683097e8 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 2 Apr 2015 15:51:30 +0200 Subject: Avoid conflict between contrib/uuid and system uuid glusterfs relies on Linux uuid implementation, which API is incompatible with most other systems's uuid. As a result, libglusterfs has to embed contrib/uuid, which is the Linux implementation, on non Linux systems. This implementation is incompatible with systtem's built in, but the symbols have the same names. Usually this is not a problem because when we link with -lglusterfs, libc's symbols are trumped. However there is a problem when a program not linked with -lglusterfs will dlopen() glusterfs component. In such a case, libc's uuid implementation is already loaded in the calling program, and it will be used instead of libglusterfs's implementation, causing crashes. A possible workaround is to use pre-load libglusterfs in the calling program (using LD_PRELOAD on NetBSD for instance), but such a mechanism is not portable, nor is it flexible. A much better approach is to rename libglusterfs's uuid_* functions to gf_uuid_* to avoid any possible conflict. This is what this change attempts. BUG: 1206587 Change-Id: I9ccd3e13afed1c7fc18508e92c7beb0f5d49f31a Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/10017 Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- xlators/debug/io-stats/src/io-stats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/debug') diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index 6fba80c5e43..7acc3803107 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -450,7 +450,7 @@ ios_stat_add_to_list (struct ios_stat_head *list_head, uint64_t value, if (cnt == list_head->members) last = entry; - if (!uuid_compare (iosstat->gfid, + if (!gf_uuid_compare (iosstat->gfid, entry->iosstat->gfid)) { list_entry = entry; found = cnt; @@ -1258,7 +1258,7 @@ io_stats_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto unwind; } iosstat->filename = gf_strdup (path); - uuid_copy (iosstat->gfid, buf->ia_gfid); + gf_uuid_copy (iosstat->gfid, buf->ia_gfid); LOCK_INIT (&iosstat->lock); ios_inode_ctx_set (fd->inode, this, iosstat); @@ -1308,7 +1308,7 @@ io_stats_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_io_stats_mt_ios_stat); if (iosstat) { iosstat->filename = gf_strdup (path); - uuid_copy (iosstat->gfid, fd->inode->gfid); + gf_uuid_copy (iosstat->gfid, fd->inode->gfid); LOCK_INIT (&iosstat->lock); ios_inode_ctx_set (fd->inode, this, iosstat); } @@ -1562,7 +1562,7 @@ io_stats_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (iosstat) { LOCK_INIT (&iosstat->lock); iosstat->filename = gf_strdup(path); - uuid_copy (iosstat->gfid, buf->ia_gfid); + gf_uuid_copy (iosstat->gfid, buf->ia_gfid); ios_inode_ctx_set (inode, this, iosstat); } -- cgit