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/mount/fuse/src/fuse-helpers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/mount/fuse/src/fuse-helpers.c') diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index a28169a0021..a8d387fdd4b 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -386,7 +386,7 @@ fuse_loc_fill (loc_t *loc, fuse_state_t *state, ino_t ino, parent = fuse_ino_to_inode (par, state->this); loc->parent = parent; if (parent) - uuid_copy (loc->pargfid, parent->gfid); + gf_uuid_copy (loc->pargfid, parent->gfid); } inode = loc->inode; @@ -409,7 +409,7 @@ fuse_loc_fill (loc_t *loc, fuse_state_t *state, ino_t ino, inode = fuse_ino_to_inode (ino, state->this); loc->inode = inode; if (inode) - uuid_copy (loc->gfid, inode->gfid); + gf_uuid_copy (loc->gfid, inode->gfid); } parent = loc->parent; @@ -417,7 +417,7 @@ fuse_loc_fill (loc_t *loc, fuse_state_t *state, ino_t ino, parent = inode_parent (inode, null_gfid, NULL); loc->parent = parent; if (parent) - uuid_copy (loc->pargfid, parent->gfid); + gf_uuid_copy (loc->pargfid, parent->gfid); } -- cgit