summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorShyamsundarR <srangana@redhat.com>2018-05-08 11:03:55 -0400
committerShyamsundarR <srangana@redhat.com>2018-05-08 11:27:48 -0400
commit427951b7f74c643d5b7c7c946bc348209b974274 (patch)
tree06dbb1fb1c0f8b11c7d00a1b196219967be68237 /xlators
parentacaea514b6c31099e657224adb116a96070d51a2 (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 'xlators')
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c2
-rw-r--r--xlators/experimental/jbr-server/src/jbr.c2
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index c5f68f8adf3..6f29f91913f 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -1897,7 +1897,7 @@ dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to,
/* TODO: Sync the locks */
- ret = syncop_fsync (to, dst_fd, 0, NULL, NULL, NULL, NULL);
+ ret = syncop_fsync (to, dst_fd, 0, NULL, NULL);
if (ret) {
gf_log (this->name, GF_LOG_WARNING,
"%s: failed to fsync on %s (%s)",
diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c
index 68ec10a7e54..151ba57ab4c 100644
--- a/xlators/experimental/jbr-server/src/jbr.c
+++ b/xlators/experimental/jbr-server/src/jbr.c
@@ -940,7 +940,7 @@ jbr_flush_thread (void *ctx)
list_for_each_entry_safe (fd_ctx, fd_tmp, &dirty_fds, fd_list) {
ret = syncop_fsync(FIRST_CHILD(this), fd_ctx->fd, 0,
- NULL, NULL, NULL, NULL);
+ NULL, NULL);
if (ret) {
gf_msg (this->name, GF_LOG_WARNING, 0,
J_MSG_SYS_CALL_FAILURE,
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 322b4deeffa..3137f19c170 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -4666,8 +4666,7 @@ fuse_migrate_fd (xlator_t *this, fd_t *basefd, xlator_t *old_subvol,
ret = syncop_fsyncdir (old_subvol, oldfd, 0, NULL,
NULL);
else
- ret = syncop_fsync (old_subvol, oldfd, 0, NULL, NULL,
- NULL, NULL);
+ ret = syncop_fsync (old_subvol, oldfd, 0, NULL, NULL);
if (ret < 0) {
gf_log ("glusterfs-fuse", GF_LOG_WARNING,