diff options
| -rw-r--r-- | api/src/gfapi.aliases | 3 | ||||
| -rw-r--r-- | api/src/gfapi.map | 3 | ||||
| -rw-r--r-- | api/src/glfs-internal.h | 6 | ||||
| -rw-r--r-- | api/src/glfs.c | 12 | ||||
| -rw-r--r-- | api/src/glfs.h | 6 |
5 files changed, 10 insertions, 20 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index f3726a33484..b0facb717b3 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -125,7 +125,6 @@ _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_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 @@ -163,4 +162,4 @@ _pub_glfs_xreaddirplus_r_get_stat _glfs_xreaddirplus_r_get_stat$GFAPI_3.11.0 _pub_glfs_xreaddirplus_r_get_object _glfs_xreaddirplus_r_get_object$GFAPI_3.11.0 _pub_glfs_object_copy _glfs_object_copy$GFAPI_3.11.0 -_pub_glfs_ipc _glfs_ipc$GFAPI_4.0.0 +_priv_glfs_ipc _glfs_ipc$GFAPI_3.12.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 5e0c877077d..7f19e1ee4f9 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -146,7 +146,6 @@ GFAPI_3.6.0 { GFAPI_3.7.0 { global: - glfs_ipc; glfs_h_poll_upcall; glfs_h_acl_set; glfs_h_acl_get; @@ -206,7 +205,7 @@ GFAPI_3.11.0 { glfs_object_copy; } GFAPI_3.10.0; -GFAPI_4.0.0 { +GFAPI_PRIVATE_3.12.0 { global: glfs_ipc; } GFAPI_3.11.0; diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h index b5d3f78bf7c..838b5c748b2 100644 --- a/api/src/glfs-internal.h +++ b/api/src/glfs-internal.h @@ -490,4 +490,10 @@ glfd_entry_next (struct glfs_fd *glfd, int plus); void gf_dirent_to_dirent (gf_dirent_t *gf_dirent, struct dirent *dirent); +/* + * 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_PRIVATE(glfs_ipc, 3.12.0); + #endif /* !_GLFS_INTERNAL_H */ diff --git a/api/src/glfs.c b/api/src/glfs.c index 6d03aaa9b69..8369546667b 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1342,7 +1342,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) +priv_glfs_ipc (struct glfs *fs, int opcode, void *xd_in, void **xd_out) { xlator_t *subvol = NULL; int ret = -1; @@ -1368,15 +1368,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_PRIVATE_DEFAULT(glfs_ipc, 3.12.0); void diff --git a/api/src/glfs.h b/api/src/glfs.h index 4e535bda168..5420a1dde66 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -855,12 +855,6 @@ glfs_xreaddirplus_r (struct glfs_fd *glfd, uint32_t flags, struct dirent *ext, struct dirent **res); GFAPI_PUBLIC(glfs_xreaddirplus_r, 3.11.0); -/* - * 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); - __END_DECLS #endif /* !_GLFS_H */ |