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/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index c38440b4c9b..177e92497fe 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -82,7 +82,7 @@ afr_shd_is_subvol_local (xlator_t *this, int subvol)
         loc_t         loc      = {0, };
 
         loc.inode = this->itable->root;
-        uuid_copy (loc.gfid, loc.inode->gfid);
+        gf_uuid_copy (loc.gfid, loc.inode->gfid);
 	priv = this->private;
         syncop_is_subvol_local(priv->children[subvol], &loc, &is_local);
         return is_local;
@@ -171,7 +171,7 @@ afr_shd_inode_find (xlator_t *this, xlator_t *subvol, uuid_t gfid)
 	loc.inode = inode_new (this->itable);
 	if (!loc.inode)
 		goto out;
-	uuid_copy (loc.gfid, gfid);
+	gf_uuid_copy (loc.gfid, gfid);
 
 	ret = syncop_lookup (subvol, &loc, NULL, &iatt, NULL, NULL);
 	if (ret < 0)
@@ -196,7 +196,7 @@ afr_shd_index_inode (xlator_t *this, xlator_t *subvol)
 	void *index_gfid = NULL;
 
 	rootloc.inode = inode_ref (this->itable->root);
-	uuid_copy (rootloc.gfid, rootloc.inode->gfid);
+	gf_uuid_copy (rootloc.gfid, rootloc.inode->gfid);
 
 	ret = syncop_getxattr (subvol, &rootloc, &xattr,
 			       GF_XATTROP_INDEX_GFID, NULL);
@@ -408,7 +408,7 @@ afr_shd_index_heal (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
         gf_log (healer->this->name, GF_LOG_DEBUG, "got entry: %s",
                 entry->d_name);
 
-        ret = uuid_parse (entry->d_name, gfid);
+        ret = gf_uuid_parse (entry->d_name, gfid);
         if (ret)
                 return 0;
 
@@ -847,7 +847,7 @@ afr_shd_gather_entry (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
         gf_log (this->name, GF_LOG_DEBUG, "got entry: %s",
                 entry->d_name);
 
-        ret = uuid_parse (entry->d_name, gfid);
+        ret = gf_uuid_parse (entry->d_name, gfid);
         if (ret)
                 return 0;
 
@@ -1035,7 +1035,7 @@ afr_shd_get_index_count (xlator_t *this, int i, uint64_t *count)
 	subvol = priv->children[i];
 
 	rootloc.inode = inode_ref (this->itable->root);
-	uuid_copy (rootloc.gfid, rootloc.inode->gfid);
+	gf_uuid_copy (rootloc.gfid, rootloc.inode->gfid);
 
 	ret = syncop_getxattr (subvol, &rootloc, &xattr,
 			       GF_XATTROP_INDEX_COUNT, NULL);