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 --- api/src/glfs-handleops.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'api/src/glfs-handleops.c') diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index d42e0354268..6c7f3ee67ed 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -620,7 +620,7 @@ pub_glfs_h_creat (struct glfs *fs, struct glfs_object *parent, const char *path, goto out; } - uuid_generate (gfid); + gf_uuid_generate (gfid); ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16); if (ret) { ret = -1; @@ -742,7 +742,7 @@ pub_glfs_h_mkdir (struct glfs *fs, struct glfs_object *parent, const char *path, goto out; } - uuid_generate (gfid); + gf_uuid_generate (gfid); ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16); if (ret) { ret = -1; @@ -834,7 +834,7 @@ pub_glfs_h_mknod (struct glfs *fs, struct glfs_object *parent, const char *path, goto out; } - uuid_generate (gfid); + gf_uuid_generate (gfid); ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16); if (ret) { ret = -1; @@ -1189,7 +1189,7 @@ pub_glfs_h_create_from_handle (struct glfs *fs, unsigned char *handle, int len, /* populate the return object */ object->inode = newinode; - uuid_copy (object->gfid, object->inode->gfid); + gf_uuid_copy (object->gfid, object->inode->gfid); out: /* TODO: Check where the inode ref is being held? */ @@ -1315,7 +1315,7 @@ pub_glfs_h_symlink (struct glfs *fs, struct glfs_object *parent, goto out; } - uuid_generate (gfid); + gf_uuid_generate (gfid); ret = dict_set_static_bin (xattr_req, "gfid-req", gfid, 16); if (ret) { ret = -1; @@ -1682,7 +1682,7 @@ pub_glfs_h_poll_upcall (struct glfs *fs, struct callback_arg *up_arg) list_for_each_entry_safe (u_list, tmp, &fs->upcall_list, upcall_list) { - uuid_copy (gfid, u_list->gfid); + gf_uuid_copy (gfid, u_list->gfid); found = 1; break; } -- cgit