From e0ee7d755bc90c1f829e4ec3b0d5dfd9f9d480b9 Mon Sep 17 00:00:00 2001

From: Tamar Shacked <tshacked@redhat.com>

Date: Mon, 26 Jul 2021 16:59:28 +0300

Subject: rhel-9.0-beta build: fixing gcc-10 and LTO errors

libgfapi symbol versions break LTO in Fedora rawhide/f33

Upstream:

> Reviewed-on: https://review.gluster.org/#/c/glusterfs/+/24666/

> fixes: #1352

> Change-Id: I05fda580afacfff1bfc07be810dd1afc08a92fb8

> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

Duplicate defns of cli_default_conn_timeout and cli_ten_minutes_timeout

Upstream:

> Reviewed-on: https://review.gluster.org/#/c/glusterfs/+/23956/

> Change-Id: I54ea485736a4910254eeb21222ad263721cdef3c

> Fixes: bz#1193929

> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

BUG: 1939340

Signed-off-by: Tamar Shacked <tshacked@redhat.com>

Change-Id: If40e4733d12713d2821653cdbce7b6e931f12140

---

 api/src/glfs-fops.c         | 322 ++++++++++++------------------------

 api/src/glfs-handleops.c    |  99 ++++-------

 api/src/glfs-internal.h     |  27 ++-

 api/src/glfs-mgmt.c         |   3 +-

 api/src/glfs-resolve.c      |  14 +-

 api/src/glfs.c              |  99 +++++------

 cli/src/cli-cmd-global.c    |   1 -

 cli/src/cli-cmd-misc.c      |   4 -

 cli/src/cli-cmd-peer.c      |   4 -

 cli/src/cli-cmd-snapshot.c  |   2 -

 cli/src/cli-cmd-system.c    |   4 -

 cli/src/cli-cmd-volume.c    |   4 -

 cli/src/cli-quotad-client.c |   3 -

 cli/src/cli-rpc-ops.c       |   5 +-

 cli/src/cli.c               |   4 +

 cli/src/cli.h               |  10 +-

 16 files changed, 223 insertions(+), 382 deletions(-)

diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c

index 6dc3b66c8..e772aa77a 100644

--- a/api/src/glfs-fops.c

+++ b/api/src/glfs-fops.c

@@ -292,6 +292,7 @@ glfs_iatt_to_statx(struct glfs *fs, const struct iatt *iatt,

     statx->glfs_st_attributes_mask = 0;

 }

+GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_iatt_from_statx, 6.0)

 void

 priv_glfs_iatt_from_statx(struct iatt *iatt, const struct glfs_stat *statx)

 {

@@ -371,7 +372,6 @@ priv_glfs_iatt_from_statx(struct iatt *iatt, const struct glfs_stat *statx)

     iatt->ia_attributes = statx->glfs_st_attributes;

     iatt->ia_attributes_mask = statx->glfs_st_attributes_mask;

 }

-GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_iatt_from_statx, 6.0);

 void

 glfsflags_from_gfapiflags(struct glfs_stat *stat, int *glvalid)

@@ -415,6 +415,7 @@ glfs_loc_unlink(loc_t *loc)

     return 0;

 }

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_open, 3.4.0)

 struct glfs_fd *

 pub_glfs_open(struct glfs *fs, const char *path, int flags)

 {

@@ -509,8 +510,7 @@ invalid_fs:

     return glfd;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_open, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_close, 3.4.0)

 int

 pub_glfs_close(struct glfs_fd *glfd)

 {

@@ -565,8 +565,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_close, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_lstat, 3.4.0)

 int

 pub_glfs_lstat(struct glfs *fs, const char *path, struct stat *stat)

 {

@@ -607,8 +606,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_lstat, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_stat, 3.4.0)

 int

 pub_glfs_stat(struct glfs *fs, const char *path, struct stat *stat)

 {

@@ -649,8 +647,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_stat, 3.4.0);

