From cee40c3e3c26ebfb3b98109d154501a5cce61c0d Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Thu, 13 Sep 2018 22:15:20 -0400 Subject: 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 --- tests/basic/gfapi/mandatory-lock-optimal.c | 2 +- tests/basic/gfapi/upcall-cache-invalidate.c | 2 +- tests/basic/gfapi/upcall-register-api.c | 2 +- tests/bugs/io-cache/bug-read-hang.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/basic/gfapi/mandatory-lock-optimal.c b/tests/basic/gfapi/mandatory-lock-optimal.c index 34fef8d0b80..ceffe523f45 100644 --- a/tests/basic/gfapi/mandatory-lock-optimal.c +++ b/tests/basic/gfapi/mandatory-lock-optimal.c @@ -388,7 +388,7 @@ run_test_7(int i) if (!fd2) LOG_ERR("glfs_open", errno); - ret = glfs_ftruncate(fd2, 4, NULL, NULL); + ret = glfs_ftruncate(fd2, 4); if (ret == 0 || errno != EAGAIN) LOG_ERR("glfs_ftruncate", errno); diff --git a/tests/basic/gfapi/upcall-cache-invalidate.c b/tests/basic/gfapi/upcall-cache-invalidate.c index 078286a8956..ed871a0b421 100644 --- a/tests/basic/gfapi/upcall-cache-invalidate.c +++ b/tests/basic/gfapi/upcall-cache-invalidate.c @@ -136,7 +136,7 @@ main(int argc, char *argv[]) LOG_ERR("glfs_lseek", ret); memset(readbuf, 0, sizeof(readbuf)); - ret = glfs_pread(fd_tmp2, readbuf, 4, 0, 0, NULL); + ret = glfs_pread(fd_tmp2, readbuf, 4, 0, 0); if (ret <= 0) { ret = -1; diff --git a/tests/basic/gfapi/upcall-register-api.c b/tests/basic/gfapi/upcall-register-api.c index 78594dbb108..5127cea5b3f 100644 --- a/tests/basic/gfapi/upcall-register-api.c +++ b/tests/basic/gfapi/upcall-register-api.c @@ -120,7 +120,7 @@ perform_io(glfs_t *fs, glfs_t *fs2, int cnt) LOG_ERR("glfs_lseek", ret); memset(readbuf, 0, sizeof(readbuf)); - ret = glfs_pread(fd_tmp2, readbuf, 4, 0, 0, NULL); + ret = glfs_pread(fd_tmp2, readbuf, 4, 0, 0); if (ret <= 0) { ret = -1; diff --git a/tests/bugs/io-cache/bug-read-hang.c b/tests/bugs/io-cache/bug-read-hang.c index e1fae97e7e8..982c475f7e7 100644 --- a/tests/bugs/io-cache/bug-read-hang.c +++ b/tests/bugs/io-cache/bug-read-hang.c @@ -103,7 +103,7 @@ main(int argc, char *argv[]) buf = (char *)malloc(5); - ret = glfs_pread(fd, buf, 5, 0, 0, NULL); + ret = glfs_pread(fd, buf, 5, 0, 0); if (ret < 0) { fprintf(stderr, "Read(%s): %d (%s)\n", "test", ret, strerror(errno)); return ret; -- cgit