diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-04-05 14:50:45 -0400 |
|---|---|---|
| committer | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-04-05 15:09:33 -0400 |
| commit | 87c51a17a4a9d787db0ee8ed5f81e0250d2e643e (patch) | |
| tree | 6bffa6ba0e8e9b265bcb120c8ad84caaf611725f /api | |
| parent | ed51b60c6b33024885d9876b23cb6554055e49a1 (diff) | |
gfapi: fix a couple of minor issues
duplicatation of exported functions in gfapi.map. Only the newest one
is needed. Both the legacy and current symbols are exported.
glfs_io_cbk34 typedef should not be in a public header file. The old
application was compiled with the original glfs_io_cbk. Outside of
libgfapi, nothing now uses/needs this old typedef, move it into the
C file that needs it.
Similarly glfs_realpath34() decl should not be in glfs.h. Period. Old
applications were compiled with the then glfs_realpath() decl and
linked with glfs_realpath@@GFAPI_3_4.0. New applications should only
call glfs_realpath() and it will be linked to the new/current
glfs_realpath().
Change-Id: Icd5b0c9e9b68f0c133f14447b09ace35f33dbab2
fixes: bz#1564235
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/gfapi.map | 2 | ||||
| -rw-r--r-- | api/src/glfs-fops.c | 2 | ||||
| -rw-r--r-- | api/src/glfs.h | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 96ea13ab73b..e9b5f88037f 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -71,7 +71,6 @@ GFAPI_3.4.0 { glfs_getcwd; glfs_chdir; glfs_fchdir; - glfs_realpath; glfs_posix_lock; glfs_dup; } GFAPI_PRIVATE_3.4.0; @@ -81,7 +80,6 @@ GFAPI_3.4.2 { glfs_setfsuid; glfs_setfsgid; glfs_setfsgroups; - glfs_h_lookupat; glfs_h_creat; glfs_h_mkdir; glfs_h_mknod; diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index a01499a6bf6..726574714e2 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -33,6 +33,8 @@ #define READDIRBUF_SIZE (sizeof(struct dirent) + GF_NAME_MAX + 1) +typedef void (*glfs_io_cbk34) (glfs_fd_t *fd, ssize_t ret, void *data); + /* * This function will mark glfd for deletion and decrement its refcount. */ diff --git a/api/src/glfs.h b/api/src/glfs.h index c8b261efc83..59e5784f91f 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -499,7 +499,6 @@ int glfs_set_xlator_option (glfs_t *fs, const char *xlator, const char *key, in a common callback function. */ -typedef void (*glfs_io_cbk34) (glfs_fd_t *fd, ssize_t ret, void *data); typedef void (*glfs_io_cbk) (glfs_fd_t *fd, ssize_t ret, struct stat *prestat, struct stat *poststat, void *data); @@ -769,9 +768,6 @@ int glfs_chdir (glfs_t *fs, const char *path) __THROW int glfs_fchdir (glfs_fd_t *fd) __THROW GFAPI_PUBLIC(glfs_fchdir, 3.4.0); -char *glfs_realpath34 (glfs_t *fs, const char *path, char *resolved_path) __THROW - GFAPI_PUBLIC(glfs_realpath, 3.4.0); - char *glfs_realpath (glfs_t *fs, const char *path, char *resolved_path) __THROW GFAPI_PUBLIC(glfs_realpath, 3.7.17); /* |