diff options
-rw-r--r-- | api/src/gfapi.aliases | 61 | ||||
-rw-r--r-- | api/src/gfapi.map | 22 | ||||
-rw-r--r-- | api/src/glfs-fops.c | 36 | ||||
-rw-r--r-- | api/src/glfs-internal.h | 15 | ||||
-rw-r--r-- | api/src/glfs.c | 9 | ||||
-rw-r--r-- | api/src/glfs.h | 44 |
6 files changed, 107 insertions, 80 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index a05b8dd1f55..854a7d42f8f 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -27,16 +27,15 @@ _pub_glfs_pwrite_async34 _glfs_pwrite_async$GFAPI_3.4.0 _pub_glfs_preadv _glfs_preadv$GFAPI_3.4.0 _pub_glfs_pwritev _glfs_pwritev$GFAPI_3.4.0 _pub_glfs_lseek _glfs_lseek$GFAPI_3.4.0 -_pub_glfs_truncate _glfs_truncate$GFAPI_3.7.15 -_pub_glfs_ftruncate34 _glfs_ftruncate34$GFAPI_3.4.0 -_pub_glfs_ftruncate_async34 _glfs_ftruncate_async34$GFAPI_3.4.0 +_pub_glfs_ftruncate34 _glfs_ftruncate$GFAPI_3.4.0 +_pub_glfs_ftruncate_async34 _glfs_ftruncate_async$GFAPI_3.4.0 _pub_glfs_lstat _glfs_lstat$GFAPI_3.4.0 _pub_glfs_stat _glfs_stat$GFAPI_3.4.0 _pub_glfs_fstat _glfs_fstat$GFAPI_3.4.0 -_pub_glfs_fsync34 _glfs_fsync34$GFAPI_3.4.0 -_pub_glfs_fsync_async34 _glfs_fsync_async34$GFAPI_3.4.0 -_pub_glfs_fdatasync34 _glfs_fdatasync34$GFAPI_3.4.0 -_pub_glfs_fdatasync_async34 _glfs_fdatasync_async34$GFAPI_3.4.0 +_pub_glfs_fsync34 _glfs_fsync$GFAPI_3.4.0 +_pub_glfs_fsync_async34 _glfs_fsync_async$GFAPI_3.4.0 +_pub_glfs_fdatasync34 _glfs_fdatasync$GFAPI_3.4.0 +_pub_glfs_fdatasync_async34 _glfs_fdatasync_async$GFAPI_3.4.0 _pub_glfs_access _glfs_access$GFAPI_3.4.0 _pub_glfs_symlink _glfs_symlink$GFAPI_3.4.0 _pub_glfs_readlink _glfs_readlink$GFAPI_3.4.0 @@ -108,6 +107,7 @@ _pub_glfs_readdirplus _glfs_readdirplus$GFAPI_3.5.0 _pub_glfs_fallocate _glfs_fallocate$GFAPI_3.5.0 _pub_glfs_discard _glfs_discard$GFAPI_3.5.0 _pub_glfs_zerofill _glfs_zerofill$GFAPI_3.5.0 +_pub_glfs_caller_specific_init _glfs_caller_specific_init$GFAPI_3.5.0 _pub_glfs_h_setxattrs _glfs_h_setxattrs$GFAPI_3.5.0 _pub_glfs_unset_volfile_server _glfs_unset_volfile_server$GFAPI_3.5.1 @@ -117,11 +117,10 @@ _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_h_poll_upcall _glfs_h_poll_upcall$GFAPI_3.7.0 +_pub_glfs_h_poll_upcall370 _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 _pub_glfs_h_statfs _glfs_h_statfs$GFAPI_3.7.0 - _pub_glfs_h_anonymous_read _glfs_h_anonymous_read$GFAPI_3.7.0 _pub_glfs_h_anonymous_write _glfs_h_anonymous_write$GFAPI_3.7.0 @@ -132,6 +131,8 @@ _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_truncate _glfs_truncate$GFAPI_3.7.15 + _pub_glfs_free _glfs_free$GFAPI_3.7.16 _pub_glfs_h_poll_upcall _glfs_h_poll_upcall$GFAPI_3.7.16 _pub_glfs_upcall_get_fs _glfs_upcall_get_fs$GFAPI_3.7.16 @@ -145,9 +146,11 @@ _pub_glfs_upcall_inode_get_pobject _glfs_upcall_inode_get_pobject$GFAPI_3.7.16 _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_sysrq _glfs_sysrq$GFAPI_3.10.0 + _pub_glfs_fd_set_lkowner _glfs_fd_set_lkowner$GFAPI_3.10.7 _pub_glfs_xreaddirplus_r _glfs_xreaddirplus_r$GFAPI_3.11.0 @@ -164,22 +167,24 @@ _pub_glfs_setfsleaseid _glfs_setfsleaseid$GFAPI_4.0.0 _pub_glfs_file_lock _glfs_file_lock$GFAPI_4.0.0 _pub_glfs_lease _glfs_lease$GFAPI_4.0.0 _pub_glfs_h_lease _glfs_h_lease$GFAPI_4.0.0 -_pub_glfs_recall_lease _glfs_recall_lease$GFAPI_4.0.0 -_pub_glfs_read_async _glfs_read_async$GFAPI_4.0.0 -_pub_glfs_write_async _glfs_write_async$GFAPI_4.0.0 -_pub_glfs_readv_async _glfs_readv_async$GFAPI_4.0.0 -_pub_glfs_writev_async _glfs_writev_async$GFAPI_4.0.0 -_pub_glfs_pread _glfs_pread$GFAPI_4.0.0 -_pub_glfs_pwrite _glfs_pwrite$GFAPI_4.0.0 -_pub_glfs_pread_async _glfs_pread_async$GFAPI_4.0.0 -_pub_glfs_pwrite_async _glfs_pwrite_async$GFAPI_4.0.0 -_pub_glfs_preadv_async _glfs_preadv_async$GFAPI_4.0.0 -_pub_glfs_pwritev_async _glfs_pwritev_async$GFAPI_4.0.0 -_pub_glfs_fsync _glfs_fsync$GFAPI_4.0.0 -_pub_glfs_fsync_async _glfs_fsync_async$GFAPI_4.0.0 -_pub_glfs_fdatasync _glfs_fdatasync$GFAPI_4.0.0 -_pub_glfs_fdatasync_async _glfs_fdatasync_async$GFAPI_4.0.0 -_pub_glfs_ftruncate _glfs_ftruncate$GFAPI_4.0.0 -_pub_glfs_ftruncate_async _glfs_ftruncate_async$GFAPI_4.0.0 -_pub_glfs_discard_async _glfs_discard_async$GFAPI_4.0.0 -_pub_glfs_zerofill_async _glfs_zerofill_async$GFAPI_4.0.0 + +_pub_glfs_recall_lease_fd _glfs_recall_lease_fd$GFAPI_future +_pub_glfs_recall_lease_upcall _glfs_recall_lease_upcall$GFAPI_future +_pub_glfs_read_async _glfs_read_async$GFAPI_future +_pub_glfs_write_async _glfs_write_async$GFAPI_future +_pub_glfs_readv_async _glfs_readv_async$GFAPI_future +_pub_glfs_writev_async _glfs_writev_async$GFAPI_future +_pub_glfs_pread _glfs_pread$GFAPI_future +_pub_glfs_pwrite _glfs_pwrite$GFAPI_future +_pub_glfs_pread_async _glfs_pread_async$GFAPI_future +_pub_glfs_pwrite_async _glfs_pwrite_async$GFAPI_future +_pub_glfs_preadv_async _glfs_preadv_async$GFAPI_future +_pub_glfs_pwritev_async _glfs_pwritev_async$GFAPI_future +_pub_glfs_fsync _glfs_fsync$GFAPI_future +_pub_glfs_fsync_async _glfs_fsync_async$GFAPI_future +_pub_glfs_fdatasync _glfs_fdatasync$GFAPI_future +_pub_glfs_fdatasync_async _glfs_fdatasync_async$GFAPI_future +_pub_glfs_ftruncate _glfs_ftruncate$GFAPI_future +_pub_glfs_ftruncate_async _glfs_ftruncate_async$GFAPI_future +_pub_glfs_discard_async _glfs_discard_async$GFAPI_future +_pub_glfs_zerofill_async _glfs_zerofill_async$GFAPI_future diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 6fa0326d78a..29a25fbf2e4 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -73,6 +73,18 @@ GFAPI_3.4.0 { glfs_fchdir; glfs_posix_lock; glfs_dup; + glfs_pread; + glfs_pwrite; + glfs_pread_async; + glfs_pwrite_async; + glfs_ftruncate; + glfs_ftruncate_async; + glfs_fsync; + glfs_fsync_async; + glfs_fdatasync; + glfs_fdatasync_async; + glfs_realpath; + glfs_h_lookupat; } GFAPI_PRIVATE_3.4.0; GFAPI_3.4.2 { @@ -97,6 +109,7 @@ GFAPI_3.4.2 { glfs_h_create_from_handle; glfs_h_opendir; glfs_h_open; + glfs_h_lookupat; } GFAPI_3.4.0; GFAPI_3.5.0 { @@ -166,6 +179,7 @@ GFAPI_3.7.16 { glfs_upcall_inode_get_pstat; glfs_upcall_inode_get_oldpobject; glfs_upcall_inode_get_oldpstat; + glfs_h_poll_upcall; } GFAPI_3.7.15; GFAPI_3.7.17 { @@ -207,7 +221,10 @@ GFAPI_4.0.0 { glfs_file_lock; glfs_lease; glfs_h_lease; - glfs_recall_lease; +} GFAPI_3.13.0; + +GFAPI_future { + global: glfs_read_async; glfs_write_async; glfs_readv_async; @@ -226,4 +243,5 @@ GFAPI_4.0.0 { glfs_ftruncate_async; glfs_discard_async; glfs_zerofill_async; -} GFAPI_3.13.0; +} GFAPI_4.0.0; + diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index a3e5afaf627..1c2b4c798ef 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -883,7 +883,7 @@ pub_glfs_pread (struct glfs_fd *glfd, void *buf, size_t count, off_t offset, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread, future); ssize_t @@ -1125,7 +1125,7 @@ pub_glfs_preadv_async (struct glfs_fd *glfd, const struct iovec *iovec, _gf_false, fn, data); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_preadv_async, future); int @@ -1163,7 +1163,7 @@ pub_glfs_read_async (struct glfs_fd *glfd, void *buf, size_t count, int flags, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_read_async, future); int @@ -1201,7 +1201,7 @@ pub_glfs_pread_async (struct glfs_fd *glfd, void *buf, size_t count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pread_async, future); int @@ -1229,7 +1229,7 @@ pub_glfs_readv_async (struct glfs_fd *glfd, const struct iovec *iov, int count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_readv_async, future); static int @@ -1428,7 +1428,7 @@ pub_glfs_pwrite (struct glfs_fd *glfd, const void *buf, size_t count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite, future); extern glfs_t *pub_glfs_from_glfd (glfs_fd_t *); @@ -1569,7 +1569,7 @@ pub_glfs_pwritev_async (struct glfs_fd *glfd, const struct iovec *iovec, _gf_false, fn, data); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwritev_async, future); int @@ -1607,7 +1607,7 @@ pub_glfs_write_async (struct glfs_fd *glfd, const void *buf, size_t count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_write_async, future); int @@ -1645,7 +1645,7 @@ pub_glfs_pwrite_async (struct glfs_fd *glfd, const void *buf, int count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_pwrite_async, future); int @@ -1673,7 +1673,7 @@ pub_glfs_writev_async (struct glfs_fd *glfd, const struct iovec *iov, int count, return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev_async, future); static int @@ -1750,7 +1750,7 @@ pub_glfs_fsync (struct glfs_fd *glfd, struct stat *prestat, return glfs_fsync_common (glfd, prestat, poststat); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, future); static int @@ -1870,7 +1870,7 @@ invalid_fs: return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync_async, future); static int @@ -1947,7 +1947,7 @@ pub_glfs_fdatasync (struct glfs_fd *glfd, struct stat *prestat, return glfs_fdatasync_common (glfd, prestat, poststat); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, future); int @@ -1985,7 +1985,7 @@ invalid_fs: return ret; } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync_async, future); static int @@ -2063,7 +2063,7 @@ pub_glfs_ftruncate (struct glfs_fd *glfd, off_t offset, struct stat *prestat, return glfs_ftruncate_common (glfd, offset, prestat, poststat); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, future); int @@ -2221,7 +2221,7 @@ pub_glfs_ftruncate_async (struct glfs_fd *glfd, off_t offset, return glfs_ftruncate_async_common (glfd, offset, _gf_false, fn, data); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate_async, future); int @@ -3104,7 +3104,7 @@ pub_glfs_discard_async (struct glfs_fd *glfd, off_t offset, size_t len, data); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_discard_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_discard_async, future); static int @@ -3219,7 +3219,7 @@ pub_glfs_zerofill_async (struct glfs_fd *glfd, off_t offset, off_t len, fn, data); } -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_zerofill_async, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_zerofill_async, future); void diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h index 788c6b00545..10bda62dd5c 100644 --- a/api/src/glfs-internal.h +++ b/api/src/glfs-internal.h @@ -560,11 +560,20 @@ struct glfs *glfs_new_from_ctx (glusterfs_ctx_t *ctx) void */ -void glfs_free_from_ctx (struct glfs *fs) +void +glfs_free_from_ctx (struct glfs *fs) GFAPI_PRIVATE(glfs_free_from_ctx, 3.7.0); -int glfs_get_upcall_cache_invalidation (struct gf_upcall *to_up_data, - struct gf_upcall *from_up_data); +int +glfs_recall_lease_fd (struct glfs *fs, struct gf_upcall *up_data); + +int +glfs_recall_lease_upcall (struct glfs *fs, struct glfs_upcall *up_arg, + struct gf_upcall *up_data); + +int +glfs_get_upcall_cache_invalidation (struct gf_upcall *to_up_data, + struct gf_upcall *from_up_data); int glfs_h_poll_cache_invalidation (struct glfs *fs, struct glfs_upcall *up_arg, diff --git a/api/src/glfs.c b/api/src/glfs.c index da6bc3a07ba..cc84842f286 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -1641,8 +1641,8 @@ out: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_sysrq, 3.10.0); int -glfs_upcall_register (struct glfs *fs, uint32_t event_list, - glfs_upcall_cbk cbk, void *data) +pub_glfs_upcall_register (struct glfs *fs, uint32_t event_list, + glfs_upcall_cbk cbk, void *data) { int ret = 0; @@ -1692,9 +1692,11 @@ out: invalid_fs: return ret; } + GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_register, 3.13.0); -int glfs_upcall_unregister (struct glfs *fs, uint32_t event_list) +int +pub_glfs_upcall_unregister (struct glfs *fs, uint32_t event_list) { int ret = 0; /* list of supported upcall events */ @@ -1737,4 +1739,5 @@ out: invalid_fs: return ret; } + GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_upcall_unregister, 3.13.0); diff --git a/api/src/glfs.h b/api/src/glfs.h index f9f8d4f36a2..ee4ba1fd72a 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -512,10 +512,10 @@ ssize_t glfs_write (glfs_fd_t *fd, const void *buf, GFAPI_PUBLIC(glfs_write, 3.4.0); int glfs_read_async (glfs_fd_t *fd, void *buf, size_t count, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_read_async, 4.0.0); + GFAPI_PUBLIC(glfs_read_async, future); int glfs_write_async (glfs_fd_t *fd, const void *buf, size_t count, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_write_async, 4.0.0); + GFAPI_PUBLIC(glfs_write_async, future); // glfs_{read,write}v[_async] @@ -527,26 +527,26 @@ ssize_t glfs_writev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt, GFAPI_PUBLIC(glfs_writev, 3.4.0); int glfs_readv_async (glfs_fd_t *fd, const struct iovec *iov, int count, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_readv_async, 4.0.0); + GFAPI_PUBLIC(glfs_readv_async, future); int glfs_writev_async (glfs_fd_t *fd, const struct iovec *iov, int count, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_writev_async, 4.0.0); + GFAPI_PUBLIC(glfs_writev_async, future); // glfs_p{read,write}[_async] ssize_t glfs_pread (glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags, struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_pread, 4.0.0); + GFAPI_PUBLIC(glfs_pread, future); ssize_t glfs_pwrite (glfs_fd_t *fd, const void *buf, size_t count, off_t offset, int flags, struct stat *prestat, struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_pwrite, 4.0.0); + GFAPI_PUBLIC(glfs_pwrite, future); int glfs_pread_async (glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_pread_async, 4.0.0); + GFAPI_PUBLIC(glfs_pread_async, future); int glfs_pwrite_async (glfs_fd_t *fd, const void *buf, int count, off_t offset, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_pwrite_async, 4.0.0); + GFAPI_PUBLIC(glfs_pwrite_async, future); // glfs_p{read,write}v[_async] @@ -559,11 +559,11 @@ ssize_t glfs_pwritev (glfs_fd_t *fd, const struct iovec *iov, int iovcnt, int glfs_preadv_async (glfs_fd_t *fd, const struct iovec *iov, int count, off_t offset, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_preadv_async, 4.0.0); + GFAPI_PUBLIC(glfs_preadv_async, future); int glfs_pwritev_async (glfs_fd_t *fd, const struct iovec *iov, int count, off_t offset, int flags, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_pwritev_async, 4.0.0); + GFAPI_PUBLIC(glfs_pwritev_async, future); off_t glfs_lseek (glfs_fd_t *fd, off_t offset, int whence) __THROW @@ -574,10 +574,10 @@ int glfs_truncate (glfs_t *fs, const char *path, off_t length) __THROW int glfs_ftruncate (glfs_fd_t *fd, off_t length, struct stat *prestat, struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_ftruncate, 4.0.0); + GFAPI_PUBLIC(glfs_ftruncate, future); int glfs_ftruncate_async (glfs_fd_t *fd, off_t length, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_ftruncate_async, 4.0.0); + GFAPI_PUBLIC(glfs_ftruncate_async, future); int glfs_lstat (glfs_t *fs, const char *path, struct stat *buf) __THROW GFAPI_PUBLIC(glfs_lstat, 3.4.0); @@ -588,15 +588,15 @@ int glfs_fstat (glfs_fd_t *fd, struct stat *buf) __THROW int glfs_fsync (glfs_fd_t *fd, struct stat *prestat, struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_fsync, 4.0.0); + GFAPI_PUBLIC(glfs_fsync, future); int glfs_fsync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_fsync_async, 4.0.0); + GFAPI_PUBLIC(glfs_fsync_async, future); int glfs_fdatasync (glfs_fd_t *fd, struct stat *prestat, struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_fdatasync, 4.0.0); + GFAPI_PUBLIC(glfs_fdatasync, future); int glfs_fdatasync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_fdatasync_async, 4.0.0); + GFAPI_PUBLIC(glfs_fdatasync_async, future); int glfs_access (glfs_t *fs, const char *path, int mode) __THROW GFAPI_PUBLIC(glfs_access, 3.4.0); @@ -750,14 +750,14 @@ int glfs_discard(glfs_fd_t *fd, off_t offset, size_t len) __THROW int glfs_discard_async (glfs_fd_t *fd, off_t length, size_t lent, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_discard_async, 4.0.0); + GFAPI_PUBLIC(glfs_discard_async, future); int glfs_zerofill(glfs_fd_t *fd, off_t offset, off_t len) __THROW GFAPI_PUBLIC(glfs_zerofill, 3.5.0); int glfs_zerofill_async (glfs_fd_t *fd, off_t length, off_t len, glfs_io_cbk fn, void *data) __THROW - GFAPI_PUBLIC(glfs_zerofill_async, 4.0.0); + GFAPI_PUBLIC(glfs_zerofill_async, future); char *glfs_getcwd (glfs_t *fs, char *buf, size_t size) __THROW GFAPI_PUBLIC(glfs_getcwd, 3.4.0); @@ -1156,13 +1156,5 @@ struct gf_upcall; int glfs_lease (struct glfs_fd *glfd, struct glfs_lease *lease, glfs_recall_cbk fn, void *data) __THROW GFAPI_PUBLIC(glfs_lease, 4.0.0); -int -glfs_recall_lease_fd (struct glfs *fs, struct gf_upcall *up_data) __THROW - GFAPI_PUBLIC(glfs_recall_lease_fd, 4.0.0); - -int -glfs_recall_lease_upcall (struct glfs *fs, struct glfs_upcall *up_arg, - struct gf_upcall *up_data) __THROW - GFAPI_PUBLIC(glfs_recall_lease_upcall, 4.0.0); __END_DECLS #endif /* !_GLFS_H */ |