-

+GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_statx, 6.0)

 int

 priv_glfs_statx(struct glfs *fs, const char *path, const unsigned int mask,

                 struct glfs_stat *statxbuf)

@@ -704,8 +701,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_statx, 6.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fstat, 3.4.0)

 int

 pub_glfs_fstat(struct glfs_fd *glfd, struct stat *stat)

 {

@@ -754,8 +750,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fstat, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_creat, 3.4.0)

 struct glfs_fd *

 pub_glfs_creat(struct glfs *fs, const char *path, int flags, mode_t mode)

 {

@@ -902,8 +897,6 @@ invalid_fs:

     return glfd;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_creat, 3.4.0);

-

 #ifdef HAVE_SEEK_HOLE

 static int

 glfs_seek(struct glfs_fd *glfd, off_t offset, int whence)

@@ -957,6 +950,7 @@ out:

 }

 #endif

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_lseek, 3.4.0)

 off_t

 pub_glfs_lseek(struct glfs_fd *glfd, off_t offset, int whence)

 {

@@ -1012,8 +1006,6 @@ invalid_fs:

     return -1;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_lseek, 3.4.0);

-

 static ssize_t

 glfs_preadv_common(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

                    off_t offset, int flags, struct glfs_stat *poststat)

@@ -1091,6 +1083,7 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv, 3.4.0)

 ssize_t

 pub_glfs_preadv(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

                 off_t offset, int flags)

@@ -1098,8 +1091,7 @@ pub_glfs_preadv(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

     return glfs_preadv_common(glfd, iovec, iovcnt, offset, flags, NULL);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read, 3.4.0)

 ssize_t

 pub_glfs_read(struct glfs_fd *glfd, void *buf, size_t count, int flags)

 {

@@ -1116,8 +1108,7 @@ pub_glfs_read(struct glfs_fd *glfd, void *buf, size_t count, int flags)

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_pread34, glfs_pread, 3.4.0)

 ssize_t

 pub_glfs_pread34(struct glfs_fd *glfd, void *buf, size_t count, off_t offset,

                  int flags)

@@ -1135,8 +1126,7 @@ pub_glfs_pread34(struct glfs_fd *glfd, void *buf, size_t count, off_t offset,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_pread34, glfs_pread, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread, 6.0)

 ssize_t

 pub_glfs_pread(struct glfs_fd *glfd, void *buf, size_t count, off_t offset,

                int flags, struct glfs_stat *poststat)

@@ -1154,8 +1144,7 @@ pub_glfs_pread(struct glfs_fd *glfd, void *buf, size_t count, off_t offset,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread, 6.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv, 3.4.0)

 ssize_t

 pub_glfs_readv(struct glfs_fd *glfd, const struct iovec *iov, int count,

                int flags)

@@ -1167,8 +1156,6 @@ pub_glfs_readv(struct glfs_fd *glfd, const struct iovec *iov, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv, 3.4.0);

-

 struct glfs_io {

     struct glfs_fd *glfd;

     int op;

@@ -1370,6 +1357,7 @@ invalid_fs:

     return -1;

 }

+GFAPI_SYMVER_PUBLIC(glfs_preadv_async34, glfs_preadv_async, 3.4.0)

 int

 pub_glfs_preadv_async34(struct glfs_fd *glfd, const struct iovec *iovec,

                         int count, off_t offset, int flags, glfs_io_cbk34 fn,

@@ -1379,8 +1367,7 @@ pub_glfs_preadv_async34(struct glfs_fd *glfd, const struct iovec *iovec,

                                     (void *)fn, data);

 }

