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

diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
index 9179bf63ba9..08e5d97a26b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
@@ -554,7 +554,7 @@ glusterd_find_gfid_match (uuid_t gfid, unsigned char *buf, size_t bytes_read,
 
         while (gfid_index != bytes_read) {
                 memcpy ((void *)tmp_buf, (void *)&buf[gfid_index], 16);
-                if (!uuid_compare (gfid, tmp_buf)) {
+                if (!gf_uuid_compare (gfid, tmp_buf)) {
                         if (opcode == GF_QUOTA_OPTION_TYPE_REMOVE) {
                                 shift_count = bytes_read - (gfid_index + 16);
                                 memmove ((void *)&buf[gfid_index],
@@ -674,7 +674,7 @@ glusterd_store_quota_config (glusterd_volinfo_t *volinfo, char *path,
                 ret = -1;
                 goto out;
         }
-        uuid_parse (gfid_str, gfid);
+        gf_uuid_parse (gfid_str, gfid);
 
         for (;;) {
                 bytes_read = read (conf_fd, (void*)&buf, entry_sz);
@@ -1251,7 +1251,7 @@ glusterd_get_gfid_from_brick (dict_t *dict, glusterd_volinfo_t *volinfo,
                         goto out;
                 }
 
-                if (uuid_compare (brickinfo->uuid, MY_UUID))
+                if (gf_uuid_compare (brickinfo->uuid, MY_UUID))
                         continue;
 
                 if (brickinfo->vg[0])