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/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
index 6b513df8fe7..d82592d666e 100644
--- a/xlators/cluster/ec/src/ec-heal.c
+++ b/xlators/cluster/ec/src/ec-heal.c
@@ -357,7 +357,7 @@ int32_t ec_heal_create(ec_heal_t * heal, uintptr_t mask, int32_t try_link)
     {
         memset(&loc, 0, sizeof(loc));
         loc.inode = heal->loc.inode;
-        uuid_copy(loc.gfid, heal->iatt.ia_gfid);
+        gf_uuid_copy(loc.gfid, heal->iatt.ia_gfid);
 
         ec_link(heal->fop->frame, heal->xl, mask, EC_MINIMUM_ONE,
                 ec_heal_link_cbk, heal, &loc, &heal->loc, xdata);
@@ -717,7 +717,7 @@ void ec_heal_prepare_others(ec_heal_t * heal)
         else
         {
             if ((heal->iatt.ia_type != cbk->iatt[0].ia_type) ||
-                (uuid_compare(heal->iatt.ia_gfid, cbk->iatt[0].ia_gfid) != 0))
+                (gf_uuid_compare(heal->iatt.ia_gfid, cbk->iatt[0].ia_gfid) != 0))
             {
                 ec_heal_remove(heal, cbk);
             }
@@ -846,7 +846,7 @@ int32_t ec_heal_open_others(ec_heal_t * heal)
         cbk = list_entry(item, ec_cbk_data_t, list);
 
         if ((cbk->op_ret < 0) || (cbk->iatt[0].ia_type != IA_IFREG) ||
-            (uuid_compare(heal->iatt.ia_gfid, cbk->iatt[0].ia_gfid) != 0))
+            (gf_uuid_compare(heal->iatt.ia_gfid, cbk->iatt[0].ia_gfid) != 0))
         {
             ec_heal_exclude(heal, cbk->mask);
         }
@@ -1293,7 +1293,7 @@ ec_manager_heal (ec_fop_data_t * fop, int32_t state)
             heal = fop->heal;
             /* root loc doesn't have pargfid/parent */
             if (loc_is_root (&heal->loc) ||
-                !uuid_is_null(heal->loc.pargfid) || heal->loc.parent) {
+                !gf_uuid_is_null(heal->loc.pargfid) || heal->loc.parent) {
                     heal->nameheal = _gf_true;
                     return EC_STATE_DISPATCH;
             } else {
@@ -1332,7 +1332,7 @@ ec_manager_heal (ec_fop_data_t * fop, int32_t state)
                     return EC_STATE_HEAL_DISPATCH;
 
             /* Only heal data/metadata if enough information is supplied. */
-            if (uuid_is_null(heal->loc.gfid))
+            if (gf_uuid_is_null(heal->loc.gfid))
             {
                 ec_heal_entrylk(heal, ENTRYLK_UNLOCK);