LU-4917 lfsck: dump layout lfsck correctly

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

diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c
index 7f8e3fc..e31faf3 100644 (file)
--- a/lustre/lfsck/lfsck_engine.c
+++ b/lustre/lfsck/lfsck_engine.c
@@ -306,6 +306,12 @@ static int lfsck_master_oit_engine(const struct lu_env *env,
                                ostid_to_fid(fid, oi, idx);
                                update_lma = true;
                        }
+               } else if (!fid_is_norm(fid) && !fid_is_igif(fid) &&
+                          !fid_is_last_id(fid) && !fid_is_root(fid) &&
+                          !fid_seq_is_dot(fid_seq(fid))) {
+                       /* If the FID/object is only used locally and invisible
+                        * to external nodes, then LFSCK will not handle it. */
+                       goto checkpoint;
                }
 
                target = lfsck_object_find(env, lfsck, fid);
@@ -368,6 +374,7 @@ int lfsck_master_engine(void *args)
        struct dt_object         *oit_obj  = lfsck->li_obj_oit;
        const struct dt_it_ops   *oit_iops = &oit_obj->do_index_ops->dio_it;
        struct dt_it             *oit_di;
+       struct l_wait_info        lwi      = { 0 };
        int                       rc;
        ENTRY;
 
@@ -383,7 +390,7 @@ int lfsck_master_engine(void *args)
        spin_lock(&lfsck->li_lock);
        lfsck->li_di_oit = oit_di;
        spin_unlock(&lfsck->li_lock);
-       rc = lfsck_prep(env, lfsck);
+       rc = lfsck_prep(env, lfsck, lta->lta_lsp);
        if (rc != 0)
                GOTO(fini_oit, rc);
 
@@ -400,6 +407,13 @@ int lfsck_master_engine(void *args)
        spin_unlock(&lfsck->li_lock);
        wake_up_all(&thread->t_ctl_waitq);
 
+       l_wait_event(thread->t_ctl_waitq,
+                    lfsck->li_start_unplug ||
+                    !thread_is_running(thread),
+                    &lwi);
+       if (!thread_is_running(thread))
+               GOTO(fini_oit, rc = 0);
+
        if (!cfs_list_empty(&lfsck->li_list_scan) ||
            cfs_list_empty(&lfsck->li_list_double_scan))
                rc = lfsck_master_oit_engine(env, lfsck);
@@ -428,6 +442,8 @@ fini_oit:
                        rc = lfsck_double_scan(env, lfsck);
                else
                        rc = 0;
+       } else {
+               lfsck_quit(env, lfsck);
        }
 
        /* XXX: Purge the pinned objects in the future. */