-GFAPI_SYMVER_PUBLIC(glfs_preadv_async34, glfs_preadv_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv_async, 6.0)

 int

 pub_glfs_preadv_async(struct glfs_fd *glfd, const struct iovec *iovec,

                       int count, off_t offset, int flags, glfs_io_cbk fn,

@@ -1390,8 +1377,7 @@ pub_glfs_preadv_async(struct glfs_fd *glfd, const struct iovec *iovec,

                                     _gf_false, fn, data);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_read_async34, glfs_read_async, 3.4.0)

 int

 pub_glfs_read_async34(struct glfs_fd *glfd, void *buf, size_t count, int flags,

                       glfs_io_cbk34 fn, void *data)

@@ -1410,8 +1396,7 @@ pub_glfs_read_async34(struct glfs_fd *glfd, void *buf, size_t count, int flags,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_read_async34, glfs_read_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read_async, 6.0)

 int

 pub_glfs_read_async(struct glfs_fd *glfd, void *buf, size_t count, int flags,

                     glfs_io_cbk fn, void *data)

@@ -1430,8 +1415,7 @@ pub_glfs_read_async(struct glfs_fd *glfd, void *buf, size_t count, int flags,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_pread_async34, glfs_pread_async, 3.4.0)

 int

 pub_glfs_pread_async34(struct glfs_fd *glfd, void *buf, size_t count,

                        off_t offset, int flags, glfs_io_cbk34 fn, void *data)

@@ -1450,8 +1434,7 @@ pub_glfs_pread_async34(struct glfs_fd *glfd, void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_pread_async34, glfs_pread_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread_async, 6.0)

 int

 pub_glfs_pread_async(struct glfs_fd *glfd, void *buf, size_t count,

                      off_t offset, int flags, glfs_io_cbk fn, void *data)

@@ -1470,8 +1453,7 @@ pub_glfs_pread_async(struct glfs_fd *glfd, void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_readv_async34, glfs_readv_async, 3.4.0)

 int

 pub_glfs_readv_async34(struct glfs_fd *glfd, const struct iovec *iov, int count,

                        int flags, glfs_io_cbk34 fn, void *data)

@@ -1483,8 +1465,7 @@ pub_glfs_readv_async34(struct glfs_fd *glfd, const struct iovec *iov, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_readv_async34, glfs_readv_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv_async, 6.0)

 int

 pub_glfs_readv_async(struct glfs_fd *glfd, const struct iovec *iov, int count,

                      int flags, glfs_io_cbk fn, void *data)

@@ -1496,8 +1477,6 @@ pub_glfs_readv_async(struct glfs_fd *glfd, const struct iovec *iov, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv_async, 6.0);

-

 static ssize_t

 glfs_pwritev_common(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

                     off_t offset, int flags, struct glfs_stat *prestat,

@@ -1591,6 +1570,7 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_copy_file_range, 6.0)

 ssize_t

 pub_glfs_copy_file_range(struct glfs_fd *glfd_in, off64_t *off_in,

                          struct glfs_fd *glfd_out, off64_t *off_out, size_t len,

@@ -1744,8 +1724,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_copy_file_range, 6.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev, 3.4.0)

 ssize_t

 pub_glfs_pwritev(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

                  off_t offset, int flags)

@@ -1753,8 +1732,7 @@ pub_glfs_pwritev(struct glfs_fd *glfd, const struct iovec *iovec, int iovcnt,

     return glfs_pwritev_common(glfd, iovec, iovcnt, offset, flags, NULL, NULL);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write, 3.4.0)

 ssize_t

 pub_glfs_write(struct glfs_fd *glfd, const void *buf, size_t count, int flags)

 {

@@ -1771,8 +1749,7 @@ pub_glfs_write(struct glfs_fd *glfd, const void *buf, size_t count, int flags)

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev, 3.4.0)

 ssize_t

 pub_glfs_writev(struct glfs_fd *glfd, const struct iovec *iov, int count,

                 int flags)

@@ -1784,8 +1761,7 @@ pub_glfs_writev(struct glfs_fd *glfd, const struct iovec *iov, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_pwrite34, glfs_pwrite, 3.4.0)

 ssize_t

 pub_glfs_pwrite34(struct glfs_fd *glfd, const void *buf, size_t count,

                   off_t offset, int flags)

