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

diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c
index 1f1de2ae4f0..0703777bdcb 100644
--- a/xlators/mgmt/glusterd/src/glusterd-locks.c
+++ b/xlators/mgmt/glusterd/src/glusterd-locks.c
@@ -118,9 +118,9 @@ glusterd_get_mgmt_v3_lock_owner (char *key, uuid_t *uuid)
 
         ret = dict_get_bin (priv->mgmt_v3_lock, key, (void **) &lock_obj);
         if (!ret)
-                uuid_copy (*uuid, lock_obj->lock_owner);
+                gf_uuid_copy (*uuid, lock_obj->lock_owner);
         else
-                uuid_copy (*uuid, no_owner);
+                gf_uuid_copy (*uuid, no_owner);
 
         ret = 0;
 out:
@@ -544,7 +544,7 @@ glusterd_mgmt_v3_lock (const char *name, uuid_t uuid, char *type)
 
         /* If the lock has already been held for the given volume
          * we fail */
-        if (!uuid_is_null (owner)) {
+        if (!gf_uuid_is_null (owner)) {
                 gf_log_callingfn (this->name, GF_LOG_WARNING,
                                   "Lock for %s held by %s",
                                   name, uuid_utoa (owner));
@@ -559,7 +559,7 @@ glusterd_mgmt_v3_lock (const char *name, uuid_t uuid, char *type)
                 goto out;
         }
 
-        uuid_copy (lock_obj->lock_owner, uuid);
+        gf_uuid_copy (lock_obj->lock_owner, uuid);
 
         ret = dict_set_bin (priv->mgmt_v3_lock, key, lock_obj,
                             sizeof(glusterd_mgmt_v3_lock_obj));
@@ -642,14 +642,14 @@ glusterd_mgmt_v3_unlock (const char *name, uuid_t uuid, char *type)
                 goto out;
         }
 
-        if (uuid_is_null (owner)) {
+        if (gf_uuid_is_null (owner)) {
                 gf_log_callingfn (this->name, GF_LOG_WARNING,
                         "Lock for %s %s not held", type, name);
                 ret = -1;
                 goto out;
         }
 
-        ret = uuid_compare (uuid, owner);
+        ret = gf_uuid_compare (uuid, owner);
         if (ret) {
                 gf_log_callingfn (this->name, GF_LOG_WARNING,
                                   "Lock owner mismatch. "