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 <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10017
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c
index c014b826620..19e6d2d96bf 100644
--- a/heal/src/glfs-heal.c
+++ b/heal/src/glfs-heal.c
@@ -71,7 +71,7 @@ glfsh_get_index_dir_loc (loc_t *rootloc, xlator_t *xl, loc_t *dirloc,
                 goto out;
         }
 
-        uuid_copy (dirloc->gfid, index_gfid);
+        gf_uuid_copy (dirloc->gfid, index_gfid);
         dirloc->path = "";
         dirloc->inode = inode_new (rootloc->inode->table);
         ret = syncop_lookup (xl, dirloc, NULL,
@@ -238,12 +238,12 @@ glfsh_process_entries (xlator_t *xl, fd_t *fd, gf_dirent_t *entries,
                         dict_unref (dict);
                         dict = NULL;
                 }
-                uuid_clear (gfid);
+                gf_uuid_clear (gfid);
                 GF_FREE (path);
                 path = NULL;
 
-                uuid_parse (entry->d_name, gfid);
-                uuid_copy (loc.gfid, gfid);
+                gf_uuid_parse (entry->d_name, gfid);
+                gf_uuid_copy (loc.gfid, gfid);
                 ret = syncop_getxattr (this, &loc, &dict, GF_HEAL_INFO, NULL);
                 if (ret)
                         continue;
@@ -552,7 +552,7 @@ glfsh_heal_splitbrain_file (glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc,
                 filename = gf_strdup(file);
                 path = strtok (filename, ":");
                 path = strtok (NULL, ";");
-                uuid_parse (path, loc.gfid);
+                gf_uuid_parse (path, loc.gfid);
                 loc.path = gf_strdup (uuid_utoa (loc.gfid));
                 loc.inode = inode_new (rootloc->inode->table);
                 ret = syncop_lookup (xl, &loc, xattr_req, 0, &xattr_rsp, 0);