summaryrefslogtreecommitdiffstats
path: root/xlators/features
diff options
context:
space:
mode:
authorShyamsundarR <srangana@redhat.com>2018-09-13 22:15:20 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2018-09-17 14:26:06 +0000
commitcee40c3e3c26ebfb3b98109d154501a5cce61c0d (patch)
tree8b36f23ed64e8b7c9fe4fd884bfba18fe36c2c66 /xlators/features
parent5cd9c22a4fd041a27275a465d0117af39cf4e616 (diff)
gfapi: revert several patchs that introduced pre/post attrs
Reverted the following: - 248152767b0599986bbb6bb35fc27197f6be6964 - 09943beb499617212f2985ca8ea9ecd1ed1b470e - d01f7244e9d9f7e3ef84e0ba7b48ef1b1b09d809 The reverts are redone by hand, due to clang format changes that made using git to revert the changes more tedious. Change-Id: I96489638a2b641fb2206a110298543225783f7be Updates: bz#1628620 Signed-off-by: ShyamsundarR <srangana@redhat.com>
Diffstat (limited to 'xlators/features')
-rw-r--r--xlators/features/bit-rot/src/bitd/bit-rot.c2
-rw-r--r--xlators/features/cloudsync/src/cloudsync.c3
-rw-r--r--xlators/features/snapview-server/src/snapview-server.c14
3 files changed, 15 insertions, 4 deletions
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
index 75fa0490c90..40932268c9b 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot.c
@@ -296,7 +296,7 @@ br_object_read_block_and_sign(xlator_t *this, fd_t *fd, br_child_t *child,
tbf = priv->tbf;
ret = syncop_readv(child->xl, fd, size, offset, 0, &iovec, &count, &iobref,
- NULL, NULL, NULL);
+ NULL, NULL);
if (ret < 0) {
gf_msg(this->name, GF_LOG_ERROR, errno, BRB_MSG_READV_FAILED,
diff --git a/xlators/features/cloudsync/src/cloudsync.c b/xlators/features/cloudsync/src/cloudsync.c
index 00437aaf80c..cb2cefa4d01 100644
--- a/xlators/features/cloudsync/src/cloudsync.c
+++ b/xlators/features/cloudsync/src/cloudsync.c
@@ -915,8 +915,7 @@ cs_download_task(void *arg)
local->remotepath);
/*using dlfd as it is anonymous and have RDWR flag*/
- ret = syncop_ftruncate(FIRST_CHILD(this), local->dlfd, 0, NULL, NULL,
- NULL, NULL);
+ ret = syncop_ftruncate(FIRST_CHILD(this), local->dlfd, 0, NULL, NULL);
if (ret) {
gf_msg(this->name, GF_LOG_ERROR, 0, -ret, "ftruncate failed");
} else {
diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c
index b00a1222026..266a02c8c60 100644
--- a/xlators/features/snapview-server/src/snapview-server.c
+++ b/xlators/features/snapview-server/src/snapview-server.c
@@ -2255,7 +2255,7 @@ svs_readv(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
goto out;
}
- ret = glfs_pread(glfd, iobuf->ptr, size, offset, 0, &fstatbuf);
+ ret = glfs_pread(glfd, iobuf->ptr, size, offset, 0);
if (ret < 0) {
op_ret = -1;
op_errno = errno;
@@ -2270,6 +2270,18 @@ svs_readv(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
iobref = iobref_new();
iobref_add(iobref, iobuf);
+
+ ret = glfs_fstat(glfd, &fstatbuf);
+ if (ret) {
+ op_ret = -1;
+ op_errno = errno;
+ gf_log(this->name, GF_LOG_ERROR,
+ "glfs_fstat failed after "
+ "readv on %s",
+ uuid_utoa(fd->inode->gfid));
+ goto out;
+ }
+
iatt_from_stat(&stbuf, &fstatbuf);
gf_uuid_copy(stbuf.ia_gfid, fd->inode->gfid);
svs_fill_ino_from_gfid(&stbuf);