diff options
| author | ShyamsundarR <srangana@redhat.com> | 2018-09-13 22:15:20 -0400 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-09-17 14:26:06 +0000 |
| commit | cee40c3e3c26ebfb3b98109d154501a5cce61c0d (patch) | |
| tree | 8b36f23ed64e8b7c9fe4fd884bfba18fe36c2c66 /xlators/experimental | |
| parent | 5cd9c22a4fd041a27275a465d0117af39cf4e616 (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/experimental')
| -rwxr-xr-x | xlators/experimental/fdl/src/gen_recon.py | 2 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/jbr.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xlators/experimental/fdl/src/gen_recon.py b/xlators/experimental/fdl/src/gen_recon.py index 0766f61320a..4b695d2e770 100755 --- a/xlators/experimental/fdl/src/gen_recon.py +++ b/xlators/experimental/fdl/src/gen_recon.py @@ -142,7 +142,7 @@ def get_special_subs (name, args, fop_type): # is not stored in or read from the journal. There are other ways to # do that, but this is the only place we need anything similar and we # already have to treat it as a special case so this is simplest. - s_args_str = 'fd, &vector, 1, off, iobref, flags, &preop, &postop, xdata' + s_args_str = 'fd, &vector, 1, off, iobref, flags, xdata' elif name == 'symlink': # Swap 'linkpath' and 'loc'. s_args_str = '&loc, linkpath, &iatt, xdata' diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index 49d7eb467f7..0d42740e504 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -902,8 +902,7 @@ jbr_flush_thread(void *ctx) list_for_each_entry_safe(fd_ctx, fd_tmp, &dirty_fds, fd_list) { - ret = syncop_fsync(FIRST_CHILD(this), fd_ctx->fd, 0, NULL, NULL, - NULL, NULL); + ret = syncop_fsync(FIRST_CHILD(this), fd_ctx->fd, 0, NULL, NULL); if (ret) { gf_msg(this->name, GF_LOG_WARNING, 0, J_MSG_SYS_CALL_FAILURE, "failed to fsync %p (%d)", fd_ctx->fd, -ret); |