1 files changed, 48 insertions, 15 deletions

diff --git a/api/src/glfs.c b/api/src/glfs.c
index e1f6bbcdab4..b5e03795290 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -278,8 +278,8 @@ out:
 
 
 int
-glfs_set_xlator_option (struct glfs *fs, const char *xlator, const char *key,
-			const char *value)
+pub_glfs_set_xlator_option (struct glfs *fs, const char *xlator,
+                            const char *key, const char *value)
 {
 	xlator_cmdline_option_t *option = NULL;
 
@@ -317,27 +317,44 @@ enomem:
 	return -1;
 }
 
-int glfs_setfsuid (uid_t fsuid)
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_set_xlator_option, 3.4.0);
+
+
+int
+pub_glfs_setfsuid (uid_t fsuid)
 {
 	return syncopctx_setfsuid (&fsuid);
 }
 
-int glfs_setfsgid (gid_t fsgid)
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_setfsuid, 3.4.2);
+
+
+int
+pub_glfs_setfsgid (gid_t fsgid)
 {
 	return syncopctx_setfsgid (&fsgid);
 }
 
-int glfs_setfsgroups (size_t size, const gid_t *list)
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_setfsgid, 3.4.2);
+
+
+int
+pub_glfs_setfsgroups (size_t size, const gid_t *list)
 {
 	return syncopctx_setfsgroups(size, list);
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_setfsgroups, 3.4.2);
+
+
 struct glfs *
-glfs_from_glfd (struct glfs_fd *glfd)
+pub_glfs_from_glfd (struct glfs_fd *glfd)
 {
 	return glfd->fs;
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_from_glfd, 3.4.0);
+
 
 struct glfs_fd *
 glfs_fd_new (struct glfs *fs)
@@ -402,7 +419,7 @@ glfs_poller (void *data)
 
 
 struct glfs *
-glfs_new (const char *volname)
+pub_glfs_new (const char *volname)
 {
 	struct glfs     *fs = NULL;
 	int              ret = -1;
@@ -448,9 +465,11 @@ glfs_new (const char *volname)
 	return fs;
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_new, 3.4.0);
+
 
 int
-glfs_set_volfile (struct glfs *fs, const char *volfile)
+pub_glfs_set_volfile (struct glfs *fs, const char *volfile)
 {
 	cmd_args_t  *cmd_args = NULL;
 
@@ -484,9 +503,11 @@ glfs_set_volfile_server (struct glfs *fs, const char *transport,
 	return 0;
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_set_volfile, 3.4.0);
+
 
 int
-glfs_set_logging (struct glfs *fs, const char *logfile, int loglevel)
+pub_glfs_set_logging (struct glfs *fs, const char *logfile, int loglevel)
 {
 	int  ret = 0;
 
@@ -502,6 +523,8 @@ glfs_set_logging (struct glfs *fs, const char *logfile, int loglevel)
 	return ret;
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_set_logging, 3.4.0);
+
 
 int
 glfs_init_wait (struct glfs *fs)
@@ -524,7 +547,7 @@ glfs_init_wait (struct glfs *fs)
 
 
 void
-glfs_init_done (struct glfs *fs, int ret)
+priv_glfs_init_done (struct glfs *fs, int ret)
 {
 	glfs_init_cbk init_cbk;
 
@@ -554,6 +577,8 @@ out:
 	return;
 }
 
+GFAPI_SYMVER_PRIVATE_DEFAULT(glfs_init_done, 3.4.0);
+
 
 int
 glfs_init_common (struct glfs *fs)
@@ -591,7 +616,7 @@ glfs_init_async (struct glfs *fs, glfs_init_cbk cbk)
 
 
 int
-glfs_init (struct glfs *fs)
+pub_glfs_init (struct glfs *fs)
 {
 	int  ret = -1;
 
@@ -604,9 +629,14 @@ glfs_init (struct glfs *fs)
 	return ret;
 }
 
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_init, 3.4.0);
+
+
+extern xlator_t *
+priv_glfs_active_subvol (struct glfs *);
 
 int
-glfs_fini (struct glfs *fs)
+pub_glfs_fini (struct glfs *fs)
 {
         int             ret = -1;
         int             countdown = 100;
@@ -637,9 +667,9 @@ glfs_fini (struct glfs *fs)
          *pool*/
         ret = (call_pool->cnt == 0)? 0: -1;
 
-        subvol = glfs_active_subvol (fs);
+        subvol = priv_glfs_active_subvol (fs);
         if (subvol) {
-                /* PARENT_DOWN within glfs_subvol_done() is issued only
+                /* PARENT_DOWN within priv_glfs_subvol_done() is issued only
                    on graph switch (new graph should activiate and
                    decrement the extra @winds count taken in glfs_graph_setup()
 
@@ -652,7 +682,10 @@ glfs_fini (struct glfs *fs)
                 */
         }
 
-        glfs_subvol_done (fs, subvol);
+        priv_glfs_subvol_done (fs, subvol);
 
         return ret;
 }
+
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fini, 3.4.0);
+