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, 6 insertions, 6 deletions

diff --git a/xlators/features/snapview-client/src/snapview-client.c b/xlators/features/snapview-client/src/snapview-client.c
index 0fa7b531c47..0b706919924 100644
--- a/xlators/features/snapview-client/src/snapview-client.c
+++ b/xlators/features/snapview-client/src/snapview-client.c
@@ -316,7 +316,7 @@ svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 }
 
                 if ((op_errno == ENOENT || op_errno == ESTALE) &&
-                    !uuid_is_null (local->loc.gfid)) {
+                    !gf_uuid_is_null (local->loc.gfid)) {
                         ret = svc_inode_ctx_get (this, inode, &inode_type);
                         if (ret < 0 && subvolume == FIRST_CHILD (this)) {
                                 gf_log (this->name, GF_LOG_DEBUG,
@@ -339,7 +339,7 @@ svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 parent = inode_ref (local->loc.parent);
         else {
                 parent = inode_parent (inode, NULL, NULL);
-                if (!parent && !uuid_is_null (local->loc.pargfid)) {
+                if (!parent && !gf_uuid_is_null (local->loc.pargfid)) {
                         parent = inode_find (inode->table,
                                              local->loc.pargfid);
                 }
@@ -443,7 +443,7 @@ svc_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         */
 
         if (!loc->name) {
-                if (uuid_is_null (loc->inode->gfid)) {
+                if (gf_uuid_is_null (loc->inode->gfid)) {
                         subvolume = FIRST_CHILD (this);
                         local->subvolume = subvolume;
                         wind = _gf_true;
@@ -1682,9 +1682,9 @@ svc_readdir_on_special_dir (call_frame_t *frame, void *cookie, xlator_t *this,
                         }
                 }
 
-                uuid_copy (local->loc.pargfid, fd->inode->gfid);
-                uuid_copy (local->loc.gfid, inode->gfid);
-                if (uuid_is_null (inode->gfid))
+                gf_uuid_copy (local->loc.pargfid, fd->inode->gfid);
+                gf_uuid_copy (local->loc.gfid, inode->gfid);
+                if (gf_uuid_is_null (inode->gfid))
                         ret = inode_path (fd->inode, private->path, &path);
                 else
                         ret = inode_path (inode, NULL, &path);