14f8ab
From a65982755b31fb548ff7a997ee754360a516da94 Mon Sep 17 00:00:00 2001
14f8ab
From: Amar Tumballi <amarts@redhat.com>
14f8ab
Date: Fri, 14 Jun 2019 13:58:25 +0530
14f8ab
Subject: [PATCH 187/192] gfapi: statedump_path() add proper version number
14f8ab
14f8ab
An API should have the proper version number, and 'future' version
14f8ab
number is just a place holder. One shouldn't be using it in the
14f8ab
release versions.
14f8ab
14f8ab
With the previous backport of the patch, the version remained same
14f8ab
as that of 'master' branch, which is future, but as it is an API,
14f8ab
it needed a fixed version number. With this patch, corrected the same.
14f8ab
14f8ab
Label: DOWNSTREAM_ONLY
14f8ab
14f8ab
> In upstream, this is corrected by a backport to the stable version, 6.4
14f8ab
> URL: https://review.gluster.org/22864
14f8ab
14f8ab
BUG: 1720461
14f8ab
Change-Id: I939850689d47d4f240c9d43f6be1a11de29c4760
14f8ab
Signed-off-by: Amar Tumballi <amarts@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/173475
14f8ab
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
---
14f8ab
 api/examples/glfsxmp.c | 5 +++++
14f8ab
 api/src/gfapi.aliases  | 2 +-
14f8ab
 api/src/gfapi.map      | 2 +-
14f8ab
 api/src/glfs.c         | 2 +-
14f8ab
 api/src/glfs.h         | 2 +-
14f8ab
 5 files changed, 9 insertions(+), 4 deletions(-)
14f8ab
14f8ab
diff --git a/api/examples/glfsxmp.c b/api/examples/glfsxmp.c
14f8ab
index 9d96eea..33f44df 100644
14f8ab
--- a/api/examples/glfsxmp.c
14f8ab
+++ b/api/examples/glfsxmp.c
14f8ab
@@ -1573,6 +1573,11 @@ main(int argc, char *argv[])
14f8ab
 
14f8ab
     ret = glfs_set_logging(fs2, "/dev/stderr", 7);
14f8ab
 
14f8ab
+    ret = glfs_set_statedump_path(fs2, "/tmp");
14f8ab
+    if (ret) {
14f8ab
+        fprintf(stderr, "glfs_set_statedump_path: %s\n", strerror(errno));
14f8ab
+    }
14f8ab
+
14f8ab
     ret = glfs_init(fs2);
14f8ab
 
14f8ab
     fprintf(stderr, "glfs_init: returned %d\n", ret);
14f8ab
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases
14f8ab
index 8fdf734..692ae13 100644
14f8ab
--- a/api/src/gfapi.aliases
14f8ab
+++ b/api/src/gfapi.aliases
14f8ab
@@ -196,4 +196,4 @@ _pub_glfs_copy_file_range _glfs_copy_file_range$GFAPI_6.0
14f8ab
 _pub_glfs_fsetattr _glfs_fsetattr$GFAPI_6.0
14f8ab
 _pub_glfs_setattr _glfs_setattr$GFAPI_6.0
14f8ab
 
14f8ab
-_pub_glfs_set_statedump_path _glfs_set_statedump_path@GFAPI_future
14f8ab
+_pub_glfs_set_statedump_path _glfs_set_statedump_path@GFAPI_6.4
14f8ab
diff --git a/api/src/gfapi.map b/api/src/gfapi.map
14f8ab
index cf118e8..df65837 100644
14f8ab
--- a/api/src/gfapi.map
14f8ab
+++ b/api/src/gfapi.map
14f8ab
@@ -272,7 +272,7 @@ GFAPI_PRIVATE_6.1 {
14f8ab
 		glfs_setfspid;
14f8ab
 } GFAPI_6.0;
14f8ab
 
14f8ab
-GFAPI_future {
14f8ab
+GFAPI_6.4 {
14f8ab
 	global:
14f8ab
 		glfs_set_statedump_path;
14f8ab
 } GFAPI_PRIVATE_6.1;
14f8ab
diff --git a/api/src/glfs.c b/api/src/glfs.c
14f8ab
index ba513e6..6bbb620 100644
14f8ab
--- a/api/src/glfs.c
14f8ab
+++ b/api/src/glfs.c
14f8ab
@@ -1800,4 +1800,4 @@ invalid_fs:
14f8ab
     return -1;
14f8ab
 }
14f8ab
 
14f8ab
-GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_set_statedump_path, future);
14f8ab
+GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_set_statedump_path, 6.4);
14f8ab
diff --git a/api/src/glfs.h b/api/src/glfs.h
14f8ab
index a6c12e1..08b6ca0 100644
14f8ab
--- a/api/src/glfs.h
14f8ab
+++ b/api/src/glfs.h
14f8ab
@@ -1479,7 +1479,7 @@ glfs_setattr(struct glfs *fs, const char *path, struct glfs_stat *stat,
14f8ab
 
14f8ab
 int
14f8ab
 glfs_set_statedump_path(struct glfs *fs, const char *path) __THROW
14f8ab
-    GFAPI_PUBLIC(glfs_set_statedump_path, future);
14f8ab
+    GFAPI_PUBLIC(glfs_set_statedump_path, 6.4);
14f8ab
 
14f8ab
 __END_DECLS
14f8ab
 #endif /* !_GLFS_H */
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab