Revert "gfapi: return pre/post attributes from glfs_pread/pwrite"

This reverts commit d01f7244e9d9f7e3ef84e0ba7b48ef1b1b09d809.

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 posix-entry-ops.c which was using the
new syncop signature

Updates: bz#1575386
Change-Id: I35222dadc4a2e97010bc1e6b97b6f83583c311f6

2 files changed, 12 insertions, 2 deletions

diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
index a9b70b61f8..db97ce5473 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,
 
         ret = syncop_readv (child->xl, fd,
                             size, offset, 0, &iovec, &count, &iobref, NULL,
-                            NULL, NULL);
+                            NULL);
 
         if (ret < 0) {
                 gf_msg (this->name, GF_LOG_ERROR, errno, BRB_MSG_READV_FAILED,
diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c
index 18f00d7d2d..8fee435de6 100644
--- a/xlators/features/snapview-server/src/snapview-server.c
+++ b/xlators/features/snapview-server/src/snapview-server.c
@@ -1990,7 +1990,7 @@ svs_readv (call_frame_t *frame, xlator_t *this,
                 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;
@@ -2005,6 +2005,16 @@ svs_readv (call_frame_t *frame, xlator_t *this,
         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);