@@ -1803,8 +1779,7 @@ pub_glfs_pwrite34(struct glfs_fd *glfd, const void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_pwrite34, glfs_pwrite, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite, 6.0)

 ssize_t

 pub_glfs_pwrite(struct glfs_fd *glfd, const void *buf, size_t count,

                 off_t offset, int flags, struct glfs_stat *prestat,

@@ -1823,8 +1798,6 @@ pub_glfs_pwrite(struct glfs_fd *glfd, const void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite, 6.0);

-

 extern glfs_t *

 pub_glfs_from_glfd(glfs_fd_t *);

@@ -1943,6 +1916,7 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_pwritev_async34, glfs_pwritev_async, 3.4.0)

 int

 pub_glfs_pwritev_async34(struct glfs_fd *glfd, const struct iovec *iovec,

                          int count, off_t offset, int flags, glfs_io_cbk34 fn,

@@ -1952,8 +1926,7 @@ pub_glfs_pwritev_async34(struct glfs_fd *glfd, const struct iovec *iovec,

                                      _gf_true, (void *)fn, data);

 }

-GFAPI_SYMVER_PUBLIC(glfs_pwritev_async34, glfs_pwritev_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev_async, 6.0)

 int

 pub_glfs_pwritev_async(struct glfs_fd *glfd, const struct iovec *iovec,

                        int count, off_t offset, int flags, glfs_io_cbk fn,

@@ -1963,8 +1936,7 @@ pub_glfs_pwritev_async(struct glfs_fd *glfd, const struct iovec *iovec,

                                      _gf_false, fn, data);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_write_async34, glfs_write_async, 3.4.0)

 int

 pub_glfs_write_async34(struct glfs_fd *glfd, const void *buf, size_t count,

                        int flags, glfs_io_cbk34 fn, void *data)

@@ -1983,8 +1955,7 @@ pub_glfs_write_async34(struct glfs_fd *glfd, const void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_write_async34, glfs_write_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write_async, 6.0)

 int

 pub_glfs_write_async(struct glfs_fd *glfd, const void *buf, size_t count,

                      int flags, glfs_io_cbk fn, void *data)

@@ -2003,8 +1974,7 @@ pub_glfs_write_async(struct glfs_fd *glfd, const void *buf, size_t count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_pwrite_async34, glfs_pwrite_async, 3.4.0)

 int

 pub_glfs_pwrite_async34(struct glfs_fd *glfd, const void *buf, int count,

                         off_t offset, int flags, glfs_io_cbk34 fn, void *data)

@@ -2023,8 +1993,7 @@ pub_glfs_pwrite_async34(struct glfs_fd *glfd, const void *buf, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_pwrite_async34, glfs_pwrite_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite_async, 6.0)

 int

 pub_glfs_pwrite_async(struct glfs_fd *glfd, const void *buf, int count,

                       off_t offset, int flags, glfs_io_cbk fn, void *data)

@@ -2043,8 +2012,7 @@ pub_glfs_pwrite_async(struct glfs_fd *glfd, const void *buf, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_writev_async34, glfs_writev_async, 3.4.0)

 int

 pub_glfs_writev_async34(struct glfs_fd *glfd, const struct iovec *iov,

                         int count, int flags, glfs_io_cbk34 fn, void *data)

@@ -2056,8 +2024,7 @@ pub_glfs_writev_async34(struct glfs_fd *glfd, const struct iovec *iov,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_writev_async34, glfs_writev_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev_async, 6.0)

 int

 pub_glfs_writev_async(struct glfs_fd *glfd, const struct iovec *iov, int count,

                       int flags, glfs_io_cbk fn, void *data)

@@ -2069,8 +2036,6 @@ pub_glfs_writev_async(struct glfs_fd *glfd, const struct iovec *iov, int count,

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev_async, 6.0);

