From d58e2be26799b0cd1a70f608ea350b206595f8c9 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Mon, 30 Sep 2019 04:26:15 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for openunlink.c This patch fixes issues reported by checkpatch for file lustre/tests/openunlink.c Test-Parameters: trivial testlist=sanityn Signed-off-by: Arshad Hussain Change-Id: Ibfd29751769c1b8339ac249ad1379c8d42250ae3 Reviewed-on: https://review.whamcloud.com/36438 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Shaun Tancheff Reviewed-by: Petros Koutoupis --- lustre/tests/openunlink.c | 266 +++++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/lustre/tests/openunlink.c b/lustre/tests/openunlink.c index 9fbdc98..70768b0 100644 --- a/lustre/tests/openunlink.c +++ b/lustre/tests/openunlink.c @@ -43,142 +43,142 @@ char buf[128]; int main(int argc, char **argv) { - char *fname, *fname2; - struct stat st; - int fd, rc; - - if (argc < 2 || argc > 3) { - fprintf(stderr, "usage: %s filename [filename2]\n", argv[0]); - exit(1); - } - - fname = argv[1]; - if (argc == 3) - fname2 = argv[2]; - else - fname2 = argv[1]; - - fprintf(stderr, "opening\n"); - fd = open(fname, O_RDWR | O_TRUNC | O_CREAT, 0644); - if (fd == -1) { - fprintf(stderr, "open (normal) %s\n", strerror(errno)); - exit(1); - } - - fprintf(stderr, "writing\n"); - rc = write(fd, T1, strlen(T1) + 1); - if (rc != strlen(T1) + 1) { - fprintf(stderr, "write (normal) %s (rc %d)\n", - strerror(errno), rc); - exit(1); - } - - if (argc == 3) { - fprintf (stderr, "unlinking %s\n", fname2); - rc = unlink(fname2); - if (rc) { - fprintf(stderr, "unlink %s\n", strerror(errno)); - exit(1); - } - } else { - printf("unlink %s and press enter\n", fname); - getc(stdin); - } - - fprintf(stderr, "accessing (1)\n"); + char *fname, *fname2; + struct stat st; + int fd, rc; + + if (argc < 2 || argc > 3) { + fprintf(stderr, "usage: %s filename [filename2]\n", argv[0]); + exit(1); + } + + fname = argv[1]; + if (argc == 3) + fname2 = argv[2]; + else + fname2 = argv[1]; + + fprintf(stderr, "opening\n"); + fd = open(fname, O_RDWR | O_TRUNC | O_CREAT, 0644); + if (fd == -1) { + fprintf(stderr, "open (normal) %s\n", strerror(errno)); + exit(1); + } + + fprintf(stderr, "writing\n"); + rc = write(fd, T1, strlen(T1) + 1); + if (rc != strlen(T1) + 1) { + fprintf(stderr, "write (normal) %s (rc %d)\n", + strerror(errno), rc); + exit(1); + } + + if (argc == 3) { + fprintf(stderr, "unlinking %s\n", fname2); + rc = unlink(fname2); + if (rc) { + fprintf(stderr, "unlink %s\n", strerror(errno)); + exit(1); + } + } else { + printf("unlink %s and press enter\n", fname); + getc(stdin); + } + + fprintf(stderr, "accessing (1)\n"); if (access(fname, F_OK) == 0) { fprintf(stderr, "%s still exists\n", fname); exit(1); } - fprintf(stderr, "seeking (1)\n"); - rc = lseek(fd, 0, SEEK_SET); - if (rc) { - fprintf(stderr, "seek %s\n", strerror(errno)); - exit(1); - } - - fprintf(stderr, "accessing (2)\n"); - if (access(fname, F_OK) == 0) { - fprintf(stderr, "%s still exists\n", fname); - exit(1); - } - - fprintf(stderr, "fstat...\n"); - rc = fstat(fd, &st); - if (rc) { - fprintf(stderr, "fstat (unlink) %s\n", strerror(errno)); - exit(1); - } - if (st.st_nlink != 0) - fprintf(stderr, "st_nlink = %d\n", (int)st.st_nlink); - - fprintf(stderr, "reading\n"); - rc = read(fd, buf, strlen(T1) + 1); - if (rc != strlen(T1) + 1) { - fprintf(stderr, "read (unlink) %s (rc %d)\n", - strerror(errno), rc); - exit(1); - } - - fprintf(stderr, "comparing data\n"); - if (memcmp(buf, T1, strlen(T1) + 1) ) { - fprintf(stderr, "FAILURE: read wrong data after unlink\n"); - exit(1); - } - - fprintf(stderr, "truncating\n"); - rc = ftruncate(fd, 0); - if (rc) { - fprintf(stderr, "truncate (unlink) %s\n", strerror(errno)); - exit(1); - } - - fprintf(stderr, "seeking (2)\n"); - rc = lseek(fd, 0, SEEK_SET); - if (rc) { - fprintf(stderr, "seek (after unlink trunc) %s\n", - strerror(errno)); - exit(1); - } - - fprintf(stderr, "writing again\n"); - rc = write(fd, T2, strlen(T2) + 1); - if (rc != strlen(T2) + 1) { - fprintf(stderr, "write (after unlink trunc) %s (rc %d)\n", - strerror(errno), rc); - exit(1); - } - - fprintf(stderr, "seeking (3)\n"); - rc = lseek(fd, 0, SEEK_SET); - if (rc) { - fprintf(stderr, "seek (before unlink read) %s\n", - strerror(errno)); - exit(1); - } - - fprintf(stderr, "reading again\n"); - rc = read(fd, buf, strlen(T2) + 1); - if (rc != strlen(T2) + 1) { - fprintf(stderr, "read (after unlink rewrite) %s (rc %d)\n", - strerror(errno), rc); - exit(1); - } - - fprintf(stderr, "comparing data again\n"); - if (memcmp(buf, T2, strlen(T2) + 1)) { - fprintf(stderr, "FAILURE: read wrong data after rewrite\n"); - exit(1); - } - - fprintf(stderr, "closing\n"); - rc = close(fd); - if (rc) { - fprintf(stderr, "close (unlink) %s\n", strerror(errno)); - exit(1); - } - - fprintf(stderr, "SUCCESS - goto beer\n"); - return 0; + fprintf(stderr, "seeking (1)\n"); + rc = lseek(fd, 0, SEEK_SET); + if (rc) { + fprintf(stderr, "seek %s\n", strerror(errno)); + exit(1); + } + + fprintf(stderr, "accessing (2)\n"); + if (access(fname, F_OK) == 0) { + fprintf(stderr, "%s still exists\n", fname); + exit(1); + } + + fprintf(stderr, "fstat...\n"); + rc = fstat(fd, &st); + if (rc) { + fprintf(stderr, "fstat (unlink) %s\n", strerror(errno)); + exit(1); + } + if (st.st_nlink != 0) + fprintf(stderr, "st_nlink = %d\n", (int)st.st_nlink); + + fprintf(stderr, "reading\n"); + rc = read(fd, buf, strlen(T1) + 1); + if (rc != strlen(T1) + 1) { + fprintf(stderr, "read (unlink) %s (rc %d)\n", + strerror(errno), rc); + exit(1); + } + + fprintf(stderr, "comparing data\n"); + if (memcmp(buf, T1, strlen(T1) + 1)) { + fprintf(stderr, "FAILURE: read wrong data after unlink\n"); + exit(1); + } + + fprintf(stderr, "truncating\n"); + rc = ftruncate(fd, 0); + if (rc) { + fprintf(stderr, "truncate (unlink) %s\n", strerror(errno)); + exit(1); + } + + fprintf(stderr, "seeking (2)\n"); + rc = lseek(fd, 0, SEEK_SET); + if (rc) { + fprintf(stderr, "seek (after unlink trunc) %s\n", + strerror(errno)); + exit(1); + } + + fprintf(stderr, "writing again\n"); + rc = write(fd, T2, strlen(T2) + 1); + if (rc != strlen(T2) + 1) { + fprintf(stderr, "write (after unlink trunc) %s (rc %d)\n", + strerror(errno), rc); + exit(1); + } + + fprintf(stderr, "seeking (3)\n"); + rc = lseek(fd, 0, SEEK_SET); + if (rc) { + fprintf(stderr, "seek (before unlink read) %s\n", + strerror(errno)); + exit(1); + } + + fprintf(stderr, "reading again\n"); + rc = read(fd, buf, strlen(T2) + 1); + if (rc != strlen(T2) + 1) { + fprintf(stderr, "read (after unlink rewrite) %s (rc %d)\n", + strerror(errno), rc); + exit(1); + } + + fprintf(stderr, "comparing data again\n"); + if (memcmp(buf, T2, strlen(T2) + 1)) { + fprintf(stderr, "FAILURE: read wrong data after rewrite\n"); + exit(1); + } + + fprintf(stderr, "closing\n"); + rc = close(fd); + if (rc) { + fprintf(stderr, "close (unlink) %s\n", strerror(errno)); + exit(1); + } + + fprintf(stderr, "SUCCESS - goto beer\n"); + return 0; } -- 1.8.3.1