diff options
author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-04-02 15:51:30 +0200 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-04 10:48:35 -0700 |
commit | 28397cae4102ac3f08576ebaf071ad92683097e8 (patch) | |
tree | 4c8be92299a951c8a28e1dc85bf2671f60da6e08 /xlators/cluster/dht/src/tier.c | |
parent | 0aebfaa349c7c68c2d59531eabae5a03a748e16a (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/cluster/dht/src/tier.c')
-rw-r--r-- | xlators/cluster/dht/src/tier.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index 7e3eaa02c02..51a6a8340e9 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -134,7 +134,7 @@ tier_migrate_using_query_file (void *_args) continue; } - uuid_parse (gfid_str, query_record->gfid); + gf_uuid_parse (gfid_str, query_record->gfid); if (dict_get(migrate_data, GF_XATTR_FILE_MIGRATE_KEY)) dict_del(migrate_data, GF_XATTR_FILE_MIGRATE_KEY); @@ -181,7 +181,7 @@ tier_migrate_using_query_file (void *_args) goto error; } - uuid_copy (p_loc.gfid, link_info->pargfid); + gf_uuid_copy (p_loc.gfid, link_info->pargfid); p_loc.inode = inode_new (defrag->root_inode->table); if (!p_loc.inode) { @@ -206,9 +206,9 @@ tier_migrate_using_query_file (void *_args) inode_unref (p_loc.inode); p_loc.inode = linked_inode; - uuid_copy (loc.gfid, query_record->gfid); + gf_uuid_copy (loc.gfid, query_record->gfid); loc.inode = inode_new (defrag->root_inode->table); - uuid_copy (loc.pargfid, link_info->pargfid); + gf_uuid_copy (loc.pargfid, link_info->pargfid); loc.parent = inode_ref(p_loc.inode); loc.name = gf_strdup (link_info->file_name); @@ -229,7 +229,7 @@ tier_migrate_using_query_file (void *_args) goto error; } - uuid_copy (loc.parent->gfid, link_info->pargfid); + gf_uuid_copy (loc.parent->gfid, link_info->pargfid); ret = syncop_lookup (this, &loc, NULL, ¤t, NULL, NULL); @@ -313,7 +313,7 @@ tier_gf_query_callback (gfdb_query_record_t *gfdb_query_record, GF_VALIDATE_OR_GOTO ("tier", query_cbk_args->defrag, out); GF_VALIDATE_OR_GOTO ("tier", query_cbk_args->queryFILE, out); - uuid_unparse (gfdb_query_record->gfid, gfid_str); + gf_uuid_unparse (gfdb_query_record->gfid, gfid_str); fprintf (query_cbk_args->queryFILE, "%s|%s|%ld\n", gfid_str, gfdb_query_record->_link_info_str, gfdb_query_record->link_info_size); |