From acaea514b6c31099e657224adb116a96070d51a2 Mon Sep 17 00:00:00 2001
From: ShyamsundarR <srangana@redhat.com>
Date: Tue, 8 May 2018 11:02:25 -0400
Subject: 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
---
 libglusterfs/src/generator.py |  2 --
 libglusterfs/src/syncop.c     | 15 ++-------------
 libglusterfs/src/syncop.h     |  1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/generator.py b/libglusterfs/src/generator.py
index 29e02782638..d8afd2e11cf 100755
--- a/libglusterfs/src/generator.py
+++ b/libglusterfs/src/generator.py
@@ -303,8 +303,6 @@ ops['access'] = (
 ops['ftruncate'] = (
 	('fop-arg',	'fd',			'fd_t *',				'fd'),
 	('fop-arg',	'offset',		'off_t',				'offset'),
-	('extra',	'preop',		'struct iatt',		'&preop'),
-	('extra',	'postop',		'struct iatt',		'&postop'),
 	('fop-arg',	'xdata',		'dict_t *',				'xdata'),
 	('cbk-arg',	'prebuf',		'struct iatt *'),
 	('cbk-arg',	'postbuf',		'struct iatt *'),
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index 3db6fae6b00..4fb55c2b4ab 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -2348,31 +2348,20 @@ syncop_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (xdata)
                 args->xdata  = dict_ref (xdata);
 
-        if (op_ret >= 0) {
-                args->iatt1 = *prebuf;
-                args->iatt2 = *postbuf;
-        }
-
         __wake (args);
 
         return 0;
 }
 
 int
-syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset,
-                  struct iatt *preiatt, struct iatt *postiatt,
-                  dict_t *xdata_in, dict_t **xdata_out)
+syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset, dict_t *xdata_in,
+                  dict_t **xdata_out)
 {
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_ftruncate_cbk, subvol->fops->ftruncate,
                 fd, offset, xdata_in);
 
-        if (preiatt)
-                *preiatt = args.iatt1;
-        if (postiatt)
-                *postiatt = args.iatt2;
-
         if (xdata_out)
                 *xdata_out = args.xdata;
         else if (args.xdata)
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
index 3000d2e74c9..e99ca8aa7ae 100644
--- a/libglusterfs/src/syncop.h
+++ b/libglusterfs/src/syncop.h
@@ -472,7 +472,6 @@ int syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
                   struct iatt *iatt, dict_t *xdata_in, dict_t **xdata_out);
 
 int syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset,
-                      struct iatt *preiatt, struct iatt *postiatt,
                       dict_t *xdata_in, dict_t **xdata_out);
 
 int syncop_truncate (xlator_t *subvol, loc_t *loc, off_t offset,
-- 
cgit