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

diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index b8ae5cdb5f9..1a94c00ce8c 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -92,7 +92,7 @@ __nfs3_get_export_by_volumeid (struct nfs3_state *nfs3, uuid_t exportid)
         struct nfs3_export      *exp = NULL;
 
         list_for_each_entry (exp, &nfs3->exports, explist) {
-                if (!uuid_compare (exportid, exp->volumeid))
+                if (!gf_uuid_compare (exportid, exp->volumeid))
                         goto found;
         }
 
@@ -214,8 +214,8 @@ out:
                 rpc_transport_t *trans = NULL;                          \
                 volume = nfs3_fh_to_xlator ((nfs3state), handle);       \
                 if (!volume) {                                          \
-                        uuid_unparse (handle->exportid, exportid);      \
-                        uuid_unparse (handle->gfid, gfid);              \
+                        gf_uuid_unparse (handle->exportid, exportid);      \
+                        gf_uuid_unparse (handle->gfid, gfid);              \
                         trans = rpcsvc_request_transport (req);         \
                         GF_LOG_OCCASIONALLY (nfs3state->occ_logger,     \
                                 GF_NFS3, GF_LOG_ERROR, "Failed to map " \
@@ -258,7 +258,7 @@ out:
                         trans = rpcsvc_request_transport (cst->req);    \
                         xlatorp = nfs3_fh_to_xlator (cst->nfs3state,    \
                                                      &cst->resolvefh);  \
-                        uuid_unparse (cst->resolvefh.gfid, gfid);       \
+                        gf_uuid_unparse (cst->resolvefh.gfid, gfid);       \
                         sprintf (buf, "(%s) %s : %s",                   \
                                  trans->peerinfo.identifier,            \
                         xlatorp ? xlatorp->name : "ERR", gfid);         \
@@ -278,7 +278,7 @@ out:
                         trans = rpcsvc_request_transport (cst->req);    \
                         xlatorp = nfs3_fh_to_xlator (cst->nfs3state,    \
                                                      &cst->resolvefh);  \
-                        uuid_unparse (cst->resolvefh.gfid, gfid);       \
+                        gf_uuid_unparse (cst->resolvefh.gfid, gfid);       \
                         snprintf (buf, sizeof (buf), "(%s) %s : %s",             \
                                   trans->peerinfo.identifier,           \
                                   xlatorp ? xlatorp->name : "ERR",      \
@@ -300,7 +300,7 @@ out:
                         trans = rpcsvc_request_transport (cst->req);    \
                         xlatorp = nfs3_fh_to_xlator (cst->nfs3state,    \
                                                      &cst->resolvefh);  \
-                        uuid_unparse (cst->resolvefh.gfid, gfid);       \
+                        gf_uuid_unparse (cst->resolvefh.gfid, gfid);       \
                         snprintf (buf, sizeof (buf), "(%s) %s : %s",             \
                                   trans->peerinfo.identifier,     \
                                   xlatorp ? xlatorp->name : "ERR",      \
@@ -325,7 +325,7 @@ __nfs3_get_volume_id (struct nfs3_state *nfs3, xlator_t *xl,
 
         list_for_each_entry (exp, &nfs3->exports, explist) {
                 if (exp->subvol == xl) {
-                        uuid_copy (volumeid, exp->volumeid);
+                        gf_uuid_copy (volumeid, exp->volumeid);
                         ret = 0;
                         goto out;
                 }
@@ -346,7 +346,7 @@ out:
                         goto erl;                                       \
                 }                                                       \
                                                                         \
-                uuid_copy ((fhd)->gfid, zero);                          \
+                gf_uuid_copy ((fhd)->gfid, zero);                          \
                 (fhd)->gfid[15] = 1;                                    \
                 (enam) = NULL;                                          \
                 if ((gf_nfs_dvm_off (nfs_state (nfs3st->nfsx))))        \
@@ -2428,7 +2428,7 @@ nfs3svc_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         cs->preparent = *preparent;
         cs->postparent = *postparent;
         nfs_request_user_init (&nfu, cs->req);
-        uuid_copy (cs->resolvedloc.gfid, inode->gfid);
+        gf_uuid_copy (cs->resolvedloc.gfid, inode->gfid);
         ret = nfs_setattr (cs->nfsx, cs->vol, &nfu, &cs->resolvedloc,&cs->stbuf,
                            cs->setattr_valid, nfs3svc_create_setattr_cbk, cs);
         if (ret < 0)
@@ -5331,7 +5331,7 @@ nfs3_init_subvolume_options (xlator_t *nfsx,
         if (!options)
                 return (-1);
 
-        uuid_clear (volumeid);
+        gf_uuid_clear (volumeid);
         if (gf_nfs_dvm_off (nfs_state (nfsx)))
                 goto no_dvm;
 
@@ -5358,14 +5358,14 @@ nfs3_init_subvolume_options (xlator_t *nfsx,
         }
 
         if (optstr) {
-                ret = uuid_parse (optstr, volumeid);
+                ret = gf_uuid_parse (optstr, volumeid);
                 if (ret < 0) {
                         gf_log (GF_MNT, GF_LOG_ERROR, "Failed to parse volume "
                                 "UUID");
                         ret = -1;
                         goto err;
                 }
-                uuid_copy (exp->volumeid, volumeid);
+                gf_uuid_copy (exp->volumeid, volumeid);
         }
 
 no_dvm: