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/nfs/server/src/exports.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/nfs/server/src/exports.c')
| -rw-r--r-- | xlators/nfs/server/src/exports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/nfs/server/src/exports.c b/xlators/nfs/server/src/exports.c index af0cc7c24f2..30810361785 100644 --- a/xlators/nfs/server/src/exports.c +++ b/xlators/nfs/server/src/exports.c @@ -397,7 +397,7 @@ exp_file_dir_from_uuid (const struct exports_file *file, data_t *dirdata = NULL; struct export_dir *dir = NULL; - uuid_unparse (export_uuid, export_uuid_str); + gf_uuid_unparse (export_uuid, export_uuid_str); dirdata = dict_get (file->exports_map, export_uuid_str); if (dirdata) @@ -441,7 +441,7 @@ _exp_file_insert (struct exports_file *file, struct export_dir *dir) hashedval = SuperFastHash (dirdup, strlen (dirdup)); memset (export_uuid, 0, sizeof (export_uuid)); memcpy (export_uuid, &hashedval, sizeof (hashedval)); - uuid_unparse (export_uuid, export_uuid_str); + gf_uuid_unparse (export_uuid, export_uuid_str); dict_set (file->exports_map, export_uuid_str, dirdata); out: |