From 1bb7d66a574664c95c4933ee720f6a85ff13dddf Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sun, 29 Sep 2019 23:38:40 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for rwv.c This patch fixes issues reported by checkpatch for file lustre/tests/rwv.c Test-Parameters: trivial testlist=sanity-flr Signed-off-by: Arshad Hussain Change-Id: I574ef984e08a413569391d67a3a27abe9502438b Reviewed-on: https://review.whamcloud.com/36385 Reviewed-by: Andreas Dilger Reviewed-by: Shaun Tancheff Reviewed-by: Ben Evans Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons --- lustre/tests/rwv.c | 234 ++++++++++++++++++++++++++--------------------------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/lustre/tests/rwv.c b/lustre/tests/rwv.c index c515ef8..331586d 100644 --- a/lustre/tests/rwv.c +++ b/lustre/tests/rwv.c @@ -69,62 +69,62 @@ void usage() int data_verify(struct iovec *iov, int iovcnt, char c) { - int i; + int i; - for (i = 0; i < iovcnt; i++) { - size_t count = iov[i].iov_len; - char *s = iov[i].iov_base; + for (i = 0; i < iovcnt; i++) { + size_t count = iov[i].iov_len; + char *s = iov[i].iov_base; - for (; count > 0; ++s, count--) { - if (*s != c) { - printf("Data mismatch %x: %x\n", *s, c); - return 1; - } - } - } - return 0; + for (; count > 0; ++s, count--) { + if (*s != c) { + printf("Data mismatch %x: %x\n", *s, c); + return 1; + } + } + } + return 0; } -int main(int argc, char** argv) +int main(int argc, char **argv) { - int c; - int fd; - int rc = 0; - int flags = 0; - int iovcnt = 0; - int act = ACT_NONE; + int c; + int fd; + int rc = 0; + int flags = 0; + int iovcnt = 0; + int act = ACT_NONE; int out_fd = -1; - char pad = 0xba; - char *end; - char *fname = "FILE"; - unsigned long len = 0; - struct iovec *iov; - off64_t offset = 0; + char pad = 0xba; + char *end; + char *fname = "FILE"; + unsigned long len = 0; + struct iovec *iov; + off64_t offset = 0; while ((c = getopt(argc, argv, "f:n:s:rwahvdzo::")) != -1) { - switch (c) { - case 'f': - fname = optarg; - break; - case 'n': - iovcnt = strtoul(optarg, &end, 0); - if (*end) { - printf("Bad iov count: %s\n", optarg); - return 1; - } - if (iovcnt > UIO_MAXIOV || iovcnt <= 0) { - printf("Wrong iov count\n"); - return 1; - } - break; - case 's': - act |= ACT_SEEK; - offset = strtoull(optarg, &end, 0); - if (*end) { - printf("Bad seek offset: %s\n", optarg); - return 1; - } - break; + switch (c) { + case 'f': + fname = optarg; + break; + case 'n': + iovcnt = strtoul(optarg, &end, 0); + if (*end) { + printf("Bad iov count: %s\n", optarg); + return 1; + } + if (iovcnt > UIO_MAXIOV || iovcnt <= 0) { + printf("Wrong iov count\n"); + return 1; + } + break; + case 's': + act |= ACT_SEEK; + offset = strtoull(optarg, &end, 0); + if (*end) { + printf("Bad seek offset: %s\n", optarg); + return 1; + } + break; case 'w': act |= ACT_WRITE; flags |= O_WRONLY | O_CREAT; @@ -133,78 +133,78 @@ int main(int argc, char** argv) act |= ACT_READ; flags |= O_RDONLY; break; - case 'a': - flags |= O_APPEND; - break; - case 'd': - flags |= O_LOV_DELAY_CREATE; - break; - case 'z': - pad = 0; - act |= ACT_READHOLE; - break; - case 'v': - act |= ACT_VERIFY; - break; + case 'a': + flags |= O_APPEND; + break; + case 'd': + flags |= O_LOV_DELAY_CREATE; + break; + case 'z': + pad = 0; + act |= ACT_READHOLE; + break; + case 'v': + act |= ACT_VERIFY; + break; case 'o': act |= ACT_OUTPUT; - if (optarg != NULL) - out_fd = open(optarg, O_WRONLY|O_CREAT, 0644); + if (optarg) + out_fd = open(optarg, O_WRONLY | O_CREAT, 0644); else out_fd = fileno(stdout); break; - case 'h': - usage(); - break; - } - } + case 'h': + usage(); + break; + } + } - if (act == ACT_NONE) { - usage(); - return 1; - } + if (act == ACT_NONE) { + usage(); + return 1; + } - if ((act & ACT_READ) && (act & ACT_WRITE)) { - printf("Read and write test should be exclusive\n"); - return 1; - } + if ((act & ACT_READ) && (act & ACT_WRITE)) { + printf("Read and write test should be exclusive\n"); + return 1; + } if (act & ACT_OUTPUT && (!(act & ACT_READ) || out_fd < 0)) { printf("-o not in read mode or cannot open the output file"); return 1; } - if (argc - optind < iovcnt) { - printf("Not enough parameters for iov size\n"); - return 1; - } + if (argc - optind < iovcnt) { + printf("Not enough parameters for iov size\n"); + return 1; + } - iov = (struct iovec *)malloc(iovcnt * sizeof(struct iovec)); - if (iov == NULL) { - printf("No memory %s\n", strerror(errno)); - return 1; - } + iov = (struct iovec *)malloc(iovcnt * sizeof(struct iovec)); + if (!iov) { + printf("No memory %s\n", strerror(errno)); + return 1; + } - for (c = 0; c < iovcnt; c++) { - struct iovec *iv = &iov[c]; + for (c = 0; c < iovcnt; c++) { + struct iovec *iv = &iov[c]; - iv->iov_len = strtoul(argv[optind++], &end, 0); - if (*end) { - printf("Error iov size\n"); + iv->iov_len = strtoul(argv[optind++], &end, 0); + if (*end) { + printf("Error iov size\n"); rc = 1; goto out; - } - iv->iov_base = mmap(NULL, iv->iov_len, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON, 0, 0); - if (iv->iov_base == MAP_FAILED) { - printf("No memory %s\n", strerror(errno)); + } + iv->iov_base = mmap(NULL, iv->iov_len, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, 0, 0); + if (iv->iov_base == MAP_FAILED) { + printf("No memory %s\n", strerror(errno)); rc = 1; goto out; - } - if (act & ACT_WRITE) - memset(iv->iov_base, pad, iv->iov_len); - len += iv->iov_len; - } + } + if (act & ACT_WRITE) + memset(iv->iov_base, pad, iv->iov_len); + len += iv->iov_len; + } fd = open(fname, O_LARGEFILE | flags, 0644); if (fd == -1) { @@ -218,24 +218,24 @@ int main(int argc, char** argv) goto out; } - if (act & ACT_WRITE) { - rc = writev(fd, iov, iovcnt); - if (rc != len) { - printf("Write error: %s (rc = %d, len = %ld)\n", - strerror(errno), rc, len); + if (act & ACT_WRITE) { + rc = writev(fd, iov, iovcnt); + if (rc != len) { + printf("Write error: %s (rc = %d, len = %ld)\n", + strerror(errno), rc, len); rc = 1; goto out; - } - } else if (act & ACT_READ) { - rc = readv(fd, iov, iovcnt); - if (rc != len) { - printf("Read error: %s rc = %d\n", strerror(errno), rc); + } + } else if (act & ACT_READ) { + rc = readv(fd, iov, iovcnt); + if (rc != len) { + printf("Read error: %s rc = %d\n", strerror(errno), rc); rc = 1; goto out; - } + } - /* It should return zeroed buf if the read hits hole.*/ - if (((act & ACT_READHOLE) || (act & ACT_VERIFY)) && + /* It should return zeroed buf if the read hits hole.*/ + if (((act & ACT_READHOLE) || (act & ACT_VERIFY)) && data_verify(iov, iovcnt, pad)) { rc = 1; goto out; @@ -250,12 +250,12 @@ int main(int argc, char** argv) goto out; } } - } + } - rc = 0; + rc = 0; out: - if (iov) - free(iov); + if (iov) + free(iov); if (out_fd >= 0) close(out_fd); return rc; -- 1.8.3.1