summaryrefslogtreecommitdiffstats
path: root/xlators/meta/src
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-04-02 15:51:30 +0200
committerVijay Bellur <vbellur@redhat.com>2015-04-04 10:48:35 -0700
commit28397cae4102ac3f08576ebaf071ad92683097e8 (patch)
tree4c8be92299a951c8a28e1dc85bf2671f60da6e08 /xlators/meta/src
parent0aebfaa349c7c68c2d59531eabae5a03a748e16a (diff)
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>
Diffstat (limited to 'xlators/meta/src')
-rw-r--r--xlators/meta/src/meta-helpers.c6
-rw-r--r--xlators/meta/src/meta.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/xlators/meta/src/meta-helpers.c b/xlators/meta/src/meta-helpers.c
index a67671050b8..cd47f0fb54a 100644
--- a/xlators/meta/src/meta-helpers.c
+++ b/xlators/meta/src/meta-helpers.c
@@ -208,9 +208,9 @@ gfid_to_ino (uuid_t gfid)
static void
meta_uuid_copy (uuid_t dst, uuid_t src)
{
- uuid_copy (dst, src);
- if (uuid_is_null (dst))
- uuid_generate (dst);
+ gf_uuid_copy (dst, src);
+ if (gf_uuid_is_null (dst))
+ gf_uuid_generate (dst);
}
diff --git a/xlators/meta/src/meta.c b/xlators/meta/src/meta.c
index 036ed112acf..20c643f2f75 100644
--- a/xlators/meta/src/meta.c
+++ b/xlators/meta/src/meta.c
@@ -34,7 +34,7 @@ meta_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
meta_root_dir_hook (frame, this, loc, xdata);
meta_iatt_fill (&iatt, loc->inode, IA_IFDIR);
- uuid_parse (META_ROOT_GFID, iatt.ia_gfid);
+ gf_uuid_parse (META_ROOT_GFID, iatt.ia_gfid);
META_STACK_UNWIND (lookup, frame, 0, 0, loc->inode, &iatt,
xdata, &parent);