diff options
| author | ShyamsundarR <srangana@redhat.com> | 2018-05-08 11:02:25 -0400 |
|---|---|---|
| committer | ShyamsundarR <srangana@redhat.com> | 2018-05-08 11:27:48 -0400 |
| commit | acaea514b6c31099e657224adb116a96070d51a2 (patch) | |
| tree | 81ab7ff82c37b7b061bdb237e854a0fe52748147 /xlators | |
| parent | b09db37b4fb17816631b3e837ff08a98376e0c0a (diff) | |
Revert "gfapi: return pre/post attributes from glfs_ftruncate"
This reverts commit 248152767b0599986bbb6bb35fc27197f6be6964.
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.
Additionally fixed up cloudsync.c code that was using the new
syncop signature.
Updates: bz#1575386
Change-Id: Idb59d20666c0d7b0c83e7fdc31dd68b8c7db9550
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 11 | ||||
| -rw-r--r-- | xlators/features/cloudsync/src/cloudsync.c | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 91fb94d529c..c5f68f8adf3 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -877,7 +877,6 @@ __dht_rebalance_create_dst_file (xlator_t *this, xlator_t *to, xlator_t *from, * in some cases */ ret2 = syncop_ftruncate (to, fd, 0, - NULL, NULL, NULL, NULL); if (ret2 < 0) { gf_msg (this->name, @@ -893,8 +892,7 @@ __dht_rebalance_create_dst_file (xlator_t *this, xlator_t *to, xlator_t *from, } if (!conf->use_fallocate) { - ret = syncop_ftruncate (to, fd, stbuf->ia_size, NULL, - NULL, NULL, NULL); + ret = syncop_ftruncate (to, fd, stbuf->ia_size, NULL, NULL); if (ret < 0) { *fop_errno = -ret; gf_msg (this->name, GF_LOG_WARNING, -ret, @@ -1770,7 +1768,7 @@ dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, } - ret = syncop_ftruncate (to, dst_fd, 0, NULL, NULL, NULL, NULL); + ret = syncop_ftruncate (to, dst_fd, 0, NULL, NULL); if (ret) { gf_log (this->name, GF_LOG_WARNING, "%s: failed to perform truncate on %s (%s)", @@ -2204,7 +2202,7 @@ dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, /* Free up the data blocks on the source node, as the whole file is migrated */ - ret = syncop_ftruncate (from, src_fd, 0, NULL, NULL, NULL, NULL); + ret = syncop_ftruncate (from, src_fd, 0, NULL, NULL); if (ret) { gf_log (this->name, GF_LOG_WARNING, "%s: failed to perform truncate on %s (%s)", @@ -2337,8 +2335,7 @@ out: /* reset the destination back to 0 */ if (clean_dst) { - lk_ret = syncop_ftruncate (to, dst_fd, 0, NULL, NULL, - NULL, NULL); + lk_ret = syncop_ftruncate (to, dst_fd, 0, NULL, NULL); if (lk_ret) { gf_msg (this->name, GF_LOG_ERROR, -lk_ret, DHT_MSG_MIGRATE_FILE_FAILED, diff --git a/xlators/features/cloudsync/src/cloudsync.c b/xlators/features/cloudsync/src/cloudsync.c index 48e27c372b6..ce3e41bff63 100644 --- a/xlators/features/cloudsync/src/cloudsync.c +++ b/xlators/features/cloudsync/src/cloudsync.c @@ -901,7 +901,7 @@ cs_download_task (void *arg) /*using dlfd as it is anonymous and have RDWR flag*/ ret = syncop_ftruncate (FIRST_CHILD (this), local->dlfd, 0, - NULL, NULL, NULL, NULL); + NULL, NULL); if (ret) { gf_msg (this->name, GF_LOG_ERROR, 0, -ret, "ftruncate failed"); |