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-fh.c b/xlators/nfs/server/src/nfs3-fh.c
index 88a8fcb1180..8d492c8c72d 100644
--- a/xlators/nfs/server/src/nfs3-fh.c
+++ b/xlators/nfs/server/src/nfs3-fh.c
@@ -58,7 +58,7 @@ nfs3_fh_init (struct nfs3_fh *fh, struct iatt *buf)
         fh->ident[2] = GF_NFSFH_IDENT2;
         fh->ident[3] = GF_NFSFH_IDENT3;
 
-        uuid_copy (fh->gfid, buf->ia_gfid);
+        gf_uuid_copy (fh->gfid, buf->ia_gfid);
 }
 
 
@@ -72,7 +72,7 @@ nfs3_fh_build_indexed_root_fh (xlator_list_t *cl, xlator_t *xl)
         if ((!cl) || (!xl))
                 return fh;
 
-        uuid_copy (buf.ia_gfid, root);
+        gf_uuid_copy (buf.ia_gfid, root);
         nfs3_fh_init (&fh, &buf);
         fh.exportid [15] = nfs_xlator_to_xlid (cl, xl);
 
@@ -87,10 +87,10 @@ nfs3_fh_build_uuid_root_fh (uuid_t volumeid, uuid_t mountid)
         struct iatt     buf = {0, };
         uuid_t          root = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
 
-        uuid_copy (buf.ia_gfid, root);
+        gf_uuid_copy (buf.ia_gfid, root);
         nfs3_fh_init (&fh, &buf);
-        uuid_copy (fh.exportid, volumeid);
-        uuid_copy (fh.mountid, mountid);
+        gf_uuid_copy (fh.exportid, volumeid);
+        gf_uuid_copy (fh.mountid, mountid);
 
         return fh;
 }
@@ -104,7 +104,7 @@ nfs3_fh_is_root_fh (struct nfs3_fh *fh)
         if (!fh)
                 return 0;
 
-        if (uuid_compare (fh->gfid, rootgfid) == 0)
+        if (gf_uuid_compare (fh->gfid, rootgfid) == 0)
                 return 1;
 
         return 0;
@@ -150,7 +150,7 @@ nfs3_fh_build_parent_fh (struct nfs3_fh *child, struct iatt *newstat,
                 return -1;
 
         nfs3_fh_init (newfh, newstat);
-        uuid_copy (newfh->exportid, child->exportid);
+        gf_uuid_copy (newfh->exportid, child->exportid);
         return 0;
 }
 
@@ -164,9 +164,9 @@ nfs3_build_fh (inode_t *inode, uuid_t exportid, struct nfs3_fh *newfh)
         newfh->ident[1] = GF_NFSFH_IDENT1;
         newfh->ident[2] = GF_NFSFH_IDENT2;
         newfh->ident[3] = GF_NFSFH_IDENT3;
-        uuid_copy (newfh->gfid, inode->gfid);
-        uuid_copy (newfh->exportid, exportid);
-        /*uuid_copy (newfh->mountid, mountid);*/
+        gf_uuid_copy (newfh->gfid, inode->gfid);
+        gf_uuid_copy (newfh->exportid, exportid);
+        /*gf_uuid_copy (newfh->mountid, mountid);*/
         return 0;
 }
 
@@ -178,8 +178,8 @@ nfs3_fh_build_child_fh (struct nfs3_fh *parent, struct iatt *newstat,
                 return -1;
 
         nfs3_fh_init (newfh, newstat);
-        uuid_copy (newfh->exportid, parent->exportid);
-        uuid_copy (newfh->mountid, parent->mountid);
+        gf_uuid_copy (newfh->exportid, parent->exportid);
+        gf_uuid_copy (newfh->mountid, parent->mountid);
         return 0;
 }