gfapi: various broken symbol versions

lots of breakage in symbol versions:
  symbols added in 4.1 incorrectly, and
  symbols added in 4.1 but labeled 4.0.0, and
  symbols added in 3.13 incorrectly

Not noticed until someone tried to build 3.13.2 on FreeBSD 11.1,
despite the fact that we build on FreeBSD 10.3 IIRC, somehow the
3.13 errors aren't a build error there.

Note: in rereading the Ulrich Drepper write-up I noticed that when
a symbol version is changed, you are supposed to leave the old
symbol in its original section in addition to adding it to its new
section. Adding back those symbols to their original sections.

Reported-by: Roman Serbski <mefystofel@gmail.com>

Change-Id: I9a883546d08e0847f7228d8ea5943bc54275b319
fixes: bz#1577162
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

6 files changed, 24 insertions, 18 deletions

diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases
index bf675e865db..74053b9af6a 100644
--- a/api/src/gfapi.aliases
+++ b/api/src/gfapi.aliases
@@ -33,7 +33,6 @@ _pub_glfs_pwritev _glfs_pwritev$GFAPI_3.4.0
 _pub_glfs_preadv_async _glfs_preadv_async$GFAPI_3.4.0
 _pub_glfs_pwritev_async _glfs_pwritev_async$GFAPI_3.4.0
 _pub_glfs_lseek _glfs_lseek$GFAPI_3.4.0
-_pub_glfs_truncate _glfs_truncate$GFAPI_3.7.15
 _pub_glfs_ftruncate _glfs_ftruncate$GFAPI_3.4.0
 _pub_glfs_ftruncate_async _glfs_ftruncate_async$GFAPI_3.4.0
 _pub_glfs_lstat _glfs_lstat$GFAPI_3.4.0
@@ -116,6 +115,7 @@ _pub_glfs_discard _glfs_discard$GFAPI_3.5.0
 _pub_glfs_discard_async _glfs_discard_async$GFAPI_3.5.0
 _pub_glfs_zerofill _glfs_zerofill$GFAPI_3.5.0
 _pub_glfs_zerofill_async _glfs_zerofill_async$GFAPI_3.5.0
+_pub_glfs_caller_specific_init _glfs_caller_specific_init$GFAPI_3.5.0
 _pub_glfs_h_setxattrs _glfs_h_setxattrs$GFAPI_3.5.0
 
 _pub_glfs_unset_volfile_server _glfs_unset_volfile_server$GFAPI_3.5.1
@@ -140,6 +140,8 @@ _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_truncate _glfs_truncate$GFAPI_3.7.15
+
 _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
@@ -172,4 +174,3 @@ _pub_glfs_setfsleaseid _glfs_setfsleaseid$GFAPI_4.0.0
 _pub_glfs_file_lock _glfs_file_lock$GFAPI_4.0.0
 _pub_glfs_lease _glfs_lease$GFAPI_4.0.0
 _pub_glfs_h_lease _glfs_h_lease$GFAPI_4.0.0
