Branch HEAD

[fs/lustre-release.git] / lustre / tests / fsx.c

diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c
index ead1c85..dc97fd9 100644 (file)
--- a/lustre/tests/fsx.c
+++ b/lustre/tests/fsx.c
@@ -363,7 +363,7 @@ check_buffers(unsigned offset, unsigned size)
                        if (c != t) {
                                if (n == 0) {
                                        bad = short_at(&temp_buf[i]);
-                                       prt("0x%5x\t0x%04x\t0x%04x", offset,
+                                       prt("%#07x\t%#06x\t%#06x", offset,
                                            short_at(&good_buf[offset]), bad);
                                        op = temp_buf[offset & 1 ? i+1 : i];
                                }
@@ -375,7 +375,7 @@ check_buffers(unsigned offset, unsigned size)
                        size--;
                }
                if (n) {
-                       prt("\t0x%5x\n", n);
+                       prt("\t%#7x\n", n);
                        if (bad)
                                prt("operation# (mod 256) for the bad data"
                                        "may be %u\n", ((unsigned)op & 0xff));
@@ -438,21 +438,21 @@ assign_fd_policy(char *policy)
        }
 }
 
-int 
+int
 get_fd(void)
 {
        struct test_file *tf = get_tf();
        return tf->fd;
 }
 
-static const char *basename(const char *path)
+static const char *my_basename(const char *path)
 {
        char *c = strrchr(path, '/');
 
        return c ? c++ : path;
 }
 
-void 
+void
 open_test_files(char **argv, int argc)
 {
        struct test_file *tf;
@@ -531,7 +531,10 @@ check_trunc_hack(void)
 
        ftruncate(fd, (off_t)0);
        ftruncate(fd, (off_t)100000);
-       fstat(fd, &statbuf);
+       if (fstat(fd, &statbuf)) {
+               prterr("trunc_hack: fstat");
+               statbuf.st_size = -1;
+       }
        if (statbuf.st_size != (off_t)100000) {
                prt("no extend on truncate! not posix!\n");
                exit(130);
@@ -608,7 +611,7 @@ output_line(struct test_file *tf, int op, unsigned offset,
                          (monitorend == -1 || offset <= monitorend)))))))
                return;
 
-       prt("%06lu %lu.%06lu %*s%-10s %#08x %s %#08x\t(0x%x bytes)\n",
+       prt("%06lu %lu.%06lu %.*s%-10s %#08x %s %#08x\t(0x%x bytes)\n",
                testcalls, tv->tv_sec, tv->tv_usec, max_tf_len,
                tf_num, ops[op], 
                offset, op == OP_TRUNCATE ? " to " : "thru",
@@ -1331,14 +1334,14 @@ main(int argc, char **argv)
 
        open_test_files(argv, argc);
 
-       strncat(goodfile, dirpath ? basename(fname) : fname, 256);
+       strncat(goodfile, dirpath ? my_basename(fname) : fname, 256);
        strcat (goodfile, ".fsxgood");
        fsxgoodfd = open(goodfile, O_RDWR|O_CREAT|O_TRUNC, 0666);
        if (fsxgoodfd < 0) {
                prterr(goodfile);
                exit(92);
        }
-       strncat(logfile, dirpath ? basename(fname) : fname, 256);
+       strncat(logfile, dirpath ? my_basename(fname) : fname, 256);
        strcat (logfile, ".fsxlog");
        fsxlogf = fopen(logfile, "w");
        if (fsxlogf == NULL) {