diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-10-14 15:10:36 +0200 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-10-14 13:29:15 -0700 |
| commit | a95fd26fd1c7c336cb3eaaf61779883ab69b66b0 (patch) | |
| tree | 994769a9cd18c43686e58aad3daea483ec411ca6 | |
| parent | f59d0c80f612413e02712ab4d8e7132b7a714d19 (diff) | |
api: revert addition of glfs_ipc_xd()
It is intended for 4.0
Cherry picked from commit f4e5841eb6f132174e65ccad91fd2f6021771f29:
> Change-Id: Ieffe1d966234652091a4a9ae0b2c4b23f1297147
> BUG: 1345977
> Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
> Reviewed-on: http://review.gluster.org/14716
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Note that this 'backport' is done on a patch from the release-3.8
branch, and it not part of the master branch.
Change-Id: Ieffe1d966234652091a4a9ae0b2c4b23f1297147
BUG: 1364529
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/15642
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | api/src/gfapi.aliases | 2 | ||||
| -rw-r--r-- | api/src/gfapi.map | 5 | ||||
| -rw-r--r-- | api/src/glfs.c | 14 |
3 files changed, 3 insertions, 18 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 74ef4d3442d..c1331b9d582 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -154,5 +154,3 @@ _pub_glfs_upcall_inode_get_pstat _glfs_upcall_inode_get_pstat$GFAPI_3.7.16 _pub_glfs_upcall_inode_get_oldpobject _glfs_upcall_inode_get_oldpobject$GFAPI_3.7.16 _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_ipc _glfs_ipc$GFAPI_4.0.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 1ae6d4665fc..f7c0918fb13 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -192,8 +192,3 @@ GFAPI_3.7.17 { global: glfs_realpath; } GFAPI_3.7.16; - -GFAPI_4.0.0 { - global: - glfs_ipc; -} GFAPI_3.7.16; diff --git a/api/src/glfs.c b/api/src/glfs.c index a9d56071743..641ab1beb66 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1325,7 +1325,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; @@ -1340,7 +1340,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: @@ -1351,15 +1351,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 |