diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-01-20 15:27:24 -0500 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2017-05-03 12:32:50 +0000 |
| commit | 2609e2726402ad3800589a14db96aadbdba07a1a (patch) | |
| tree | f76bc1f9618ac154704ea5d3b14208b03edcd83b | |
| parent | 3d2ed278120392f3016bb20ebf4a7142a8877f7b (diff) | |
libgfapi: remove/revert glfs_ipc() changes targeted for 4.0
revert glfs_ipc() to 3.7.0 signature and associated symbol versioning
Cherry picked from commit e549df2c0d8b5dbfa6e9c129109185aaf4cea11d:
> Change-Id: Ieffe1d966234652091a4a9ae0b2c4b23f1297147
> BUG: 1415279
> Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
> Reviewed-on: https://review.gluster.org/16450
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Change-Id: Ieffe1d966234652091a4a9ae0b2c4b23f1297147
BUG: 1447543
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: https://review.gluster.org/17153
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | api/src/gfapi.aliases | 4 | ||||
| -rw-r--r-- | api/src/gfapi.map | 5 | ||||
| -rw-r--r-- | api/src/glfs.c | 15 | ||||
| -rw-r--r-- | api/src/glfs.h | 4 |
4 files changed, 6 insertions, 22 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 5acfebd83d9..d1bf2b22faa 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -125,7 +125,7 @@ _pub_glfs_h_removexattrs _glfs_h_removexattrs$GFAPI_3.5.1 _pub_glfs_get_volfile _glfs_get_volfile$GFAPI_3.6.0 _pub_glfs_h_access _glfs_h_access$GFAPI_3.6.0 -_pub_glfs_ipc37 _glfs_ipc$GFAPI_3.7.0 +_pub_glfs_ipc _glfs_ipc$GFAPI_3.7.0 _pub_glfs_h_poll_upcall _glfs_h_poll_upcall$GFAPI_3.7.0 _pub_glfs_h_acl_set _glfs_h_acl_set$GFAPI_3.7.0 _pub_glfs_h_acl_get _glfs_h_acl_get$GFAPI_3.7.0 @@ -157,5 +157,3 @@ _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_ipc _glfs_ipc$GFAPI_4.0.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index b6eb9a748e1..48a6d90e922 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -198,8 +198,3 @@ GFAPI_3.10.0 { global: glfs_sysrq; } GFAPI_3.7.17; - -GFAPI_4.0.0 { - global: - glfs_ipc; -} GFAPI_3.10.0; diff --git a/api/src/glfs.c b/api/src/glfs.c index 10af6c78e17..92657b52eca 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1320,7 +1320,7 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_get_volfile, 3.6.0); int -pub_glfs_ipc (struct glfs *fs, int opcode, void *xd_in, void **xd_out) +pub_glfs_ipc (struct glfs *fs, int opcode) { xlator_t *subvol = NULL; int ret = -1; @@ -1335,7 +1335,7 @@ pub_glfs_ipc (struct glfs *fs, int opcode, void *xd_in, void **xd_out) goto out; } - ret = syncop_ipc (subvol, opcode, (dict_t *) xd_in, (dict_t **) xd_out); + ret = syncop_ipc (subvol, opcode, NULL, NULL); DECODE_SYNCOP_ERR (ret); out: @@ -1346,16 +1346,7 @@ invalid_fs: return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ipc, 4.0.0); - -int -pub_glfs_ipc37 (struct glfs *fs, int opcode) -{ - return pub_glfs_ipc (fs, opcode, NULL, NULL); -} - -GFAPI_SYMVER_PUBLIC(glfs_ipc37, glfs_ipc, 3.7.0); - +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ipc, 3.7.0); void pub_glfs_free (void *ptr) diff --git a/api/src/glfs.h b/api/src/glfs.h index 68fcf4ddcd9..b91973ed9af 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -792,8 +792,8 @@ int glfs_sysrq (glfs_t *fs, char sysrq) __THROW /* * Nobody needs this call at all yet except for the test script. */ -int glfs_ipc (glfs_fd_t *fd, int cmd, void *xd_in, void **xd_out) __THROW - GFAPI_PUBLIC(glfs_ipc, 4.0.0); +int glfs_ipc (glfs_fd_t *fd, int cmd) __THROW + GFAPI_PUBLIC(glfs_ipc, 3.7.0); __END_DECLS |