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/features/shard/src/shard.c b/xlators/features/shard/src/shard.c
index af90404d9a8..99c1496386f 100644
--- a/xlators/features/shard/src/shard.c
+++ b/xlators/features/shard/src/shard.c
@@ -20,7 +20,7 @@ __is_shard_dir (uuid_t gfid)
 {
         shard_priv_t  *priv = THIS->private;
 
-        if (uuid_compare (gfid, priv->dot_shard_gfid) == 0)
+        if (gf_uuid_compare (gfid, priv->dot_shard_gfid) == 0)
                 return _gf_true;
 
         return _gf_false;
@@ -31,7 +31,7 @@ shard_make_block_bname (int block_num, uuid_t gfid, char *buf, size_t len)
 {
         char gfid_str[GF_UUID_BUF_SIZE] = {0,};
 
-        uuid_unparse (gfid, gfid_str);
+        gf_uuid_unparse (gfid, gfid_str);
         snprintf (buf, len, "%s.%d", gfid_str, block_num);
 }
 
@@ -41,7 +41,7 @@ shard_make_block_abspath (int block_num, uuid_t gfid, char *filepath,
 {
         char gfid_str[GF_UUID_BUF_SIZE] = {0,};
 
-        uuid_unparse (gfid, gfid_str);
+        gf_uuid_unparse (gfid, gfid_str);
         snprintf (filepath, len, "/%s/%s.%d", GF_SHARD_DIR, gfid_str,
                   block_num);
 }
@@ -891,7 +891,7 @@ shard_create_gfid_dict (dict_t *dict)
                 goto out;
         }
 
-        uuid_generate (*gfid);
+        gf_uuid_generate (*gfid);
 
         ret = dict_set_dynptr (new, "gfid-req", gfid, sizeof (uuid_t));
 
@@ -1715,7 +1715,7 @@ init (xlator_t *this)
                         "from mempool");
                 goto out;
         }
-        uuid_parse (SHARD_ROOT_GFID, priv->dot_shard_gfid);
+        gf_uuid_parse (SHARD_ROOT_GFID, priv->dot_shard_gfid);
 
         this->private = priv;
         ret = 0;