From: Arshad Hussain Date: Tue, 6 Aug 2019 13:56:31 +0000 (+0530) Subject: LU-6142 tests: Fix style issues for utime.c X-Git-Tag: 2.12.90~62 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e48750981d299807528aa9b943750c3e5a811bb8 LU-6142 tests: Fix style issues for utime.c This patch fixes issues reported by checkpatch for file lustre/tests/utime.c Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: Iae92c34b2f6d68204bb3f9846227eb507c04e27d Reviewed-on: https://review.whamcloud.com/35908 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Petros Koutoupis Reviewed-by: Ben Evans Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/utime.c b/lustre/tests/utime.c index 84e13d3..17c37d9 100644 --- a/lustre/tests/utime.c +++ b/lustre/tests/utime.c @@ -53,26 +53,27 @@ int main(int argc, char *argv[]) { long before_mknod, after_mknod; const char *prog = argv[0]; - const char *filename = argv[1]; - char *secname = NULL; - struct utimbuf utb; + const char *filename = argv[1]; + char *secname = NULL; + struct utimbuf utb; struct stat st, st2; int rc; - int c; - - while ((c = getopt(argc, argv, "s:")) != -1) { - switch(c) { - case 's': - secname = optarg; - break; - default: - usage(argv[0]); - } - } + int c; + + while ((c = getopt(argc, argv, "s:")) != -1) { + switch (c) { + case 's': + secname = optarg; + break; + default: + usage(argv[0]); + } + } if (optind + 1 > argc) usage(argv[0]); - /* Adjust the before time back one second, because the kernel's + /* + * Adjust the before time back one second, because the kernel's * CURRENT_TIME (lockless clock reading, used to set inode times) * may drift against the do_gettimeofday() time (TSC-corrected and * locked clock reading, used to return timestamps to user space). @@ -95,40 +96,42 @@ int main(int argc, char *argv[]) } if (st.st_mtime < before_mknod || st.st_mtime > after_mknod) { - fprintf(stderr, "%s: bad mknod(%s) times %lu <= %lu <= " - "%lu false\n", prog, filename, before_mknod, - st.st_mtime, after_mknod); + fprintf(stderr, + "%s: bad mknod(%s) times %lu <= %lu <= %lu false\n", + prog, filename, before_mknod, st.st_mtime, + after_mknod); return 4; } printf("%s: good mknod times %lu%s <= %lu <= %lu for %s\n", - prog, before_mknod, before_mknod == st.st_mtime ? "*":"", + prog, before_mknod, + before_mknod == st.st_mtime ? "*" : "", st.st_mtime, after_mknod, filename); - if (secname) { - sleep(1); - rc = stat(secname, &st2); - if (rc) { - fprintf(stderr, "%s: stat(%s) failed: rc %d: " - "%s\n", prog, secname, errno, - strerror(errno)); - return 5; - } - - if (st2.st_mtime < before_mknod || - st2.st_mtime > after_mknod) { - fprintf(stderr, "%s: bad mknod(%s) times %lu " - " <= %lu <= %lu false\n", prog, - filename, before_mknod, st2.st_mtime, - after_mknod); - return 6; - } - - printf("%s: good mknod times %lu%s <= %lu <= %lu " - "for %s\n", prog, before_mknod, - before_mknod == st.st_mtime ? "*":"", - st2.st_mtime, after_mknod, secname); - } + if (secname) { + sleep(1); + rc = stat(secname, &st2); + if (rc) { + fprintf(stderr, + "%s: stat(%s) failed: rc %d: %s\n", + prog, secname, errno, strerror(errno)); + return 5; + } + + if (st2.st_mtime < before_mknod || + st2.st_mtime > after_mknod) { + fprintf(stderr, + "%s: bad mknod(%s) times %lu <= %lu <= %lu false\n", + prog, filename, before_mknod, + st2.st_mtime, after_mknod); + return 6; + } + + printf("%s: good mknod times %lu%s <= %lu <= %lu for %s\n", + prog, before_mknod, + before_mknod == st.st_mtime ? "*" : "", + st2.st_mtime, after_mknod, secname); + } } utb.actime = 200000; @@ -139,7 +142,7 @@ int main(int argc, char *argv[]) prog, filename, errno, strerror(errno)); return 7; } - + rc = stat(filename, &st); if (rc) { fprintf(stderr, "%s: second stat(%s) failed: rc %d: %s\n", @@ -147,13 +150,13 @@ int main(int argc, char *argv[]) return 8; } - if (st.st_mtime != utb.modtime ) { + if (st.st_mtime != utb.modtime) { fprintf(stderr, "%s: bad utime mtime(%s) %lu should be %lu\n", prog, filename, st.st_mtime, utb.modtime); return 9; } - if (st.st_atime != utb.actime ) { + if (st.st_atime != utb.actime) { fprintf(stderr, "%s: bad utime atime(%s) %lu should be %lu\n", prog, filename, st.st_atime, utb.actime); return 10; @@ -162,32 +165,32 @@ int main(int argc, char *argv[]) printf("%s: good utime mtimes %lu, atime %lu\n", prog, utb.modtime, utb.actime); - if (secname == NULL) - return 0; - - /* Checking that times in past get updated on another client. */ + if (!secname) + return 0; + + /* Checking that times in past get updated on another client. */ rc = stat(secname, &st2); - if (rc) { + if (rc) { fprintf(stderr, "%s: second stat(%s) failed: rc %d: %s\n", prog, secname, errno, strerror(errno)); return 12; } if (st2.st_mtime != st.st_mtime) { - fprintf(stderr, "%s: not synced mtime(%s) between clients: " - "%lu should be %lu\n", prog, secname, - st2.st_mtime, st.st_mtime); + fprintf(stderr, + "%s: not synced mtime(%s) between clients: %lu should be %lu\n", + prog, secname, st2.st_mtime, st.st_mtime); return 13; } if (st2.st_ctime != st.st_ctime) { - fprintf(stderr, "%s: not synced ctime(%s) between clients: " - "%lu should be %lu\n", prog, secname, - st2.st_ctime, st.st_ctime); + fprintf(stderr, + "%s: not synced ctime(%s) between clients: %lu should be %lu\n", + prog, secname, st2.st_ctime, st.st_ctime); return 14; } - - printf("%s: updated times for %s\n", prog, secname); - + + printf("%s: updated times for %s\n", prog, secname); + return 0; }