-

 static int

 glfs_fsync_common(struct glfs_fd *glfd, struct glfs_stat *prestat,

                   struct glfs_stat *poststat)

@@ -2135,14 +2100,14 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_fsync34, glfs_fsync, 3.4.0)

 int

 pub_glfs_fsync34(struct glfs_fd *glfd)

 {

     return glfs_fsync_common(glfd, NULL, NULL);

 }

-GFAPI_SYMVER_PUBLIC(glfs_fsync34, glfs_fsync, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, 6.0)

 int

 pub_glfs_fsync(struct glfs_fd *glfd, struct glfs_stat *prestat,

                struct glfs_stat *poststat)

@@ -2150,8 +2115,6 @@ pub_glfs_fsync(struct glfs_fd *glfd, struct glfs_stat *prestat,

     return glfs_fsync_common(glfd, prestat, poststat);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, 6.0);

-

 static int

 glfs_fsync_async_cbk(call_frame_t *frame, void *cookie, xlator_t *this,

                      int32_t op_ret, int32_t op_errno, struct iatt *prebuf,

@@ -2232,6 +2195,7 @@ out:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_fsync_async34, glfs_fsync_async, 3.4.0)

 int

 pub_glfs_fsync_async34(struct glfs_fd *glfd, glfs_io_cbk34 fn, void *data)

 {

@@ -2248,8 +2212,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_fsync_async34, glfs_fsync_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync_async, 6.0)

 int

 pub_glfs_fsync_async(struct glfs_fd *glfd, glfs_io_cbk fn, void *data)

 {

@@ -2266,8 +2229,6 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync_async, 6.0);

-

 static int

 glfs_fdatasync_common(struct glfs_fd *glfd, struct glfs_stat *prestat,

                       struct glfs_stat *poststat)

@@ -2332,14 +2293,14 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_fdatasync34, glfs_fdatasync, 3.4.0)

 int

 pub_glfs_fdatasync34(struct glfs_fd *glfd)

 {

     return glfs_fdatasync_common(glfd, NULL, NULL);

 }

-GFAPI_SYMVER_PUBLIC(glfs_fdatasync34, glfs_fdatasync, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, 6.0)

 int

 pub_glfs_fdatasync(struct glfs_fd *glfd, struct glfs_stat *prestat,

                    struct glfs_stat *poststat)

@@ -2347,8 +2308,7 @@ pub_glfs_fdatasync(struct glfs_fd *glfd, struct glfs_stat *prestat,

     return glfs_fdatasync_common(glfd, prestat, poststat);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, 6.0);

-

+GFAPI_SYMVER_PUBLIC(glfs_fdatasync_async34, glfs_fdatasync_async, 3.4.0)

 int

 pub_glfs_fdatasync_async34(struct glfs_fd *glfd, glfs_io_cbk34 fn, void *data)

 {

@@ -2365,8 +2325,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC(glfs_fdatasync_async34, glfs_fdatasync_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync_async, 6.0)

 int

 pub_glfs_fdatasync_async(struct glfs_fd *glfd, glfs_io_cbk fn, void *data)

 {

@@ -2383,8 +2342,6 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync_async, 6.0);

-

 static int

 glfs_ftruncate_common(struct glfs_fd *glfd, off_t offset,

                       struct glfs_stat *prestat, struct glfs_stat *poststat)

@@ -2450,14 +2407,14 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_ftruncate34, glfs_ftruncate, 3.4.0)

 int

 pub_glfs_ftruncate34(struct glfs_fd *glfd, off_t offset)

 {

     return glfs_ftruncate_common(glfd, offset, NULL, NULL);

 }

-GFAPI_SYMVER_PUBLIC(glfs_ftruncate34, glfs_ftruncate, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, 6.0)

 int

 pub_glfs_ftruncate(struct glfs_fd *glfd, off_t offset,

                    struct glfs_stat *prestat, struct glfs_stat *poststat)

