diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-06-13 10:56:56 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-13 11:58:22 -0700 |
| commit | f4e5841eb6f132174e65ccad91fd2f6021771f29 (patch) | |
| tree | 8c4009189d88705ad7c9068c7d28cd3b9704f76c | |
| parent | 1364929574c1af7784ac47088d2f7507ee0103e4 (diff) | |
api: revert addition of glfs_ipc_xd()
It is intended for 4.0
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>
| -rw-r--r-- | api/src/gfapi.aliases | 1 | ||||
| -rw-r--r-- | api/src/gfapi.map | 5 | ||||
| -rw-r--r-- | api/src/glfs.c | 12 |
3 files changed, 2 insertions, 16 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 7181dd2f6e8..40b6ed21192 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -140,4 +140,3 @@ _priv_glfs_resolve _glfs_resolve$GFAPI_PRIVATE_3.7.0 _priv_glfs_process_upcall_event _glfs_process_upcall_event$GFAPI_PRIVATE_3.7.0 _pub_glfs_h_lookupat _glfs_h_lookupat$GFAPI_3.7.4 -_pub_glfs_ipc_xd _glfs_ipc_xd@GFAPI_4.0.4 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index b35984a088c..d42ae2b97af 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -167,8 +167,3 @@ GFAPI_3.7.4 { global: glfs_h_lookupat; } GFAPI_PRIVATE_3.7.0; - -GFAPI_4.0.0 { - global: - glfs_ipc_xd; -} GFAPI_3.7.4; diff --git a/api/src/glfs.c b/api/src/glfs.c index 3f39b682e42..ee744872e22 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1279,7 +1279,7 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_get_volfile, 3.6.0); int -pub_glfs_ipc_xd (struct glfs *fs, int opcode, dict_t *xd_in, dict_t **xd_out) +pub_glfs_ipc (struct glfs *fs, int opcode) { xlator_t *subvol = NULL; int ret = -1; @@ -1294,7 +1294,7 @@ pub_glfs_ipc_xd (struct glfs *fs, int opcode, dict_t *xd_in, dict_t **xd_out) goto out; } - ret = syncop_ipc (subvol, opcode, xd_in, xd_out); + ret = syncop_ipc (subvol, opcode, NULL, NULL); DECODE_SYNCOP_ERR (ret); out: @@ -1305,12 +1305,4 @@ invalid_fs: return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ipc_xd, 4.0.0); - -int -pub_glfs_ipc (struct glfs *fs, int opcode) -{ - return pub_glfs_ipc_xd (fs, opcode, NULL, NULL); -} - GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ipc, 3.7.0); |