From 16873e16f3fdfe7f83ca919ad188075eebb5dd7c Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Tue, 8 May 2018 11:06:15 -0400 Subject: 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 --- libglusterfs/src/generator.py | 3 --- libglusterfs/src/syncop.c | 21 +++------------------ libglusterfs/src/syncop.h | 5 ++--- 3 files changed, 5 insertions(+), 24 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/generator.py b/libglusterfs/src/generator.py index bfa774b1ef5..efe9bcba0dd 100755 --- a/libglusterfs/src/generator.py +++ b/libglusterfs/src/generator.py @@ -142,8 +142,6 @@ ops['writev'] = ( ('fop-arg', 'off', 'off_t', 'offset'), ('fop-arg', 'flags', 'uint32_t', 'flags'), ('fop-arg', 'iobref', 'struct iobref *'), - ('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 *'), @@ -156,7 +154,6 @@ ops['readv'] = ( ('fop-arg', 'size', 'size_t'), ('fop-arg', 'offset', 'off_t'), ('fop-arg', 'flags', 'uint32_t'), - ('extra', 'iatt', 'struct iatt', '&iatt'), ('fop-arg', 'xdata', 'dict_t *'), ('cbk-arg', 'vector', 'struct iovec *'), ('cbk-arg', 'count', 'int32_t'), diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index d0e1ae10774..6aafcbe61e3 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -1936,7 +1936,6 @@ syncop_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this, args->iobref = iobref_ref (iobref); args->vector = iov_dup (vector, count); args->count = count; - args->iatt1 = *stbuf; } __wake (args); @@ -1948,8 +1947,7 @@ syncop_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off, uint32_t flags, struct iovec **vector, int *count, - struct iobref **iobref, struct iatt *iatt, - dict_t *xdata_in, dict_t **xdata_out) + struct iobref **iobref, dict_t *xdata_in, dict_t **xdata_out) { struct syncargs args = {0, }; @@ -1961,9 +1959,6 @@ syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off, else if (args.xdata) dict_unref (args.xdata); - if (iatt) - *iatt = args.iatt1; - if (args.op_ret < 0) goto out; @@ -1985,6 +1980,7 @@ out: if (args.op_ret < 0) return -args.op_errno; return args.op_ret; + } int @@ -2001,11 +1997,6 @@ syncop_writev_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; @@ -2014,8 +2005,7 @@ syncop_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int syncop_writev (xlator_t *subvol, fd_t *fd, const struct iovec *vector, int32_t count, off_t offset, struct iobref *iobref, - uint32_t flags, struct iatt *preiatt, struct iatt *postiatt, - dict_t *xdata_in, dict_t **xdata_out) + uint32_t flags, dict_t *xdata_in, dict_t **xdata_out) { struct syncargs args = {0, }; @@ -2023,11 +2013,6 @@ syncop_writev (xlator_t *subvol, fd_t *fd, const struct iovec *vector, fd, (struct iovec *) vector, count, offset, flags, iobref, 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 fb6b3da86a0..ea417934226 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/syncop.h @@ -462,14 +462,13 @@ int syncop_write (xlator_t *subvol, fd_t *fd, const char *buf, int size, int syncop_writev (xlator_t *subvol, fd_t *fd, const struct iovec *vector, int32_t count, off_t offset, struct iobref *iobref, - uint32_t flags, struct iatt *preiatt, struct iatt *postiatt, - dict_t *xdata_in, dict_t **xdata_out); + uint32_t flags, dict_t *xdata_in, dict_t **xdata_out); int syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off, uint32_t flags, /* out */ struct iovec **vector, int *count, struct iobref **iobref, - struct iatt *iatt, dict_t *xdata_in, dict_t **xdata_out); + dict_t *xdata_in, dict_t **xdata_out); int syncop_ftruncate (xlator_t *subvol, fd_t *fd, off_t offset, dict_t *xdata_in, dict_t **xdata_out); -- cgit