@@ -2465,8 +2422,7 @@ pub_glfs_ftruncate(struct glfs_fd *glfd, off_t offset,

     return glfs_ftruncate_common(glfd, offset, prestat, poststat);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, 6.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_truncate, 3.7.15)

 int

 pub_glfs_truncate(struct glfs *fs, const char *path, off_t length)

 {

@@ -2512,8 +2468,6 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_truncate, 3.7.15);

-

 static int

 glfs_ftruncate_async_cbk(call_frame_t *frame, void *cookie, xlator_t *this,

                          int32_t op_ret, int32_t op_errno, struct iatt *prebuf,

@@ -2606,6 +2560,7 @@ invalid_fs:

     return ret;

 }

+GFAPI_SYMVER_PUBLIC(glfs_ftruncate_async34, glfs_ftruncate_async, 3.4.0)

 int

 pub_glfs_ftruncate_async34(struct glfs_fd *glfd, off_t offset, glfs_io_cbk34 fn,

                            void *data)

@@ -2614,8 +2569,7 @@ pub_glfs_ftruncate_async34(struct glfs_fd *glfd, off_t offset, glfs_io_cbk34 fn,

                                        data);

 }

-GFAPI_SYMVER_PUBLIC(glfs_ftruncate_async34, glfs_ftruncate_async, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate_async, 6.0)

 int

 pub_glfs_ftruncate_async(struct glfs_fd *glfd, off_t offset, glfs_io_cbk fn,

                          void *data)

@@ -2623,8 +2577,7 @@ pub_glfs_ftruncate_async(struct glfs_fd *glfd, off_t offset, glfs_io_cbk fn,

     return glfs_ftruncate_async_common(glfd, offset, _gf_false, fn, data);

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate_async, 6.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_access, 3.4.0)

 int

 pub_glfs_access(struct glfs *fs, const char *path, int mode)

 {

@@ -2670,8 +2623,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_access, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_symlink, 3.4.0)

 int

 pub_glfs_symlink(struct glfs *fs, const char *data, const char *path)

 {

@@ -2761,8 +2713,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_symlink, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readlink, 3.4.0)

 int

 pub_glfs_readlink(struct glfs *fs, const char *path, char *buf, size_t bufsiz)

 {

@@ -2819,8 +2770,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readlink, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_mknod, 3.4.0)

 int

 pub_glfs_mknod(struct glfs *fs, const char *path, mode_t mode, dev_t dev)

 {

@@ -2910,8 +2860,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_mknod, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_mkdir, 3.4.0)

 int

 pub_glfs_mkdir(struct glfs *fs, const char *path, mode_t mode)

 {

@@ -3001,8 +2950,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_mkdir, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_unlink, 3.4.0)

 int

 pub_glfs_unlink(struct glfs *fs, const char *path)

 {

@@ -3058,8 +3006,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_unlink, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_rmdir, 3.4.0)

 int

 pub_glfs_rmdir(struct glfs *fs, const char *path)

 {

@@ -3114,8 +3061,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_rmdir, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_rename, 3.4.0)

 int

 pub_glfs_rename(struct glfs *fs, const char *oldpath, const char *newpath)

 {

@@ -3204,8 +3150,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_rename, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_link, 3.4.0)

 int

 pub_glfs_link(struct glfs *fs, const char *oldpath, const char *newpath)

 {

@@ -3291,8 +3236,7 @@ invalid_fs:

     return ret;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_link, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_opendir, 3.4.0)

 struct glfs_fd *

 pub_glfs_opendir(struct glfs *fs, const char *path)

 {

@@ -3373,8 +3317,7 @@ invalid_fs:

     return glfd;

 }

-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_opendir, 3.4.0);

-

+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_closedir, 3.4.0)

 int

 pub_glfs_closedir(struct glfs_fd *glfd)

 {