From 05b9dce1b503ab10efdb79a870b07d982cb5a823 Mon Sep 17 00:00:00 2001
From: Soumya Koduri <skoduri@redhat.com>
Date: Fri, 13 Oct 2017 20:15:55 +0530
Subject: gfapi: update symbol version of glfd_set_lk_owner to 3.10.7

To be able to backport the API glfd_set_lk_owner() to
existing stable (3.10, 3.12) releases, change its symbol
version to 3.10.7 (upcoming 3.10 release).

Also sticking to the norms of the gfapi library, changing
the routine name to glfs_fd_set_lkowner()

BUG: 1499641
Change-Id: I43d002a24f493770a3daa774dbda2b7ea6d49e37
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
---
 api/src/gfapi.aliases            |  3 +--
 api/src/gfapi.map                | 12 ++++++------
 api/src/glfs-fops.c              |  4 ++--
 api/src/glfs.h                   |  4 ++--
 tests/basic/gfapi/glfd-lkowner.c |  8 ++++----
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases
index 00a9e3753af..85e8448982d 100644
--- a/api/src/gfapi.aliases
+++ b/api/src/gfapi.aliases
@@ -156,6 +156,7 @@ _pub_glfs_upcall_inode_get_oldpstat _glfs_upcall_inode_get_oldpstat$GFAPI_3.7.16
 _pub_glfs_realpath _glfs_realpath$GFAPI_3.7.17
 
 _pub_glfs_sysrq _glfs_sysrq$GFAPI_3.10.0
+_pub_glfs_fd_set_lkowner _glfs_fd_set_lkowner$GFAPI_3.10.7
 
 _pub_glfs_xreaddirplus_r _glfs_xreaddirplus_r$GFAPI_3.11.0
 _pub_glfs_xreaddirplus_r_get_stat _glfs_xreaddirplus_r_get_stat$GFAPI_3.11.0
@@ -163,5 +164,3 @@ _pub_glfs_xreaddirplus_r_get_object _glfs_xreaddirplus_r_get_object$GFAPI_3.11.0
 _pub_glfs_object_copy _glfs_object_copy$GFAPI_3.11.0
 
 _priv_glfs_ipc _glfs_ipc$GFAPI_3.12.0
-
-_pub_glfd_set_lk_owner _glfd_set_lk_owner$GFAPI_3.13.0
diff --git a/api/src/gfapi.map b/api/src/gfapi.map
index c9ce4d82235..88673007d25 100644
--- a/api/src/gfapi.map
+++ b/api/src/gfapi.map
@@ -198,19 +198,19 @@ GFAPI_3.10.0 {
 		glfs_sysrq;
 } GFAPI_3.7.17;
 
+GFAPI_3.10.7 {
+	global:
+		glfs_fd_set_lkowner;
+} GFAPI_3.10.0;
+
 GFAPI_3.11.0 {
 		glfs_xreaddirplus_r;
 		glfs_xreaddirplus_r_get_stat;
 		glfs_xreaddirplus_r_get_object;
                 glfs_object_copy;
-} GFAPI_3.10.0;
+} GFAPI_3.10.7;
 
 GFAPI_PRIVATE_3.12.0 {
 	global:
 		glfs_ipc;
 } GFAPI_3.11.0;
-
-GFAPI_3.13.0 {
-	global:
-		glfd_set_lk_owner;
-} GFAPI_PRIVATE_3.12.0;
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index f47ef625613..8d1ee9de1d7 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -4309,7 +4309,7 @@ invalid_fs:
 GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_posix_lock, 3.4.0);
 
 int
-pub_glfd_set_lk_owner (glfs_fd_t *glfd, void *data, int len)
+pub_glfs_fd_set_lkowner (glfs_fd_t *glfd, void *data, int len)
 {
         int ret = -1;
 
@@ -4344,7 +4344,7 @@ out:
 invalid_fs:
         return ret;
 }
-GFAPI_SYMVER_PUBLIC_DEFAULT(glfd_set_lk_owner, 3.13.0);
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fd_set_lkowner, 3.10.7);
 
 struct glfs_fd *
 pub_glfs_dup (struct glfs_fd *glfd)
diff --git a/api/src/glfs.h b/api/src/glfs.h
index acf63c32655..ec3258d083a 100644
--- a/api/src/glfs.h
+++ b/api/src/glfs.h
@@ -881,8 +881,8 @@ glfs_xreaddirplus_r (struct glfs_fd *glfd, uint32_t flags,
  * 0: SUCCESS
  * -1: FAILURE
  */
-int glfd_set_lk_owner (glfs_fd_t *glfd, void *data, int len);
-        GFAPI_PUBLIC(glfd_set_lk_owner, 3.13.0);
+int glfs_fd_set_lkowner (glfs_fd_t *glfd, void *data, int len);
+        GFAPI_PUBLIC(glfs_fd_set_lkowner, 3.10.7);
 __END_DECLS
 
 #endif /* !_GLFS_H */
diff --git a/tests/basic/gfapi/glfd-lkowner.c b/tests/basic/gfapi/glfd-lkowner.c
index 4f2b0fc0650..031a076683c 100644
--- a/tests/basic/gfapi/glfd-lkowner.c
+++ b/tests/basic/gfapi/glfd-lkowner.c
@@ -43,8 +43,8 @@ lock1:
         lock1.l_start = l1_start;
         lock1.l_len = l1_len;
 
-        ret = glfd_set_lk_owner (glfd1, l1_owner, lo1_len);
-        LOG_ERR ("glfd_set_lk_owner on glfd1", ret);
+        ret = glfs_fd_set_lkowner (glfd1, l1_owner, lo1_len);
+        LOG_ERR ("glfs_fd_set_lkowner on glfd1", ret);
 
         ret = glfs_posix_lock (glfd1, F_SETLK, &lock1);
         LOG_ERR ("glfs_posix_lock on glfd1", ret);
@@ -59,8 +59,8 @@ lock2:
         lock2.l_start = l2_start;
         lock2.l_len = l2_len;
 
-        ret = glfd_set_lk_owner (glfd2, l2_owner, lo2_len);
-        LOG_ERR ("glfd_set_lk_owner on glfd2", ret);
+        ret = glfs_fd_set_lkowner (glfd2, l2_owner, lo2_len);
+        LOG_ERR ("glfs_fd_set_lkowner on glfd2", ret);
 
         ret = glfs_posix_lock (glfd2, F_SETLK, &lock2);
 
-- 
cgit