-_pub_glfs_recall_lease _glfs_recall_lease$GFAPI_4.0.0
diff --git a/api/src/gfapi.map b/api/src/gfapi.map
index 75ca2645988..4984479c57a 100644
--- a/api/src/gfapi.map
+++ b/api/src/gfapi.map
@@ -113,6 +113,7 @@ GFAPI_3.4.2 {
 		glfs_h_create_from_handle;
 		glfs_h_opendir;
 		glfs_h_open;
+		glfs_h_lookupat;
 } GFAPI_3.4.0;
 
 GFAPI_3.5.0 {
@@ -184,6 +185,7 @@ GFAPI_3.7.16 {
 		glfs_upcall_inode_get_pstat;
 		glfs_upcall_inode_get_oldpobject;
 		glfs_upcall_inode_get_oldpstat;
+		glfs_h_poll_upcall;
 } GFAPI_3.7.15;
 
 GFAPI_3.7.17 {
@@ -225,5 +227,4 @@ GFAPI_4.0.0 {
                 glfs_file_lock;
                 glfs_lease;
                 glfs_h_lease;
-                glfs_recall_lease;
 } GFAPI_3.13.0;
diff --git a/api/src/glfs-handles.h b/api/src/glfs-handles.h
index b89d09c3404..d0af82117d0 100644
--- a/api/src/glfs-handles.h
+++ b/api/src/glfs-handles.h
@@ -328,8 +328,9 @@ struct glfs_object*
 glfs_object_copy (struct glfs_object *src);
         GFAPI_PUBLIC(glfs_object_copy, 3.11.0);
 
-int glfs_h_lease (struct glfs *fs, struct glfs_object *object,
-                  struct glfs_lease *lease) __THROW
+int
+glfs_h_lease (struct glfs *fs, struct glfs_object *object,
+              struct glfs_lease *lease) __THROW
         GFAPI_PUBLIC(glfs_h_lease, 4.0.0);
 
 struct glfs_object *
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 788c6b00545..671ee8e60a1 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -570,6 +570,13 @@ glfs_h_poll_cache_invalidation (struct glfs *fs,
                                 struct glfs_upcall *up_arg,
                                 struct gf_upcall *upcall_data);
 
+int
+glfs_recall_lease_fd (struct glfs *fs, struct gf_upcall *up_data);
+
+int
+glfs_recall_lease_upcall (struct glfs *fs, struct glfs_upcall *up_arg,
+                          struct gf_upcall *up_data);
+
 ssize_t
 glfs_anonymous_preadv (struct glfs *fs, struct glfs_object *object,
                        const struct iovec *iovec, int iovcnt,
diff --git a/api/src/glfs.c b/api/src/glfs.c
index da6bc3a07ba..cc84842f286 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -1641,8 +1641,8 @@ out:
 GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_sysrq, 3.10.0);
 
 int
-glfs_upcall_register (struct glfs *fs, uint32_t event_list,
-                      glfs_upcall_cbk cbk, void *data)
+pub_glfs_upcall_register (struct glfs *fs, uint32_t event_list,
+                          glfs_upcall_cbk cbk, void *data)
 {
         int ret = 0;
 
@@ -1692,9 +1692,11 @@ out:
 invalid_fs:
         return ret;
 }
+
 GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_register, 3.13.0);
 
-int glfs_upcall_unregister (struct glfs *fs, uint32_t event_list)
+int
+pub_glfs_upcall_unregister (struct glfs *fs, uint32_t event_list)
 {
         int ret = 0;
         /* list of supported upcall events */
@@ -1737,4 +1739,5 @@ out:
 invalid_fs:
         return ret;
 }
+
 GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_unregister, 3.13.0);
diff --git a/api/src/glfs.h b/api/src/glfs.h
index ceed2b34290..842b17530a5 100644
--- a/api/src/glfs.h
+++ b/api/src/glfs.h
@@ -1148,16 +1148,9 @@ typedef void (*glfs_recall_cbk) (struct glfs_lease lease, void *data);
 */
 struct gf_upcall;
 
-int glfs_lease (struct glfs_fd *glfd, struct glfs_lease *lease,
-                glfs_recall_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_lease, 4.0.0);
-int
-glfs_recall_lease_fd (struct glfs *fs, struct gf_upcall *up_data) __THROW
-        GFAPI_PUBLIC(glfs_recall_lease_fd, 4.0.0);
-
 int
-glfs_recall_lease_upcall (struct glfs *fs, struct glfs_upcall *up_arg,
-                          struct gf_upcall *up_data) __THROW
-        GFAPI_PUBLIC(glfs_recall_lease_upcall, 4.0.0);
+glfs_lease (struct glfs_fd *glfd, struct glfs_lease *lease,
+            glfs_recall_cbk fn, void *data) __THROW
+        GFAPI_PUBLIC(glfs_lease, 4.0.0);
 __END_DECLS
 #endif /* !_GLFS_H */