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#1575716
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

1 files changed, 18 insertions, 26 deletions

diff --git a/api/src/glfs.h b/api/src/glfs.h
index f9f8d4f36a2..ee4ba1fd72a 100644
--- a/api/src/glfs.h
+++ b/api/src/glfs.h
@@ -512,10 +512,10 @@ ssize_t glfs_write (glfs_fd_t *fd, const void *buf,
         GFAPI_PUBLIC(glfs_write, 3.4.0);
 int glfs_read_async (glfs_fd_t *fd, void *buf, size_t count, int flags,
 		     glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_read_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_read_async, future);
 int glfs_write_async (glfs_fd_t *fd, const void *buf, size_t count, int flags,
 		      glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_write_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_write_async, future);
 
 // glfs_{read,write}v[_async]
 
@@ -527,26 +527,26 @@ ssize_t glfs_writev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
         GFAPI_PUBLIC(glfs_writev, 3.4.0);
 int glfs_readv_async (glfs_fd_t *fd, const struct iovec *iov, int count,
 		      int flags, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_readv_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_readv_async, future);
 int glfs_writev_async (glfs_fd_t *fd, const struct iovec *iov, int count,
 		       int flags, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_writev_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_writev_async, future);
 
 // glfs_p{read,write}[_async]
 
 ssize_t glfs_pread (glfs_fd_t *fd, void *buf, size_t count, off_t offset,
                     int flags, struct stat *poststat) __THROW
-        GFAPI_PUBLIC(glfs_pread, 4.0.0);
+        GFAPI_PUBLIC(glfs_pread, future);
 ssize_t glfs_pwrite (glfs_fd_t *fd, const void *buf, size_t count,
                      off_t offset, int flags, struct stat *prestat,
                      struct stat *poststat) __THROW
-        GFAPI_PUBLIC(glfs_pwrite, 4.0.0);
+        GFAPI_PUBLIC(glfs_pwrite, future);
 int glfs_pread_async (glfs_fd_t *fd, void *buf, size_t count, off_t offset,
 		      int flags, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_pread_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_pread_async, future);
 int glfs_pwrite_async (glfs_fd_t *fd, const void *buf, int count, off_t offset,
 		       int flags, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_pwrite_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_pwrite_async, future);
 
 // glfs_p{read,write}v[_async]
 
@@ -559,11 +559,11 @@ ssize_t glfs_pwritev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt,
 int glfs_preadv_async (glfs_fd_t *fd, const struct iovec *iov,
                        int count, off_t offset, int flags,
                        glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_preadv_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_preadv_async, future);
 int glfs_pwritev_async (glfs_fd_t *fd, const struct iovec *iov,
                         int count, off_t offset, int flags,
                         glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_pwritev_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_pwritev_async, future);
 
 
 off_t glfs_lseek (glfs_fd_t *fd, off_t offset, int whence) __THROW
@@ -574,10 +574,10 @@ int glfs_truncate (glfs_t *fs, const char *path, off_t length) __THROW
 
 int glfs_ftruncate (glfs_fd_t *fd, off_t length, struct stat *prestat,
                     struct stat *poststat) __THROW
-        GFAPI_PUBLIC(glfs_ftruncate, 4.0.0);
+        GFAPI_PUBLIC(glfs_ftruncate, future);
 int glfs_ftruncate_async (glfs_fd_t *fd, off_t length, glfs_io_cbk fn,
 			  void *data) __THROW
-        GFAPI_PUBLIC(glfs_ftruncate_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_ftruncate_async, future);
 
 int glfs_lstat (glfs_t *fs, const char *path, struct stat *buf) __THROW
         GFAPI_PUBLIC(glfs_lstat, 3.4.0);
@@ -588,15 +588,15 @@ int glfs_fstat (glfs_fd_t *fd, struct stat *buf) __THROW
 
 int glfs_fsync (glfs_fd_t *fd, struct stat *prestat,
                 struct stat *poststat) __THROW
-        GFAPI_PUBLIC(glfs_fsync, 4.0.0);
+        GFAPI_PUBLIC(glfs_fsync, future);
 int glfs_fsync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_fsync_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_fsync_async, future);
 
 int glfs_fdatasync (glfs_fd_t *fd, struct stat *prestat,
                     struct stat *poststat) __THROW
-        GFAPI_PUBLIC(glfs_fdatasync, 4.0.0);
+        GFAPI_PUBLIC(glfs_fdatasync, future);
 int glfs_fdatasync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_fdatasync_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_fdatasync_async, future);
 
 int glfs_access (glfs_t *fs, const char *path, int mode) __THROW
         GFAPI_PUBLIC(glfs_access, 3.4.0);
@@ -750,14 +750,14 @@ int glfs_discard(glfs_fd_t *fd, off_t offset, size_t len) __THROW
 
 int glfs_discard_async (glfs_fd_t *fd, off_t length, size_t lent,
 			glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_discard_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_discard_async, future);
 
 int glfs_zerofill(glfs_fd_t *fd, off_t offset, off_t len) __THROW
         GFAPI_PUBLIC(glfs_zerofill, 3.5.0);
 
 int glfs_zerofill_async (glfs_fd_t *fd, off_t length, off_t len,
                          glfs_io_cbk fn, void *data) __THROW
-        GFAPI_PUBLIC(glfs_zerofill_async, 4.0.0);
+        GFAPI_PUBLIC(glfs_zerofill_async, future);
 
 char *glfs_getcwd (glfs_t *fs, char *buf, size_t size) __THROW
         GFAPI_PUBLIC(glfs_getcwd, 3.4.0);
@@ -1156,13 +1156,5 @@ 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);
 __END_DECLS
 #endif /* !_GLFS_H */