LU-6322 lfsck: show start/complete time directly

[fs/lustre-release.git] / lustre / lfsck / lfsck_lib.c

diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c
index 02616b7..4951396 100644 (file)
--- a/lustre/lfsck/lfsck_lib.c
+++ b/lustre/lfsck/lfsck_lib.c
@@ -1719,8 +1719,11 @@ int lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
        int flag;
        int i;
        bool newline = (bits != 0 ? false : true);
+       int rc;
 
-       seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
+       rc = seq_printf(m, "%s:%c", prefix, bits != 0 ? ' ' : '\n');
+       if (rc < 0)
+               return rc;
 
        for (i = 0, flag = 1; bits != 0; i++, flag = 1 << i) {
                if (flag & bits) {
@@ -1729,25 +1732,38 @@ int lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
                                if (bits == 0)
                                        newline = true;
 
-                               seq_printf(m, "%s%c", names[i],
-                                          newline ? '\n' : ',');
+                               rc = seq_printf(m, "%s%c", names[i],
+                                               newline ? '\n' : ',');
+                               if (rc < 0)
+                                       return rc;
                        }
                }
        }
 
        if (!newline)
-               seq_printf(m, "\n");
-       return 0;
+               rc = seq_printf(m, "\n");
+
+       return rc;
 }
 
-int lfsck_time_dump(struct seq_file *m, __u64 time, const char *prefix)
+int lfsck_time_dump(struct seq_file *m, __u64 time, const char *name)
 {
-       if (time != 0)
-               seq_printf(m, "%s: "LPU64" seconds\n", prefix,
-                         cfs_time_current_sec() - time);
-       else
-               seq_printf(m, "%s: N/A\n", prefix);
-       return 0;
+       int rc;
+
+       if (time == 0) {
+               rc = seq_printf(m, "%s_time: N/A\n", name);
+               if (rc == 0)
+                       rc = seq_printf(m, "time_since_%s: N/A\n", name);
+
+               return rc;
+       }
+
+       rc = seq_printf(m, "%s_time: "LPU64"\n", name, time);
+       if (rc == 0)
+               rc = seq_printf(m, "time_since_%s: "LPU64" seconds\n",
+                               name, cfs_time_current_sec() - time);
+
+       return rc;
 }
 
 int lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
@@ -1755,17 +1771,15 @@ int lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
 {
        if (fid_is_zero(&pos->lp_dir_parent)) {
                if (pos->lp_oit_cookie == 0)
-                       seq_printf(m, "%s: N/A, N/A, N/A\n",
-                                  prefix);
-               else
-                       seq_printf(m, "%s: "LPU64", N/A, N/A\n",
-                                  prefix, pos->lp_oit_cookie);
-       } else {
-               seq_printf(m, "%s: "LPU64", "DFID", "LPX64"\n",
-                          prefix, pos->lp_oit_cookie,
-                          PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
+                       return seq_printf(m, "%s: N/A, N/A, N/A\n", prefix);
+
+               return seq_printf(m, "%s: "LPU64", N/A, N/A\n",
+                                 prefix, pos->lp_oit_cookie);
        }
-       return 0;
+
+       return seq_printf(m, "%s: "LPU64", "DFID", "LPX64"\n",
+                         prefix, pos->lp_oit_cookie,
+                         PFID(&pos->lp_dir_parent), pos->lp_dir_cookie);
 }
 
 void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,