diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-01-20 15:27:24 -0500 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-01-24 05:42:07 -0500 |
| commit | e549df2c0d8b5dbfa6e9c129109185aaf4cea11d (patch) | |
| tree | 10ee5e9f90290b73070d6abe3a9f177f69721304 /api | |
| parent | 71b3664c5d740f931759b99adfb41e6d2abf5ea3 (diff) | |
libgfapi: remove/revert glfs_ipc() changes targeted for 4.0
revert glfs_ipc() to 3.7.0 signature and associated symbol versioning
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>
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/gfapi.aliases | 3 | ||||
| -rw-r--r-- | api/src/gfapi.map | 4 | ||||
| -rw-r--r-- | api/src/glfs.c | 15 | ||||
| -rw-r--r-- | api/src/glfs.h | 4 |
4 files changed, 6 insertions, 20 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index d2c4ba2f037..83bfd1b6f85 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 @@ -156,4 +156,3 @@ _pub_glfs_upcall_inode_get_oldpobject _glfs_upcall_inode_get_oldpobject$GFAPI_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_ipc _glfs_ipc$GFAPI_4.0.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index d022380497f..0567add0d73 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -194,7 +194,3 @@ GFAPI_3.7.17 { glfs_realpath; } GFAPI_3.7.16; -GFAPI_4.0.0 { - global: - glfs_ipc; -} GFAPI_3.7.17; diff --git a/api/src/glfs.c b/api/src/glfs.c index 4375774a853..4559707c4e1 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1323,7 +1323,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; @@ -1338,7 +1338,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: @@ -1349,16 +1349,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 903492a9466..730cff51f5a 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -775,8 +775,8 @@ void glfs_free (void *ptr) __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 |