diff options
author | ShyamsundarR <srangana@redhat.com> | 2018-05-08 11:03:55 -0400 |
---|---|---|
committer | ShyamsundarR <srangana@redhat.com> | 2018-05-08 11:27:48 -0400 |
commit | 427951b7f74c643d5b7c7c946bc348209b974274 (patch) | |
tree | 06dbb1fb1c0f8b11c7d00a1b196219967be68237 /api | |
parent | acaea514b6c31099e657224adb116a96070d51a2 (diff) |
Revert "gfapi: return pre/post attributes from glfs_fsync/fdatasync"
This reverts commit 09943beb499617212f2985ca8ea9ecd1ed1b470e.
This is being reverted as the API signatures should adapt to a
statx like structure, and also all APIs that need to return
pre/post attrs are not complete.
As a result, instead of fixing up part of the APIs and then
refixing the same in a later release, removing these set of
fixes from the branch.
Updates: bz#1575386
Change-Id: I3e0803c114dc6b9126d8a90f43812bca501e6338
Diffstat (limited to 'api')
-rw-r--r-- | api/src/gfapi.aliases | 6 | ||||
-rw-r--r-- | api/src/gfapi.map | 4 | ||||
-rw-r--r-- | api/src/glfs-fops.c | 69 | ||||
-rw-r--r-- | api/src/glfs-resolve.c | 2 | ||||
-rw-r--r-- | api/src/glfs.h | 10 |
5 files changed, 19 insertions, 72 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 8b774f09754..4b3bcc1fb54 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -39,9 +39,9 @@ _pub_glfs_ftruncate_async _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 _glfs_fsync$GFAPI_3.4.0 _pub_glfs_fsync_async _glfs_fsync_async$GFAPI_3.4.0 -_pub_glfs_fdatasync34 _glfs_fdatasync34$GFAPI_3.4.0 +_pub_glfs_fdatasync _glfs_fdatasync$GFAPI_3.4.0 _pub_glfs_fdatasync_async _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 @@ -175,5 +175,3 @@ _pub_glfs_h_lease _glfs_h_lease$GFAPI_4.0.0 _pub_glfs_recall_lease _glfs_recall_lease$GFAPI_4.0.0 _pub_glfs_pread _glfs_pread$GFAPI_4.0.0 _pub_glfs_pwrite _glfs_pwrite$GFAPI_4.0.0 -_pub_glfs_fsync _glfs_fsync$GFAPI_4.0.0 -_pub_glfs_fdatasync _glfs_fdatasync$GFAPI_4.0.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 03ecee811da..09de5fada3a 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -42,7 +42,9 @@ GFAPI_3.4.0 { glfs_lstat; glfs_stat; glfs_fstat; + glfs_fsync; glfs_fsync_async; + glfs_fdatasync; glfs_fdatasync_async; glfs_access; glfs_symlink; @@ -224,6 +226,4 @@ GFAPI_4.0.0 { glfs_recall_lease; glfs_pread; glfs_pwrite; - glfs_fsync; - glfs_fdatasync; } GFAPI_3.13.0; diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index f314c36463d..35a6a6628e8 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -1502,14 +1502,12 @@ pub_glfs_writev_async (struct glfs_fd *glfd, const struct iovec *iov, int count, GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_writev_async, 3.4.0); -static int -glfs_fsync_common (struct glfs_fd *glfd, struct stat *prestat, - struct stat *poststat) +int +pub_glfs_fsync (struct glfs_fd *glfd) { int ret = -1; xlator_t *subvol = NULL; fd_t *fd = NULL; - struct iatt preiatt = {0, }, postiatt = {0, }; dict_t *fop_attr = NULL; DECLARE_OLD_THIS; @@ -1535,15 +1533,9 @@ glfs_fsync_common (struct glfs_fd *glfd, struct stat *prestat, if (ret) gf_msg_debug ("gfapi", 0, "Getting leaseid from thread failed"); - ret = syncop_fsync (subvol, fd, 0, &preiatt, &postiatt, fop_attr, NULL); - DECODE_SYNCOP_ERR (ret); + ret = syncop_fsync (subvol, fd, 0, fop_attr, NULL); - if (ret >= 0) { - if (prestat) - glfs_iatt_to_stat (glfd->fs, &preiatt, prestat); - if (poststat) - glfs_iatt_to_stat (glfd->fs, &postiatt, poststat); - } + DECODE_SYNCOP_ERR (ret); out: if (fd) fd_unref (fd); @@ -1560,24 +1552,7 @@ invalid_fs: return ret; } -int -pub_glfs_fsync34 (struct glfs_fd *glfd) -{ - return glfs_fsync_common (glfd, NULL, NULL); -} - -GFAPI_SYMVER_PUBLIC(glfs_fsync34, glfs_fsync, 3.4.0); - - -int -pub_glfs_fsync (struct glfs_fd *glfd, struct stat *prestat, - struct stat *poststat) -{ - return glfs_fsync_common (glfd, prestat, poststat); -} - -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, 4.0.0); - +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync, 3.4.0); static int glfs_fsync_async_cbk (call_frame_t *frame, void *cookie, @@ -1678,14 +1653,12 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fsync_async, 3.4.0); -static int -glfs_fdatasync_common (struct glfs_fd *glfd, struct stat *prestat, - struct stat *poststat) +int +pub_glfs_fdatasync (struct glfs_fd *glfd) { int ret = -1; xlator_t *subvol = NULL; fd_t *fd = NULL; - struct iatt preiatt = {0, }, postiatt = {0, }; dict_t *fop_attr = NULL; DECLARE_OLD_THIS; @@ -1711,15 +1684,9 @@ glfs_fdatasync_common (struct glfs_fd *glfd, struct stat *prestat, if (ret) gf_msg_debug ("gfapi", 0, "Getting leaseid from thread failed"); - ret = syncop_fsync (subvol, fd, 1, &preiatt, &postiatt, fop_attr, NULL); - DECODE_SYNCOP_ERR (ret); + ret = syncop_fsync (subvol, fd, 1, fop_attr, NULL); - if (ret >= 0) { - if (prestat) - glfs_iatt_to_stat (glfd->fs, &preiatt, prestat); - if (poststat) - glfs_iatt_to_stat (glfd->fs, &postiatt, poststat); - } + DECODE_SYNCOP_ERR (ret); out: if (fd) fd_unref (fd); @@ -1736,23 +1703,7 @@ invalid_fs: return ret; } -int -pub_glfs_fdatasync34 (struct glfs_fd *glfd) -{ - return glfs_fdatasync_common (glfd, NULL, NULL); -} - -GFAPI_SYMVER_PUBLIC(glfs_fdatasync34, glfs_fdatasync, 3.4.0); - - -int -pub_glfs_fdatasync (struct glfs_fd *glfd, struct stat *prestat, - struct stat *poststat) -{ - return glfs_fdatasync_common (glfd, prestat, poststat); -} - -GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, 4.0.0); +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_fdatasync, 3.4.0); int diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index 03be7c7eda7..6c9fc38901f 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -730,7 +730,7 @@ glfs_migrate_fd_safe (struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd) return fd_ref (oldfd); if (!oldsubvol->switched) { - ret = syncop_fsync (oldsubvol, oldfd, 0, NULL, NULL, NULL, NULL); + ret = syncop_fsync (oldsubvol, oldfd, 0, NULL, NULL); DECODE_SYNCOP_ERR (ret); if (ret) { gf_msg (fs->volname, GF_LOG_WARNING, errno, diff --git a/api/src/glfs.h b/api/src/glfs.h index 97331d2398c..c174f53dfaa 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -584,15 +584,13 @@ int glfs_stat (glfs_t *fs, const char *path, struct stat *buf) __THROW int glfs_fstat (glfs_fd_t *fd, struct stat *buf) __THROW GFAPI_PUBLIC(glfs_fstat, 3.4.0); -int glfs_fsync (glfs_fd_t *fd, struct stat *prestat, - struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_fsync, 4.0.0); +int glfs_fsync (glfs_fd_t *fd) __THROW + GFAPI_PUBLIC(glfs_fsync, 3.4.0); int glfs_fsync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW GFAPI_PUBLIC(glfs_fsync_async, 3.4.0); -int glfs_fdatasync (glfs_fd_t *fd, struct stat *prestat, - struct stat *poststat) __THROW - GFAPI_PUBLIC(glfs_fdatasync, 4.0.0); +int glfs_fdatasync (glfs_fd_t *fd) __THROW + GFAPI_PUBLIC(glfs_fdatasync, 3.4.0); int glfs_fdatasync_async (glfs_fd_t *fd, glfs_io_cbk fn, void *data) __THROW GFAPI_PUBLIC(glfs_fdatasync_async, 3.4.0); |