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/cluster/dht/src/dht-helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/cluster/dht/src/dht-helper.c') diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 346d19bec88..35d3d0f9dba 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -674,7 +674,7 @@ dht_iatt_merge (xlator_t *this, struct iatt *to, to->ia_dev = from->ia_dev; - uuid_copy (to->ia_gfid, from->ia_gfid); + gf_uuid_copy (to->ia_gfid, from->ia_gfid); to->ia_ino = from->ia_ino; to->ia_prot = from->ia_prot; @@ -914,7 +914,7 @@ dht_migration_complete_check_task (void *data) goto out; } - if (uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) { + if (gf_uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) { gf_msg (this->name, GF_LOG_ERROR, 0, DHT_MSG_GFID_MISMATCH, "%s: gfid different on the target file on %s", @@ -1111,7 +1111,7 @@ dht_rebalance_inprogress_task (void *data) goto out; } - if (uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) { + if (gf_uuid_compare (stbuf.ia_gfid, local->loc.inode->gfid)) { gf_msg (this->name, GF_LOG_ERROR, 0, DHT_MSG_GFID_MISMATCH, "%s: gfid different on the target file on %s", @@ -1693,7 +1693,7 @@ dht_lock_request_cmp (const void *val1, const void *val2) ret = strcmp (lock1->xl->name, lock2->xl->name); if (ret == 0) { - ret = uuid_compare (lock1->loc.gfid, lock2->loc.gfid); + ret = gf_uuid_compare (lock1->loc.gfid, lock2->loc.gfid); } out: -- cgit