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-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
index 3098761c2b3..92cfcd2fa95 100644
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
@@ -1682,7 +1682,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
                                 ret = -1;
                                 goto out;
                         }
-                        if (!uuid_is_null (volinfo->rep_brick.rb_id)) {
+                        if (!gf_uuid_is_null (volinfo->rep_brick.rb_id)) {
                                 ret = glusterd_copy_uuid_to_dict
                                         (volinfo->rep_brick.rb_id, ctx,
                                          GF_REPLACE_BRICK_TID_KEY);
@@ -1709,7 +1709,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
                                 "Missing replace-brick-id");
                         ret = 0;
                 } else {
-                        uuid_parse (task_id_str, volinfo->rep_brick.rb_id);
+                        gf_uuid_parse (task_id_str, volinfo->rep_brick.rb_id);
                 }
 
                 if (gf_is_local_addr (dst_brickinfo->hostname)) {
@@ -1815,7 +1815,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
                 glusterd_brickinfo_delete (volinfo->rep_brick.dst_brick);
                 volinfo->rep_brick.src_brick = NULL;
                 volinfo->rep_brick.dst_brick = NULL;
-                uuid_clear (volinfo->rep_brick.rb_id);
+                gf_uuid_clear (volinfo->rep_brick.rb_id);
         }
         break;