From 28397cae4102ac3f08576ebaf071ad92683097e8 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 2 Apr 2015 15:51:30 +0200 Subject: 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 Reviewed-on: http://review.gluster.org/10017 Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- xlators/features/bit-rot/src/bitd/bit-rot.c | 14 +++++++------- xlators/features/bit-rot/src/stub/bit-rot-stub.c | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'xlators/features/bit-rot') diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c index ba326346cdf..d808c0dc69c 100644 --- a/xlators/features/bit-rot/src/bitd/bit-rot.c +++ b/xlators/features/bit-rot/src/bitd/bit-rot.c @@ -205,7 +205,7 @@ br_object_lookup (xlator_t *this, br_object_t *object, goto out; } - uuid_copy (loc.gfid, object->gfid); + gf_uuid_copy (loc.gfid, object->gfid); ret = syncop_lookup (object->child->xl, &loc, NULL, iatt, NULL, NULL); if (ret < 0) @@ -251,7 +251,7 @@ br_object_open (xlator_t *this, } loc.inode = inode_ref (inode); - uuid_copy (loc.gfid, inode->gfid); + gf_uuid_copy (loc.gfid, inode->gfid); ret = syncop_open (object->child->xl, &loc, O_RDONLY, fd); if (ret) { @@ -618,7 +618,7 @@ br_initialize_object (xlator_t *this, br_child_t *child, changelog_event_t *ev) object->this = this; object->child = child; - uuid_copy (object->gfid, ev->u.releasebr.gfid); + gf_uuid_copy (object->gfid, ev->u.releasebr.gfid); /* NOTE: it's BE, but no worry */ object->signedversion = ev->u.releasebr.version; @@ -677,9 +677,9 @@ br_brick_callback (void *xl, char *brick, GF_VALIDATE_OR_GOTO (this->name, this->private, out); GF_ASSERT (ev->ev_type == CHANGELOG_OP_TYPE_BR_RELEASE); - GF_ASSERT (!uuid_is_null (ev->u.releasebr.gfid)); + GF_ASSERT (!gf_uuid_is_null (ev->u.releasebr.gfid)); - uuid_copy (gfid, ev->u.releasebr.gfid); + gf_uuid_copy (gfid, ev->u.releasebr.gfid); gf_log (this->name, GF_LOG_DEBUG, "RELEASE EVENT [GFID %s]", uuid_utoa (gfid)); @@ -830,7 +830,7 @@ br_prepare_loc (xlator_t *this, br_child_t *child, loc_t *parent, } loc->parent = inode_ref (parent->inode); - uuid_copy (loc->pargfid, parent->inode->gfid); + gf_uuid_copy (loc->pargfid, parent->inode->gfid); ret = inode_path (parent->inode, entry->d_name, (char **)&loc->path); if (ret < 0 || !loc->path) { @@ -1076,7 +1076,7 @@ br_brick_connect (xlator_t *this, br_child_t *child) priv = this->private; loc.inode = inode_ref (child->table->root); - uuid_copy (loc.gfid, loc.inode->gfid); + gf_uuid_copy (loc.gfid, loc.inode->gfid); loc.path = gf_strdup ("/"); ret = syncop_lookup (child->xl, &loc, NULL, &buf, NULL, &parent); diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index 0a2be5f6b42..1a268e16b93 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -282,7 +282,7 @@ br_stub_fill_local (br_stub_local_t *local, local->u.context.fd = fd_ref (fd); if (inode) local->u.context.inode = inode_ref (inode); - uuid_copy (local->u.context.gfid, gfid); + gf_uuid_copy (local->u.context.gfid, gfid); /* mark inode dirty/fresh according to durability */ local->u.context.markdirty = (dirty) ? _gf_true : _gf_false; @@ -799,8 +799,8 @@ br_stub_getxattr (call_frame_t *frame, xlator_t *this, if (name && (strncmp (name, GLUSTERFS_GET_BR_STUB_INIT_TIME, strlen (GLUSTERFS_GET_BR_STUB_INIT_TIME)) == 0) - && ((uuid_compare (loc->gfid, rootgfid) == 0) - || (uuid_compare (loc->inode->gfid, rootgfid) == 0))) { + && ((gf_uuid_compare (loc->gfid, rootgfid) == 0) + || (gf_uuid_compare (loc->inode->gfid, rootgfid) == 0))) { br_stub_send_stub_init_time (frame, this); return 0; } @@ -844,7 +844,7 @@ br_stub_fgetxattr (call_frame_t *frame, xlator_t *this, if (name && (strncmp (name, GLUSTERFS_GET_BR_STUB_INIT_TIME, strlen (GLUSTERFS_GET_BR_STUB_INIT_TIME)) == 0) - && (uuid_compare (fd->inode->gfid, rootgfid) == 0)) { + && (gf_uuid_compare (fd->inode->gfid, rootgfid) == 0)) { br_stub_send_stub_init_time (frame, this); return 0; } @@ -1269,7 +1269,7 @@ br_stub_send_ipc_fop (xlator_t *this, ev.ev_type = CHANGELOG_OP_TYPE_BR_RELEASE; ev.u.releasebr.flags = flags; ev.u.releasebr.version = releaseversion; - uuid_copy (ev.u.releasebr.gfid, fd->inode->gfid); + gf_uuid_copy (ev.u.releasebr.gfid, fd->inode->gfid); xdata = dict_new (); if (!xdata) { -- cgit