From a5bf3c3a586ccf20f5f735968ec9a56d33f62326 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 19 Oct 2016 12:33:35 +0200 Subject: gfapi: add glfs_free() to glfs.h Commit 4721188a154acd9a0a4c096d8d73e97f3bf1b2a9 introduces glfs_free() but missed adding the function to the header. The symbol is correctly available in the library though. Testcases do not seem to fail when a function is missing for the headers... The glusterfs-3.7.16 packages have been released with the missing declaration in the header and symbol-maps. Still, the function is available for applications: $ objdump -T usr/lib64/libgfapi.so.0 | grep -w glfs_free 0000000000006aa0 g DF .text 0000000000000035 GFAPI_3.7.16 glfs_free Cherry picked from commit 5ab0b43ce67d8d131242542a80b6aa6b129ed5ee: > Change-Id: Ia707ee957f090dbfca028192fcc81a83dfdf4ae0 > BUG: 1344714 > Reported-by: Jiffin Tony Thottan > Signed-off-by: Niels de Vos > Reviewed-on: http://review.gluster.org/15653 > CentOS-regression: Gluster Build System > Smoke: Gluster Build System > Reviewed-by: jiffin tony Thottan > NetBSD-regression: NetBSD Build System Change-Id: Ia707ee957f090dbfca028192fcc81a83dfdf4ae0 BUG: 1347717 Reported-by: Jiffin Tony Thottan Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/15680 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: jiffin tony Thottan Reviewed-by: Oleksandr Natalenko NetBSD-regression: NetBSD Build System --- api/src/gfapi.aliases | 1 + api/src/gfapi.map | 1 + api/src/glfs.h | 3 +++ 3 files changed, 5 insertions(+) diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index b37665f0588..a3edddaa03d 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -141,6 +141,7 @@ _priv_glfs_process_upcall_event _glfs_process_upcall_event$GFAPI_PRIVATE_3.7.0 _pub_glfs_h_lookupat _glfs_h_lookupat$GFAPI_3.7.4 +_pub_glfs_free _glfs_free$GFAPI_3.7.16 _pub_glfs_h_poll_upcall _glfs_h_poll_upcall$GFAPI_3.7.16 _pub_glfs_upcall_get_fs _glfs_upcall_get_fs$GFAPI_3.7.16 _pub_glfs_upcall_get_reason _glfs_upcall_get_reason$GFAPI_3.7.16 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index f38ef024181..02da0fe12f0 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -174,6 +174,7 @@ GFAPI_3.7.15 { GFAPI_3.7.16 { global: + glfs_free; glfs_upcall_get_fs; glfs_upcall_get_reason; glfs_upcall_inode_get_event; diff --git a/api/src/glfs.h b/api/src/glfs.h index b53af35b158..8b5782ef084 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -769,6 +769,9 @@ int glfs_posix_lock (glfs_fd_t *fd, int cmd, struct flock *flock) __THROW glfs_fd_t *glfs_dup (glfs_fd_t *fd) __THROW GFAPI_PUBLIC(glfs_dup, 3.4.0); +void glfs_free (void *ptr) __THROW + GFAPI_PUBLIC(glfs_free, 3.7.16); + /* * No xdata support for now. Nobody needs this call at all yet except for the * test script, and that doesn't need xdata. Adding dict_t support and a new -- cgit