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/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c
index 2bf8813f44c..5aedfe3eb95 100644
--- a/xlators/storage/posix/src/posix-handle.c
+++ b/xlators/storage/posix/src/posix-handle.c
@@ -87,7 +87,7 @@ posix_make_ancestral_node (const char *priv_base_path, char *path, int pathsize,
                 strcat (real_path, "/");
                 strcat (real_path, path);
                 loc.inode = inode_ref (inode);
-                uuid_copy (loc.gfid, inode->gfid);
+                gf_uuid_copy (loc.gfid, inode->gfid);
 
                 entry->dict = posix_lookup_xattr_fill (THIS, real_path, &loc,
                                                        xdata, iabuf);
@@ -119,7 +119,7 @@ posix_make_ancestryfromgfid (xlator_t *this, char *path, int pathsize,
         int          ret        = -1;
         uuid_t       tmp_gfid   = {0, };
 
-        if (!path || !parent || !priv_base_path || uuid_is_null (gfid)) {
+        if (!path || !parent || !priv_base_path || gf_uuid_is_null (gfid)) {
                 goto out;
         }
 
@@ -135,7 +135,7 @@ posix_make_ancestryfromgfid (xlator_t *this, char *path, int pathsize,
                 inode = itable->root;
 
                 memset (&iabuf, 0, sizeof (iabuf));
-                uuid_copy (iabuf.ia_gfid, inode->gfid);
+                gf_uuid_copy (iabuf.ia_gfid, inode->gfid);
                 iabuf.ia_type = inode->ia_type;
 
                 ret = posix_make_ancestral_node (priv_base_path, path, pathsize,
@@ -163,7 +163,7 @@ posix_make_ancestryfromgfid (xlator_t *this, char *path, int pathsize,
         pgfidstr = strtok_r (linkname + SLEN("../../00/00/"), "/", &saveptr);
         dir_name = strtok_r (NULL, "/", &saveptr);
 
-        uuid_parse (pgfidstr, tmp_gfid);
+        gf_uuid_parse (pgfidstr, tmp_gfid);
 
         ret = posix_make_ancestryfromgfid (this, path, pathsize, head, type,
                                            tmp_gfid, handle_size,
@@ -609,7 +609,7 @@ posix_mv_old_trash_into_new_trash (xlator_t *this, char *old, char *new)
 
         if (!posix_does_old_trash_exists (old))
                 goto out;
-        uuid_generate (dest_name);
+        gf_uuid_generate (dest_name);
         snprintf (dest_old, sizeof (dest_old), "%s/%s", new,
                   uuid_utoa (dest_name));
         ret = rename (old, dest_old);