LU-4887 lfsck: run all LFSCK scan types by default

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

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index fc9a0dc..5f4ab64 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -1174,8 +1174,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "updated_phase2: "LPU64"\n"
                              "failed_phase1: "LPU64"\n"
                              "failed_phase2: "LPU64"\n"
-                             "dirs: "LPU64"\n"
-                             "M-linked: "LPU64"\n"
+                             "directories: "LPU64"\n"
+                             "multi_linked_files: "LPU64"\n"
                              "dirent_repaired: "LPU64"\n"
                              "linkea_repaired: "LPU64"\n"
                              "nlinks_repaired: "LPU64"\n"
@@ -1185,8 +1185,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "run_time_phase2: %u seconds\n"
                              "average_speed_phase1: "LPU64" items/sec\n"
                              "average_speed_phase2: N/A\n"
-                             "real-time_speed_phase1: "LPU64" items/sec\n"
-                             "real-time_speed_phase2: N/A\n",
+                             "real_time_speed_phase1: "LPU64" items/sec\n"
+                             "real_time_speed_phase2: N/A\n",
                              checked,
                              ns->ln_objs_checked_phase2,
                              ns->ln_items_repaired,
@@ -1256,8 +1256,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "updated_phase2: "LPU64"\n"
                              "failed_phase1: "LPU64"\n"
                              "failed_phase2: "LPU64"\n"
-                             "dirs: "LPU64"\n"
-                             "M-linked: "LPU64"\n"
+                             "directories: "LPU64"\n"
+                             "multi_linked_files: "LPU64"\n"
                              "dirent_repaired: "LPU64"\n"
                              "linkea_repaired: "LPU64"\n"
                              "nlinks_repaired: "LPU64"\n"
@@ -1267,8 +1267,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "run_time_phase2: %u seconds\n"
                              "average_speed_phase1: "LPU64" items/sec\n"
                              "average_speed_phase2: "LPU64" objs/sec\n"
-                             "real-time_speed_phase1: N/A\n"
-                             "real-time_speed_phase2: "LPU64" objs/sec\n"
+                             "real_time_speed_phase1: N/A\n"
+                             "real_time_speed_phase2: "LPU64" objs/sec\n"
                              "current_position: "DFID"\n",
                              ns->ln_items_checked,
                              checked,
@@ -1303,8 +1303,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "updated_phase2: "LPU64"\n"
                              "failed_phase1: "LPU64"\n"
                              "failed_phase2: "LPU64"\n"
-                             "dirs: "LPU64"\n"
-                             "M-linked: "LPU64"\n"
+                             "directories: "LPU64"\n"
+                             "multi_linked_files: "LPU64"\n"
                              "dirent_repaired: "LPU64"\n"
                              "linkea_repaired: "LPU64"\n"
                              "nlinks_repaired: "LPU64"\n"
@@ -1314,8 +1314,8 @@ lfsck_namespace_dump(const struct lu_env *env, struct lfsck_component *com,
                              "run_time_phase2: %u seconds\n"
                              "average_speed_phase1: "LPU64" items/sec\n"
                              "average_speed_phase2: "LPU64" objs/sec\n"
-                             "real-time_speed_phase1: N/A\n"
-                             "real-time_speed_phase2: N/A\n"
+                             "real_time_speed_phase1: N/A\n"
+                             "real_time_speed_phase2: N/A\n"
                              "current_position: N/A\n",
                              ns->ln_items_checked,
                              ns->ln_objs_checked_phase2,
@@ -1589,7 +1589,7 @@ int lfsck_namespace_setup(const struct lu_env *env,
        init_rwsem(&com->lc_sem);
        atomic_set(&com->lc_ref, 1);
        com->lc_lfsck = lfsck;
-       com->lc_type = LT_NAMESPACE;
+       com->lc_type = LFSCK_TYPE_NAMESPACE;
        com->lc_ops = &lfsck_namespace_ops;
        com->lc_file_size = sizeof(struct lfsck_namespace);
        OBD_ALLOC(com->lc_file_ram, com->lc_file_size);