Whamcloud - gitweb
LU-1267 lfsck: enhance API for MDT-OST consistency
[fs/lustre-release.git] / lustre / lfsck / lfsck_layout.c
index f04950a..efe305a 100644 (file)
@@ -44,6 +44,7 @@
 #include <lustre_net.h>
 #include <lustre/lustre_user.h>
 #include <md_object.h>
+#include <obd_class.h>
 
 #include "lfsck_internal.h"
 
@@ -60,11 +61,187 @@ struct lfsck_layout_seq {
        unsigned int             lls_dirty:1;
 };
 
+struct lfsck_layout_slave_target {
+       /* link into lfsck_layout_slave_data::llsd_master_list. */
+       struct list_head        llst_list;
+       __u64                   llst_gen;
+       atomic_t                llst_ref;
+       __u32                   llst_index;
+};
+
 struct lfsck_layout_slave_data {
        /* list for lfsck_layout_seq */
        struct list_head         llsd_seq_list;
+
+       /* list for the masters involve layout verification. */
+       struct list_head         llsd_master_list;
+       spinlock_t               llsd_lock;
+       __u64                    llsd_touch_gen;
 };
 
+struct lfsck_layout_object {
+       struct dt_object        *llo_obj;
+       struct lu_attr           llo_attr;
+       atomic_t                 llo_ref;
+       __u16                    llo_gen;
+};
+
+struct lfsck_layout_req {
+       struct list_head                 llr_list;
+       struct lfsck_layout_object      *llr_parent;
+       struct dt_object                *llr_child;
+       __u32                            llr_ost_idx;
+       __u32                            llr_lov_idx; /* offset in LOV EA */
+};
+
+struct lfsck_layout_master_data {
+       spinlock_t              llmd_lock;
+       struct list_head        llmd_req_list;
+
+       /* list for the ost targets involve layout verification. */
+       struct list_head        llmd_ost_list;
+
+       /* list for the ost targets in phase1 scanning. */
+       struct list_head        llmd_ost_phase1_list;
+
+       /* list for the ost targets in phase1 scanning. */
+       struct list_head        llmd_ost_phase2_list;
+
+       /* list for the mdt targets involve layout verification. */
+       struct list_head        llmd_mdt_list;
+
+       /* list for the mdt targets in phase1 scanning. */
+       struct list_head        llmd_mdt_phase1_list;
+
+       /* list for the mdt targets in phase1 scanning. */
+       struct list_head        llmd_mdt_phase2_list;
+
+       struct ptlrpc_thread    llmd_thread;
+       __u32                   llmd_touch_gen;
+       int                     llmd_prefetched;
+       int                     llmd_assistant_status;
+       int                     llmd_post_result;
+       unsigned int            llmd_to_post:1,
+                               llmd_to_double_scan:1,
+                               llmd_in_double_scan:1,
+                               llmd_exit:1;
+};
+
+struct lfsck_layout_slave_async_args {
+       struct obd_export                *llsaa_exp;
+       struct lfsck_component           *llsaa_com;
+       struct lfsck_layout_slave_target *llsaa_llst;
+};
+
+static inline void
+lfsck_layout_llst_put(struct lfsck_layout_slave_target *llst)
+{
+       if (atomic_dec_and_test(&llst->llst_ref)) {
+               LASSERT(list_empty(&llst->llst_list));
+
+               OBD_FREE_PTR(llst);
+       }
+}
+
+static inline int
+lfsck_layout_llst_add(struct lfsck_layout_slave_data *llsd, __u32 index)
+{
+       struct lfsck_layout_slave_target *llst;
+       struct lfsck_layout_slave_target *tmp;
+       int                               rc   = 0;
+
+       OBD_ALLOC_PTR(llst);
+       if (llst == NULL)
+               return -ENOMEM;
+
+       INIT_LIST_HEAD(&llst->llst_list);
+       llst->llst_gen = 0;
+       llst->llst_index = index;
+       atomic_set(&llst->llst_ref, 1);
+
+       spin_lock(&llsd->llsd_lock);
+       list_for_each_entry(tmp, &llsd->llsd_master_list, llst_list) {
+               if (tmp->llst_index == index) {
+                       rc = -EALREADY;
+                       break;
+               }
+       }
+       if (rc == 0)
+               list_add_tail(&llst->llst_list, &llsd->llsd_master_list);
+       spin_unlock(&llsd->llsd_lock);
+
+       if (rc != 0)
+               OBD_FREE_PTR(llst);
+
+       return rc;
+}
+
+static inline void
+lfsck_layout_llst_del(struct lfsck_layout_slave_data *llsd,
+                     struct lfsck_layout_slave_target *llst)
+{
+       bool del = false;
+
+       spin_lock(&llsd->llsd_lock);
+       if (!list_empty(&llst->llst_list)) {
+               list_del_init(&llst->llst_list);
+               del = true;
+       }
+       spin_unlock(&llsd->llsd_lock);
+
+       if (del)
+               lfsck_layout_llst_put(llst);
+}
+
+static inline struct lfsck_layout_slave_target *
+lfsck_layout_llst_find_and_del(struct lfsck_layout_slave_data *llsd,
+                              __u32 index)
+{
+       struct lfsck_layout_slave_target *llst;
+
+       spin_lock(&llsd->llsd_lock);
+       list_for_each_entry(llst, &llsd->llsd_master_list, llst_list) {
+               if (llst->llst_index == index) {
+                       list_del_init(&llst->llst_list);
+                       spin_unlock(&llsd->llsd_lock);
+
+                       return llst;
+               }
+       }
+       spin_unlock(&llsd->llsd_lock);
+
+       return NULL;
+}
+
+static inline void lfsck_layout_object_put(const struct lu_env *env,
+                                          struct lfsck_layout_object *llo)
+{
+       if (atomic_dec_and_test(&llo->llo_ref)) {
+               lfsck_object_put(env, llo->llo_obj);
+               OBD_FREE_PTR(llo);
+       }
+}
+
+static inline void lfsck_layout_req_fini(const struct lu_env *env,
+                                        struct lfsck_layout_req *llr)
+{
+       lu_object_put(env, &llr->llr_child->do_lu);
+       lfsck_layout_object_put(env, llr->llr_parent);
+       OBD_FREE_PTR(llr);
+}
+
+static inline bool lfsck_layout_req_empty(struct lfsck_layout_master_data *llmd)
+{
+       bool empty = false;
+
+       spin_lock(&llmd->llmd_lock);
+       if (list_empty(&llmd->llmd_req_list))
+               empty = true;
+       spin_unlock(&llmd->llmd_lock);
+
+       return empty;
+}
+
 static void lfsck_layout_le_to_cpu(struct lfsck_layout *des,
                                   const struct lfsck_layout *src)
 {
@@ -554,11 +731,1007 @@ out:
        else
                lls->lls_lastid_obj = obj;
 
-       return rc;
+       return rc;
+}
+
+static int lfsck_layout_master_async_interpret(const struct lu_env *env,
+                                              struct ptlrpc_request *req,
+                                              void *args, int rc)
+{
+       struct lfsck_async_interpret_args *laia = args;
+       struct lfsck_component            *com  = laia->laia_com;
+       struct lfsck_layout_master_data   *llmd = com->lc_data;
+       struct lfsck_tgt_descs            *ltds = laia->laia_ltds;
+       struct lfsck_tgt_desc             *ltd  = laia->laia_ltd;
+       struct lfsck_request              *lr   = laia->laia_lr;
+
+       switch (lr->lr_event) {
+       case LE_START:
+               if (rc != 0) {
+                       struct lfsck_layout *lo = com->lc_file_ram;
+
+                       lo->ll_flags |= LF_INCOMPLETE;
+                       lfsck_tgt_put(ltd);
+                       break;
+               }
+
+               spin_lock(&ltds->ltd_lock);
+               if (ltd->ltd_dead || ltd->ltd_layout_done) {
+                       spin_unlock(&ltds->ltd_lock);
+                       lfsck_tgt_put(ltd);
+                       break;
+               }
+
+               if (lr->lr_flags & LEF_TO_OST) {
+                       if (list_empty(&ltd->ltd_layout_list))
+                               list_add_tail(&ltd->ltd_layout_list,
+                                             &llmd->llmd_ost_list);
+                       if (list_empty(&ltd->ltd_layout_phase_list))
+                               list_add_tail(&ltd->ltd_layout_phase_list,
+                                             &llmd->llmd_ost_phase1_list);
+               } else {
+                       if (list_empty(&ltd->ltd_layout_list))
+                               list_add_tail(&ltd->ltd_layout_list,
+                                             &llmd->llmd_mdt_list);
+                       if (list_empty(&ltd->ltd_layout_phase_list))
+                               list_add_tail(&ltd->ltd_layout_phase_list,
+                                             &llmd->llmd_mdt_phase1_list);
+               }
+               spin_unlock(&ltds->ltd_lock);
+               lfsck_tgt_put(ltd);
+               break;
+       case LE_STOP:
+       case LE_PHASE1_DONE:
+       case LE_PHASE2_DONE:
+               if (rc != 0)
+                       CERROR("%s: fail to notify %s %x for layout: "
+                              "event = %d, rc = %d\n",
+                              lfsck_lfsck2name(com->lc_lfsck),
+                              (lr->lr_flags & LEF_TO_OST) ? "OST" : "MDT",
+                              ltd->ltd_index, lr->lr_event, rc);
+               break;
+       case LE_QUERY: {
+               struct lfsck_reply *reply;
+
+               if (rc != 0) {
+                       spin_lock(&ltds->ltd_lock);
+                       list_del_init(&ltd->ltd_layout_phase_list);
+                       list_del_init(&ltd->ltd_layout_list);
+                       spin_unlock(&ltds->ltd_lock);
+                       lfsck_tgt_put(ltd);
+                       break;
+               }
+
+               reply = req_capsule_server_get(&req->rq_pill,
+                                              &RMF_LFSCK_REPLY);
+               if (reply == NULL) {
+                       rc = -EPROTO;
+                       CERROR("%s: invalid return value: rc = %d\n",
+                              lfsck_lfsck2name(com->lc_lfsck), rc);
+                       spin_lock(&ltds->ltd_lock);
+                       list_del_init(&ltd->ltd_layout_phase_list);
+                       list_del_init(&ltd->ltd_layout_list);
+                       spin_unlock(&ltds->ltd_lock);
+                       lfsck_tgt_put(ltd);
+                       break;
+               }
+
+               switch (reply->lr_status) {
+               case LS_SCANNING_PHASE1:
+                       break;
+               case LS_SCANNING_PHASE2:
+                       spin_lock(&ltds->ltd_lock);
+                       list_del_init(&ltd->ltd_layout_phase_list);
+                       if (ltd->ltd_dead || ltd->ltd_layout_done) {
+                               spin_unlock(&ltds->ltd_lock);
+                               break;
+                       }
+
+                       if (lr->lr_flags & LEF_TO_OST)
+                               list_add_tail(&ltd->ltd_layout_phase_list,
+                                             &llmd->llmd_ost_phase2_list);
+                       else
+                               list_add_tail(&ltd->ltd_layout_phase_list,
+                                             &llmd->llmd_mdt_phase2_list);
+                       spin_unlock(&ltds->ltd_lock);
+                       break;
+               default:
+                       spin_lock(&ltds->ltd_lock);
+                       list_del_init(&ltd->ltd_layout_phase_list);
+                       list_del_init(&ltd->ltd_layout_list);
+                       spin_unlock(&ltds->ltd_lock);
+                       break;
+               }
+               lfsck_tgt_put(ltd);
+               break;
+       }
+       default:
+               CERROR("%s: unexpected event: rc = %d\n",
+                      lfsck_lfsck2name(com->lc_lfsck), lr->lr_event);
+               break;
+       }
+
+       lfsck_component_put(env, com);
+
+       return 0;
+}
+
+static int lfsck_layout_master_query_others(const struct lu_env *env,
+                                           struct lfsck_component *com)
+{
+       struct lfsck_thread_info          *info  = lfsck_env_info(env);
+       struct lfsck_request              *lr    = &info->lti_lr;
+       struct lfsck_async_interpret_args *laia  = &info->lti_laia;
+       struct lfsck_instance             *lfsck = com->lc_lfsck;
+       struct lfsck_layout_master_data   *llmd  = com->lc_data;
+       struct ptlrpc_request_set         *set;
+       struct lfsck_tgt_descs            *ltds;
+       struct lfsck_tgt_desc             *ltd;
+       struct list_head                  *head;
+       __u32                              cnt   = 0;
+       int                                rc    = 0;
+       int                                rc1   = 0;
+       ENTRY;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN(-ENOMEM);
+
+       llmd->llmd_touch_gen++;
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_event = LE_QUERY;
+       lr->lr_active = LT_LAYOUT;
+       laia->laia_com = com;
+       laia->laia_lr = lr;
+
+       if (!list_empty(&llmd->llmd_mdt_phase1_list)) {
+               ltds = &lfsck->li_mdt_descs;
+               lr->lr_flags = 0;
+               head = &llmd->llmd_mdt_phase1_list;
+       } else {
+
+again:
+               ltds = &lfsck->li_ost_descs;
+               lr->lr_flags = LEF_TO_OST;
+               head = &llmd->llmd_ost_phase1_list;
+       }
+
+       laia->laia_ltds = ltds;
+       spin_lock(&ltds->ltd_lock);
+       while (!list_empty(head)) {
+               ltd = list_entry(head->next,
+                                struct lfsck_tgt_desc,
+                                ltd_layout_phase_list);
+               if (ltd->ltd_layout_gen == llmd->llmd_touch_gen)
+                       break;
+
+               ltd->ltd_layout_gen = llmd->llmd_touch_gen;
+               list_del(&ltd->ltd_layout_phase_list);
+               list_add_tail(&ltd->ltd_layout_phase_list, head);
+               atomic_inc(&ltd->ltd_ref);
+               laia->laia_ltd = ltd;
+               spin_unlock(&ltds->ltd_lock);
+               rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                        lfsck_layout_master_async_interpret,
+                                        laia, LFSCK_QUERY);
+               if (rc != 0) {
+                       CERROR("%s: fail to query %s %x for layout: rc = %d\n",
+                              lfsck_lfsck2name(lfsck),
+                              (lr->lr_flags & LEF_TO_OST) ? "OST" : "MDT",
+                              ltd->ltd_index, rc);
+                       lfsck_tgt_put(ltd);
+                       rc1 = rc;
+               } else {
+                       cnt++;
+               }
+               spin_lock(&ltds->ltd_lock);
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       if (cnt > 0) {
+               rc = ptlrpc_set_wait(set);
+               if (rc < 0) {
+                       ptlrpc_set_destroy(set);
+                       RETURN(rc);
+               }
+               cnt = 0;
+       }
+
+       if (!(lr->lr_flags & LEF_TO_OST) &&
+           list_empty(&llmd->llmd_mdt_phase1_list))
+               goto again;
+
+       ptlrpc_set_destroy(set);
+
+       RETURN(rc1 != 0 ? rc1 : rc);
+}
+
+static inline bool
+lfsck_layout_master_to_orphan(struct lfsck_layout_master_data *llmd)
+{
+       return list_empty(&llmd->llmd_mdt_phase1_list) &&
+              (!list_empty(&llmd->llmd_ost_phase2_list) ||
+               list_empty(&llmd->llmd_ost_phase1_list));
+}
+
+static int lfsck_layout_master_notify_others(const struct lu_env *env,
+                                            struct lfsck_component *com,
+                                            struct lfsck_request *lr,
+                                            __u32 flags)
+{
+       struct lfsck_thread_info          *info  = lfsck_env_info(env);
+       struct lfsck_async_interpret_args *laia  = &info->lti_laia;
+       struct lfsck_instance             *lfsck = com->lc_lfsck;
+       struct lfsck_layout_master_data   *llmd  = com->lc_data;
+       struct lfsck_layout               *lo    = com->lc_file_ram;
+       struct ptlrpc_request_set         *set;
+       struct lfsck_tgt_descs            *ltds;
+       struct lfsck_tgt_desc             *ltd;
+       struct lfsck_tgt_desc             *next;
+       struct list_head                  *head;
+       __u32                              idx;
+       __u32                              cnt   = 0;
+       int                                rc    = 0;
+       ENTRY;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN(-ENOMEM);
+
+       lr->lr_active = LT_LAYOUT;
+       laia->laia_com = com;
+       laia->laia_lr = lr;
+       lr->lr_flags = 0;
+       switch (lr->lr_event) {
+       case LE_START:
+               /* Notify OSTs firstly, then other MDTs if needed. */
+               lr->lr_flags |= LEF_TO_OST;
+               ltds = &lfsck->li_ost_descs;
+
+lable1:
+               laia->laia_ltds = ltds;
+               down_read(&ltds->ltd_rw_sem);
+               cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+                       ltd = lfsck_tgt_get(ltds, idx);
+                       LASSERT(ltd != NULL);
+
+                       laia->laia_ltd = ltd;
+                       ltd->ltd_layout_done = 0;
+                       rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                       lfsck_layout_master_async_interpret,
+                                       laia, LFSCK_NOTIFY);
+                       if (rc != 0) {
+                               CERROR("%s: fail to notify %s %x for layout "
+                                      "start: rc = %d\n",
+                                      lfsck_lfsck2name(lfsck),
+                                      (lr->lr_flags & LEF_TO_OST) ? "OST" :
+                                      "MDT", idx, rc);
+                               lfsck_tgt_put(ltd);
+                               lo->ll_flags |= LF_INCOMPLETE;
+                       } else {
+                               cnt++;
+                       }
+               }
+               up_read(&ltds->ltd_rw_sem);
+
+               /* Sync up */
+               if (cnt > 0) {
+                       rc = ptlrpc_set_wait(set);
+                       if (rc < 0) {
+                               ptlrpc_set_destroy(set);
+                               RETURN(rc);
+                       }
+                       cnt = 0;
+               }
+
+               if (!(flags & LPF_ALL_MDT))
+                       break;
+
+               ltds = &lfsck->li_mdt_descs;
+               /* The sponsor broadcasts the request to other MDTs. */
+               if (flags & LPF_BROADCAST) {
+                       flags &= ~LPF_ALL_MDT;
+                       lr->lr_flags &= ~LEF_TO_OST;
+                       goto lable1;
+               }
+
+               /* non-sponsors link other MDT targets locallly. */
+               spin_lock(&ltds->ltd_lock);
+               cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
+                       ltd = LTD_TGT(ltds, idx);
+                       LASSERT(ltd != NULL);
+
+                       if (!list_empty(&ltd->ltd_layout_list))
+                               continue;
+
+                       list_add_tail(&ltd->ltd_layout_list,
+                                     &llmd->llmd_mdt_list);
+                       list_add_tail(&ltd->ltd_layout_phase_list,
+                                     &llmd->llmd_mdt_phase1_list);
+               }
+               spin_unlock(&ltds->ltd_lock);
+
+               break;
+       case LE_STOP:
+               if (flags & LPF_BROADCAST)
+                       lr->lr_flags |= LEF_FORCE_STOP;
+       case LE_PHASE2_DONE:
+               /* Notify other MDTs if needed, then the OSTs. */
+               if (flags & LPF_ALL_MDT) {
+                       /* The sponsor broadcasts the request to other MDTs. */
+                       if (flags & LPF_BROADCAST) {
+                               lr->lr_flags &= ~LEF_TO_OST;
+                               head = &llmd->llmd_mdt_list;
+                               ltds = &lfsck->li_mdt_descs;
+                               goto lable3;
+                       }
+
+                       /* non-sponsors unlink other MDT targets locallly. */
+                       ltds = &lfsck->li_mdt_descs;
+                       spin_lock(&ltds->ltd_lock);
+                       list_for_each_entry_safe(ltd, next,
+                                                &llmd->llmd_mdt_list,
+                                                ltd_layout_list) {
+                               list_del_init(&ltd->ltd_layout_phase_list);
+                               list_del_init(&ltd->ltd_layout_list);
+                       }
+                       spin_unlock(&ltds->ltd_lock);
+               }
+
+lable2:
+               lr->lr_flags |= LEF_TO_OST;
+               head = &llmd->llmd_ost_list;
+               ltds = &lfsck->li_ost_descs;
+
+lable3:
+               laia->laia_ltds = ltds;
+               spin_lock(&ltds->ltd_lock);
+               while (!list_empty(head)) {
+                       ltd = list_entry(head->next, struct lfsck_tgt_desc,
+                                        ltd_layout_list);
+                       if (!list_empty(&ltd->ltd_layout_phase_list))
+                               list_del_init(&ltd->ltd_layout_phase_list);
+                       list_del_init(&ltd->ltd_layout_list);
+                       laia->laia_ltd = ltd;
+                       spin_unlock(&ltds->ltd_lock);
+                       rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                       lfsck_layout_master_async_interpret,
+                                       laia, LFSCK_NOTIFY);
+                       if (rc != 0)
+                               CERROR("%s: fail to notify %s %x for layout "
+                                      "stop/phase2: rc = %d\n",
+                                      lfsck_lfsck2name(lfsck),
+                                      (lr->lr_flags & LEF_TO_OST) ? "OST" :
+                                      "MDT", ltd->ltd_index, rc);
+                       else
+                               cnt++;
+                       spin_lock(&ltds->ltd_lock);
+               }
+               spin_unlock(&ltds->ltd_lock);
+
+               if (!(flags & LPF_BROADCAST))
+                       break;
+
+               /* Sync up */
+               if (cnt > 0) {
+                       rc = ptlrpc_set_wait(set);
+                       if (rc < 0) {
+                               ptlrpc_set_destroy(set);
+                               RETURN(rc);
+                       }
+                       cnt = 0;
+               }
+
+               flags &= ~LPF_BROADCAST;
+               goto lable2;
+       case LE_PHASE1_DONE:
+               llmd->llmd_touch_gen++;
+               lr->lr_flags &= ~LEF_TO_OST;
+               ltds = &lfsck->li_mdt_descs;
+               laia->laia_ltds = ltds;
+               spin_lock(&ltds->ltd_lock);
+               while (!list_empty(&llmd->llmd_mdt_phase1_list)) {
+                       ltd = list_entry(llmd->llmd_mdt_phase1_list.next,
+                                        struct lfsck_tgt_desc,
+                                        ltd_layout_phase_list);
+                       if (ltd->ltd_layout_gen == llmd->llmd_touch_gen)
+                               break;
+
+                       ltd->ltd_layout_gen = llmd->llmd_touch_gen;
+                       list_del_init(&ltd->ltd_layout_phase_list);
+                       list_add_tail(&ltd->ltd_layout_phase_list,
+                                     &llmd->llmd_mdt_phase1_list);
+                       laia->laia_ltd = ltd;
+                       spin_unlock(&ltds->ltd_lock);
+                       rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                       lfsck_layout_master_async_interpret,
+                                       laia, LFSCK_NOTIFY);
+                       if (rc != 0)
+                               CERROR("%s: fail to notify MDT %x for layout "
+                                      "phase1 done: rc = %d\n",
+                                      lfsck_lfsck2name(lfsck),
+                                      ltd->ltd_index, rc);
+                       else
+                               cnt++;
+                       spin_lock(&ltds->ltd_lock);
+               }
+               spin_unlock(&ltds->ltd_lock);
+               break;
+       default:
+               CERROR("%s: unexpected LFSCK event: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), lr->lr_event);
+               rc = -EINVAL;
+               break;
+       }
+
+       if (cnt > 0)
+               rc = ptlrpc_set_wait(set);
+       ptlrpc_set_destroy(set);
+
+       if (rc == 0 && lr->lr_event == LE_START &&
+           list_empty(&llmd->llmd_ost_list))
+               rc = -ENODEV;
+
+       RETURN(rc);
+}
+
+static int lfsck_layout_double_scan_result(const struct lu_env *env,
+                                          struct lfsck_component *com,
+                                          int rc)
+{
+       struct lfsck_instance   *lfsck = com->lc_lfsck;
+       struct lfsck_layout     *lo    = com->lc_file_ram;
+       struct lfsck_bookmark   *bk    = &lfsck->li_bookmark_ram;
+
+       down_write(&com->lc_sem);
+
+       lo->ll_run_time_phase2 += cfs_duration_sec(cfs_time_current() +
+                               HALF_SEC - lfsck->li_time_last_checkpoint);
+       lo->ll_time_last_checkpoint = cfs_time_current_sec();
+       lo->ll_objs_checked_phase2 += com->lc_new_checked;
+
+       if (rc > 0) {
+               com->lc_journal = 0;
+               if (lo->ll_flags & LF_INCOMPLETE)
+                       lo->ll_status = LS_PARTIAL;
+               else
+                       lo->ll_status = LS_COMPLETED;
+               if (!(bk->lb_param & LPF_DRYRUN))
+                       lo->ll_flags &= ~(LF_SCANNED_ONCE | LF_INCONSISTENT);
+               lo->ll_time_last_complete = lo->ll_time_last_checkpoint;
+               lo->ll_success_count++;
+       } else if (rc == 0) {
+               lo->ll_status = lfsck->li_status;
+               if (lo->ll_status == 0)
+                       lo->ll_status = LS_STOPPED;
+       } else {
+               lo->ll_status = LS_FAILED;
+       }
+
+       if (lo->ll_status != LS_PAUSED) {
+               spin_lock(&lfsck->li_lock);
+               list_del_init(&com->lc_link);
+               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               spin_unlock(&lfsck->li_lock);
+       }
+
+       rc = lfsck_layout_store(env, com);
+
+       up_write(&com->lc_sem);
+
+       return rc;
+}
+
+static int lfsck_layout_scan_orphan(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct lfsck_tgt_desc *ltd)
+{
+       /* XXX: To be extended in other patch. */
+
+       return 0;
+}
+
+static int lfsck_layout_assistant(void *args)
+{
+       struct lfsck_thread_args        *lta     = args;
+       struct lu_env                   *env     = &lta->lta_env;
+       struct lfsck_component          *com     = lta->lta_com;
+       struct lfsck_instance           *lfsck   = lta->lta_lfsck;
+       struct lfsck_bookmark           *bk      = &lfsck->li_bookmark_ram;
+       struct lfsck_position           *pos     = &com->lc_pos_start;
+       struct lfsck_thread_info        *info    = lfsck_env_info(env);
+       struct lfsck_request            *lr      = &info->lti_lr;
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct lfsck_layout_req         *llr;
+       struct l_wait_info               lwi     = { 0 };
+       int                              rc      = 0;
+       int                              rc1     = 0;
+       __u32                            flags;
+       ENTRY;
+
+       if (lta->lta_lsp->lsp_start != NULL)
+               flags  = lta->lta_lsp->lsp_start->ls_flags;
+       else
+               flags = bk->lb_param;
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_event = LE_START;
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_valid = LSV_SPEED_LIMIT | LSV_ERROR_HANDLE | LSV_DRYRUN |
+                      LSV_ASYNC_WINDOWS;
+       lr->lr_speed = bk->lb_speed_limit;
+       lr->lr_version = bk->lb_version;
+       lr->lr_param = bk->lb_param;
+       lr->lr_async_windows = bk->lb_async_windows;
+       if (pos->lp_oit_cookie <= 1)
+               lr->lr_param |= LPF_RESET;
+
+       rc = lfsck_layout_master_notify_others(env, com, lr, flags);
+       if (rc != 0) {
+               CERROR("%s: fail to notify others for layout start: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), rc);
+               GOTO(fini, rc);
+       }
+
+       spin_lock(&llmd->llmd_lock);
+       thread_set_flags(athread, SVC_RUNNING);
+       spin_unlock(&llmd->llmd_lock);
+       wake_up_all(&mthread->t_ctl_waitq);
+
+       while (1) {
+               while (!list_empty(&llmd->llmd_req_list)) {
+                       bool wakeup = false;
+
+                       if (unlikely(llmd->llmd_exit))
+                               GOTO(cleanup1, rc = llmd->llmd_post_result);
+
+                       /* XXX: To be extended in other patch.
+                        *
+                        * Compare the OST side attribute with local attribute,
+                        * and fix it if found inconsistency. */
+
+                       spin_lock(&llmd->llmd_lock);
+                       llr = list_entry(llmd->llmd_req_list.next,
+                                        struct lfsck_layout_req,
+                                        llr_list);
+                       list_del_init(&llr->llr_list);
+                       if (bk->lb_async_windows != 0 &&
+                           llmd->llmd_prefetched >= bk->lb_async_windows)
+                               wakeup = true;
+
+                       llmd->llmd_prefetched--;
+                       spin_unlock(&llmd->llmd_lock);
+                       if (wakeup)
+                               wake_up_all(&mthread->t_ctl_waitq);
+
+                       lfsck_layout_req_fini(env, llr);
+               }
+
+               /* Wakeup the master engine if it is waiting in checkpoint. */
+               wake_up_all(&mthread->t_ctl_waitq);
+
+               l_wait_event(athread->t_ctl_waitq,
+                            !lfsck_layout_req_empty(llmd) ||
+                            llmd->llmd_exit ||
+                            llmd->llmd_to_post ||
+                            llmd->llmd_to_double_scan,
+                            &lwi);
+
+               if (unlikely(llmd->llmd_exit))
+                       GOTO(cleanup1, rc = llmd->llmd_post_result);
+
+               if (!list_empty(&llmd->llmd_req_list))
+                       continue;
+
+               if (llmd->llmd_to_post) {
+                       llmd->llmd_to_post = 0;
+                       LASSERT(llmd->llmd_post_result > 0);
+
+                       memset(lr, 0, sizeof(*lr));
+                       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+                       lr->lr_event = LE_PHASE1_DONE;
+                       lr->lr_status = llmd->llmd_post_result;
+                       rc = lfsck_layout_master_notify_others(env, com, lr, 0);
+                       if (rc != 0)
+                               CERROR("%s: failed to notify others "
+                                      "for layout post: rc = %d\n",
+                                      lfsck_lfsck2name(lfsck), rc);
+
+                       /* Wakeup the master engine to go ahead. */
+                       wake_up_all(&mthread->t_ctl_waitq);
+               }
+
+               if (llmd->llmd_to_double_scan) {
+                       llmd->llmd_to_double_scan = 0;
+                       atomic_inc(&lfsck->li_double_scan_count);
+                       llmd->llmd_in_double_scan = 1;
+                       wake_up_all(&mthread->t_ctl_waitq);
+
+                       while (llmd->llmd_in_double_scan) {
+                               struct lfsck_tgt_descs  *ltds =
+                                                       &lfsck->li_ost_descs;
+                               struct lfsck_tgt_desc   *ltd;
+
+                               rc = lfsck_layout_master_query_others(env, com);
+                               if (lfsck_layout_master_to_orphan(llmd))
+                                       goto orphan;
+
+                               if (rc < 0)
+                                       GOTO(cleanup2, rc);
+
+                               /* Pull LFSCK status on related targets once
+                                * per 30 seconds if we are not notified. */
+                               lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(30),
+                                                          cfs_time_seconds(1),
+                                                          NULL, NULL);
+                               rc = l_wait_event(athread->t_ctl_waitq,
+                                       lfsck_layout_master_to_orphan(llmd) ||
+                                       llmd->llmd_exit ||
+                                       !thread_is_running(mthread),
+                                       &lwi);
+
+                               if (unlikely(llmd->llmd_exit ||
+                                            !thread_is_running(mthread)))
+                                       GOTO(cleanup2, rc = 0);
+
+                               if (rc == -ETIMEDOUT)
+                                       continue;
+
+                               if (rc < 0)
+                                       GOTO(cleanup2, rc);
+
+orphan:
+                               spin_lock(&ltds->ltd_lock);
+                               while (!list_empty(
+                                               &llmd->llmd_ost_phase2_list)) {
+                                       ltd = list_entry(
+                                             llmd->llmd_ost_phase2_list.next,
+                                             struct lfsck_tgt_desc,
+                                             ltd_layout_phase_list);
+                                       list_del_init(
+                                               &ltd->ltd_layout_phase_list);
+                                       spin_unlock(&ltds->ltd_lock);
+
+                                       rc = lfsck_layout_scan_orphan(env, com,
+                                                                     ltd);
+                                       if (rc != 0 &&
+                                           bk->lb_param & LPF_FAILOUT)
+                                               GOTO(cleanup2, rc);
+
+                                       if (unlikely(llmd->llmd_exit ||
+                                               !thread_is_running(mthread)))
+                                               GOTO(cleanup2, rc = 0);
+
+                                       spin_lock(&ltds->ltd_lock);
+                               }
+
+                               if (list_empty(&llmd->llmd_ost_phase1_list)) {
+                                       spin_unlock(&ltds->ltd_lock);
+                                       GOTO(cleanup2, rc = 1);
+                               }
+                               spin_unlock(&ltds->ltd_lock);
+                       }
+               }
+       }
+
+cleanup1:
+       /* Cleanup the unfinished requests. */
+       spin_lock(&llmd->llmd_lock);
+       while (!list_empty(&llmd->llmd_req_list)) {
+               llr = list_entry(llmd->llmd_req_list.next,
+                                struct lfsck_layout_req,
+                                llr_list);
+               list_del_init(&llr->llr_list);
+               llmd->llmd_prefetched--;
+               spin_unlock(&llmd->llmd_lock);
+               lfsck_layout_req_fini(env, llr);
+               spin_lock(&llmd->llmd_lock);
+       }
+       spin_unlock(&llmd->llmd_lock);
+
+       LASSERTF(llmd->llmd_prefetched == 0, "unmatched prefeteched objs %d\n",
+                llmd->llmd_prefetched);
+
+cleanup2:
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       if (rc > 0) {
+               lr->lr_event = LE_PHASE2_DONE;
+               flags = 0;
+               lr->lr_status = rc;
+       } else if (rc == 0) {
+               lr->lr_event = LE_STOP;
+               if (lfsck->li_status == LS_PAUSED ||
+                   lfsck->li_status == LS_CO_PAUSED) {
+                       flags = 0;
+                       lr->lr_status = LS_CO_PAUSED;
+               } else if (lfsck->li_status == LS_STOPPED ||
+                        lfsck->li_status == LS_CO_STOPPED) {
+                       flags = lfsck->li_flags;
+                       if (flags & LPF_BROADCAST)
+                               lr->lr_status = LS_STOPPED;
+                       else
+                               lr->lr_status = LS_CO_STOPPED;
+               } else {
+                       LBUG();
+               }
+       } else {
+               lr->lr_event = LE_STOP;
+               flags = 0;
+               lr->lr_status = LS_CO_FAILED;
+       }
+
+       rc1 = lfsck_layout_master_notify_others(env, com, lr, flags);
+       if (rc1 != 0) {
+               CERROR("%s: failed to notify others for layout quit: rc = %d\n",
+                      lfsck_lfsck2name(lfsck), rc1);
+               rc = rc1;
+       }
+
+       /* Under force exit case, some requests may be just freed without
+        * verification, those objects should be re-handled when next run.
+        * So not update the on-disk tracing file under such case. */
+       if (!llmd->llmd_exit)
+               rc1 = lfsck_layout_double_scan_result(env, com, rc);
+
+fini:
+       if (llmd->llmd_in_double_scan)
+               atomic_dec(&lfsck->li_double_scan_count);
+
+       spin_lock(&llmd->llmd_lock);
+       llmd->llmd_assistant_status = (rc1 != 0 ? rc1 : rc);
+       thread_set_flags(athread, SVC_STOPPED);
+       wake_up_all(&mthread->t_ctl_waitq);
+       spin_unlock(&llmd->llmd_lock);
+       lfsck_thread_args_fini(lta);
+
+       return rc;
+}
+
+static int
+lfsck_layout_slave_async_interpret(const struct lu_env *env,
+                                  struct ptlrpc_request *req,
+                                  void *args, int rc)
+{
+       struct lfsck_layout_slave_async_args *llsaa = args;
+       struct obd_export                    *exp   = llsaa->llsaa_exp;
+       struct lfsck_component               *com   = llsaa->llsaa_com;
+       struct lfsck_layout_slave_target     *llst  = llsaa->llsaa_llst;
+       struct lfsck_layout_slave_data       *llsd  = com->lc_data;
+       bool                                  done  = false;
+
+       if (rc != 0) {
+               /* It is quite probably caused by target crash,
+                * to make the LFSCK can go ahead, assume that
+                * the target finished the LFSCK prcoessing. */
+               done = true;
+       } else {
+               struct lfsck_reply *lr;
+
+               lr = req_capsule_server_get(&req->rq_pill, &RMF_LFSCK_REPLY);
+               if (lr->lr_status != LS_SCANNING_PHASE1 &&
+                   lr->lr_status != LS_SCANNING_PHASE2)
+                       done = true;
+       }
+       if (done)
+               lfsck_layout_llst_del(llsd, llst);
+       lfsck_layout_llst_put(llst);
+       lfsck_component_put(env, com);
+       class_export_put(exp);
+
+       return 0;
+}
+
+static int lfsck_layout_async_query(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct obd_export *exp,
+                                   struct lfsck_layout_slave_target *llst,
+                                   struct lfsck_request *lr,
+                                   struct ptlrpc_request_set *set)
+{
+       struct lfsck_layout_slave_async_args *llsaa;
+       struct ptlrpc_request                *req;
+       struct lfsck_request                 *tmp;
+       int                                   rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_LFSCK_QUERY);
+       if (req == NULL)
+               RETURN(-ENOMEM);
+
+       rc = ptlrpc_request_pack(req, LUSTRE_OBD_VERSION, LFSCK_QUERY);
+       if (rc != 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+
+       tmp = req_capsule_client_get(&req->rq_pill, &RMF_LFSCK_REQUEST);
+       *tmp = *lr;
+       ptlrpc_request_set_replen(req);
+
+       llsaa = ptlrpc_req_async_args(req);
+       llsaa->llsaa_exp = exp;
+       llsaa->llsaa_com = lfsck_component_get(com);
+       llsaa->llsaa_llst = llst;
+       req->rq_interpret_reply = lfsck_layout_slave_async_interpret;
+       ptlrpc_set_add_req(set, req);
+
+       RETURN(0);
+}
+
+static int lfsck_layout_async_notify(const struct lu_env *env,
+                                    struct obd_export *exp,
+                                    struct lfsck_request *lr,
+                                    struct ptlrpc_request_set *set)
+{
+       struct ptlrpc_request   *req;
+       struct lfsck_request    *tmp;
+       int                      rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_LFSCK_NOTIFY);
+       if (req == NULL)
+               RETURN(-ENOMEM);
+
+       rc = ptlrpc_request_pack(req, LUSTRE_OBD_VERSION, LFSCK_NOTIFY);
+       if (rc != 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+
+       tmp = req_capsule_client_get(&req->rq_pill, &RMF_LFSCK_REQUEST);
+       *tmp = *lr;
+       ptlrpc_request_set_replen(req);
+       ptlrpc_set_add_req(set, req);
+
+       RETURN(0);
+}
+
+static int
+lfsck_layout_slave_query_master(const struct lu_env *env,
+                               struct lfsck_component *com)
+{
+       struct lfsck_request             *lr    = &lfsck_env_info(env)->lti_lr;
+       struct lfsck_instance            *lfsck = com->lc_lfsck;
+       struct lfsck_layout_slave_data   *llsd  = com->lc_data;
+       struct lfsck_layout_slave_target *llst;
+       struct obd_export                *exp;
+       struct ptlrpc_request_set        *set;
+       int                               cnt   = 0;
+       int                               rc    = 0;
+       int                               rc1   = 0;
+       ENTRY;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN(-ENOMEM);
+
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_event = LE_QUERY;
+       lr->lr_active = LT_LAYOUT;
+
+       llsd->llsd_touch_gen++;
+       spin_lock(&llsd->llsd_lock);
+       while (!list_empty(&llsd->llsd_master_list)) {
+               llst = list_entry(llsd->llsd_master_list.next,
+                                 struct lfsck_layout_slave_target,
+                                 llst_list);
+               if (llst->llst_gen == llsd->llsd_touch_gen)
+                       break;
+
+               llst->llst_gen = llsd->llsd_touch_gen;
+               list_del(&llst->llst_list);
+               list_add_tail(&llst->llst_list,
+                             &llsd->llsd_master_list);
+               atomic_inc(&llst->llst_ref);
+               spin_unlock(&llsd->llsd_lock);
+
+               exp = lustre_find_lwp_by_index(lfsck->li_obd->obd_name,
+                                              llst->llst_index);
+               if (exp == NULL) {
+                       lfsck_layout_llst_del(llsd, llst);
+                       lfsck_layout_llst_put(llst);
+                       spin_lock(&llsd->llsd_lock);
+                       continue;
+               }
+
+               rc = lfsck_layout_async_query(env, com, exp, llst, lr, set);
+               if (rc != 0) {
+                       CERROR("%s: slave fail to query %s for layout: "
+                              "rc = %d\n", lfsck_lfsck2name(lfsck),
+                              exp->exp_obd->obd_name, rc);
+                       rc1 = rc;
+                       lfsck_layout_llst_put(llst);
+                       class_export_put(exp);
+               } else {
+                       cnt++;
+               }
+               spin_lock(&llsd->llsd_lock);
+       }
+       spin_unlock(&llsd->llsd_lock);
+
+       if (cnt > 0)
+               rc = ptlrpc_set_wait(set);
+       ptlrpc_set_destroy(set);
+
+       RETURN(rc1 != 0 ? rc1 : rc);
+}
+
+static void
+lfsck_layout_slave_notify_master(const struct lu_env *env,
+                                struct lfsck_component *com,
+                                enum lfsck_events event, int result)
+{
+       struct lfsck_instance            *lfsck = com->lc_lfsck;
+       struct lfsck_layout_slave_data   *llsd  = com->lc_data;
+       struct lfsck_request             *lr    = &lfsck_env_info(env)->lti_lr;
+       struct lfsck_layout_slave_target *llst;
+       struct obd_export                *exp;
+       struct ptlrpc_request_set        *set;
+       int                               cnt   = 0;
+       int                               rc;
+       ENTRY;
+
+       set = ptlrpc_prep_set();
+       if (set == NULL)
+               RETURN_EXIT;
+
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_event = event;
+       lr->lr_flags = LEF_FROM_OST;
+       lr->lr_status = result;
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_active = LT_LAYOUT;
+       llsd->llsd_touch_gen++;
+       spin_lock(&llsd->llsd_lock);
+       while (!list_empty(&llsd->llsd_master_list)) {
+               llst = list_entry(llsd->llsd_master_list.next,
+                                 struct lfsck_layout_slave_target,
+                                 llst_list);
+               if (llst->llst_gen == llsd->llsd_touch_gen)
+                       break;
+
+               llst->llst_gen = llsd->llsd_touch_gen;
+               list_del(&llst->llst_list);
+               list_add_tail(&llst->llst_list,
+                             &llsd->llsd_master_list);
+               atomic_inc(&llst->llst_ref);
+               spin_unlock(&llsd->llsd_lock);
+
+               exp = lustre_find_lwp_by_index(lfsck->li_obd->obd_name,
+                                              llst->llst_index);
+               if (exp == NULL) {
+                       lfsck_layout_llst_del(llsd, llst);
+                       lfsck_layout_llst_put(llst);
+                       spin_lock(&llsd->llsd_lock);
+                       continue;
+               }
+
+               rc = lfsck_layout_async_notify(env, exp, lr, set);
+               if (rc != 0)
+                       CERROR("%s: slave fail to notify %s for layout: "
+                              "rc = %d\n", lfsck_lfsck2name(lfsck),
+                              exp->exp_obd->obd_name, rc);
+               else
+                       cnt++;
+               lfsck_layout_llst_put(llst);
+               class_export_put(exp);
+               spin_lock(&llsd->llsd_lock);
+       }
+       spin_unlock(&llsd->llsd_lock);
+
+       if (cnt > 0)
+               rc = ptlrpc_set_wait(set);
+
+       ptlrpc_set_destroy(set);
+
+       RETURN_EXIT;
 }
 
 /* layout APIs */
-/* XXX: Some to be implemented in other patch(es). */
 
 static int lfsck_layout_reset(const struct lu_env *env,
                              struct lfsck_component *com, bool init)
@@ -606,8 +1779,50 @@ static void lfsck_layout_fail(const struct lu_env *env,
        up_write(&com->lc_sem);
 }
 
-static int lfsck_layout_checkpoint(const struct lu_env *env,
-                                  struct lfsck_component *com, bool init)
+static int lfsck_layout_master_checkpoint(const struct lu_env *env,
+                                         struct lfsck_component *com, bool init)
+{
+       struct lfsck_instance           *lfsck   = com->lc_lfsck;
+       struct lfsck_layout             *lo      = com->lc_file_ram;
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct l_wait_info               lwi     = { 0 };
+       int                              rc;
+
+       if (com->lc_new_checked == 0 && !init)
+               return 0;
+
+       l_wait_event(mthread->t_ctl_waitq,
+                    list_empty(&llmd->llmd_req_list) ||
+                    !thread_is_running(mthread) ||
+                    thread_is_stopped(athread),
+                    &lwi);
+
+       if (!thread_is_running(mthread) || thread_is_stopped(athread))
+               return 0;
+
+       down_write(&com->lc_sem);
+       if (init) {
+               lo->ll_pos_latest_start = lfsck->li_pos_current.lp_oit_cookie;
+       } else {
+               lo->ll_pos_last_checkpoint =
+                                       lfsck->li_pos_current.lp_oit_cookie;
+               lo->ll_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
+                               HALF_SEC - lfsck->li_time_last_checkpoint);
+               lo->ll_time_last_checkpoint = cfs_time_current_sec();
+               lo->ll_objs_checked_phase1 += com->lc_new_checked;
+               com->lc_new_checked = 0;
+       }
+
+       rc = lfsck_layout_store(env, com);
+       up_write(&com->lc_sem);
+
+       return rc;
+}
+
+static int lfsck_layout_slave_checkpoint(const struct lu_env *env,
+                                        struct lfsck_component *com, bool init)
 {
        struct lfsck_instance   *lfsck = com->lc_lfsck;
        struct lfsck_layout     *lo    = com->lc_file_ram;
@@ -637,22 +1852,13 @@ static int lfsck_layout_checkpoint(const struct lu_env *env,
        return rc;
 }
 
-static int lfsck_layout_master_prep(const struct lu_env *env,
-                                   struct lfsck_component *com)
-{
-       return 0;
-}
-
-static int lfsck_layout_slave_prep(const struct lu_env *env,
-                                  struct lfsck_component *com)
+static int lfsck_layout_prep(const struct lu_env *env,
+                            struct lfsck_component *com)
 {
        struct lfsck_instance   *lfsck  = com->lc_lfsck;
        struct lfsck_layout     *lo     = com->lc_file_ram;
        struct lfsck_position   *pos    = &com->lc_pos_start;
 
-       /* XXX: For a new scanning, generate OST-objects
-        *      bitmap for orphan detection. */
-
        fid_zero(&pos->lp_dir_parent);
        pos->lp_dir_cookie = 0;
        if (lo->ll_status == LS_COMPLETED ||
@@ -707,10 +1913,92 @@ static int lfsck_layout_slave_prep(const struct lu_env *env,
        return 0;
 }
 
+static int lfsck_layout_slave_prep(const struct lu_env *env,
+                                  struct lfsck_component *com,
+                                  struct lfsck_start_param *lsp)
+{
+       struct lfsck_layout             *lo     = com->lc_file_ram;
+       struct lfsck_layout_slave_data  *llsd   = com->lc_data;
+       int                              rc;
+
+       /* XXX: For a new scanning, generate OST-objects
+        *      bitmap for orphan detection. */
+
+       rc = lfsck_layout_prep(env, com);
+       if (rc != 0 || lo->ll_status != LS_SCANNING_PHASE1 ||
+           !lsp->lsp_index_valid)
+               return rc;
+
+       rc = lfsck_layout_llst_add(llsd, lsp->lsp_index);
+
+       return rc;
+}
+
+static int lfsck_layout_master_prep(const struct lu_env *env,
+                                   struct lfsck_component *com,
+                                   struct lfsck_start_param *lsp)
+{
+       struct lfsck_instance           *lfsck   = com->lc_lfsck;
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct lfsck_thread_args        *lta;
+       long                             rc;
+       ENTRY;
+
+       rc = lfsck_layout_prep(env, com);
+       if (rc != 0)
+               RETURN(rc);
+
+       llmd->llmd_assistant_status = 0;
+       llmd->llmd_post_result = 0;
+       llmd->llmd_to_post = 0;
+       llmd->llmd_to_double_scan = 0;
+       llmd->llmd_in_double_scan = 0;
+       llmd->llmd_exit = 0;
+       thread_set_flags(athread, 0);
+
+       lta = lfsck_thread_args_init(lfsck, com, lsp);
+       if (IS_ERR(lta))
+               RETURN(PTR_ERR(lta));
+
+       rc = PTR_ERR(kthread_run(lfsck_layout_assistant, lta, "lfsck_layout"));
+       if (IS_ERR_VALUE(rc)) {
+               CERROR("%s: Cannot start LFSCK layout assistant thread: "
+                      "rc = %ld\n", lfsck_lfsck2name(lfsck), rc);
+               lfsck_thread_args_fini(lta);
+       } else {
+               struct l_wait_info lwi = { 0 };
+
+               l_wait_event(mthread->t_ctl_waitq,
+                            thread_is_running(athread) ||
+                            thread_is_stopped(athread),
+                            &lwi);
+               if (unlikely(!thread_is_running(athread)))
+                       rc = llmd->llmd_assistant_status;
+               else
+                       rc = 0;
+       }
+
+       RETURN(rc);
+}
+
 static int lfsck_layout_master_exec_oit(const struct lu_env *env,
                                        struct lfsck_component *com,
                                        struct dt_object *obj)
 {
+       /* XXX: To be implemented in other patches.
+        *
+        * For the given object, read its layout EA locally. For each stripe,
+        * pre-fetch the OST-object's attribute and generate an structure
+        * lfsck_layout_req on the list ::llmd_req_list.
+        *
+        * For each request on the ::llmd_req_list, the lfsck_layout_assistant
+        * thread will compare the OST side attribute with local attribute,
+        * if inconsistent, then repair it.
+        *
+        * All above processing is async mode with pipeline. */
+
        return 0;
 }
 
@@ -810,7 +2098,72 @@ static int lfsck_layout_master_post(const struct lu_env *env,
                                    struct lfsck_component *com,
                                    int result, bool init)
 {
-       return 0;
+       struct lfsck_instance           *lfsck   = com->lc_lfsck;
+       struct lfsck_layout             *lo      = com->lc_file_ram;
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct l_wait_info               lwi     = { 0 };
+       int                              rc;
+       ENTRY;
+
+
+       llmd->llmd_post_result = result;
+       llmd->llmd_to_post = 1;
+       if (llmd->llmd_post_result <= 0)
+               llmd->llmd_exit = 1;
+
+       wake_up_all(&athread->t_ctl_waitq);
+       l_wait_event(mthread->t_ctl_waitq,
+                    (result > 0 && list_empty(&llmd->llmd_req_list)) ||
+                    thread_is_stopped(athread),
+                    &lwi);
+
+       if (llmd->llmd_assistant_status < 0)
+               result = llmd->llmd_assistant_status;
+
+       down_write(&com->lc_sem);
+       spin_lock(&lfsck->li_lock);
+       /* When LFSCK failed, there may be some prefetched objects those are
+        * not been processed yet, we do not know the exactly position, then
+        * just restart from last check-point next time. */
+       if (!init && !llmd->llmd_exit)
+               lo->ll_pos_last_checkpoint =
+                                       lfsck->li_pos_current.lp_oit_cookie;
+
+       if (result > 0) {
+               lo->ll_status = LS_SCANNING_PHASE2;
+               lo->ll_flags |= LF_SCANNED_ONCE;
+               lo->ll_flags &= ~LF_UPGRADE;
+               list_del_init(&com->lc_link);
+               list_add_tail(&com->lc_link, &lfsck->li_list_double_scan);
+       } else if (result == 0) {
+               lo->ll_status = lfsck->li_status;
+               if (lo->ll_status == 0)
+                       lo->ll_status = LS_STOPPED;
+               if (lo->ll_status != LS_PAUSED) {
+                       list_del_init(&com->lc_link);
+                       list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               }
+       } else {
+               lo->ll_status = LS_FAILED;
+               list_del_init(&com->lc_link);
+               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+       }
+       spin_unlock(&lfsck->li_lock);
+
+       if (!init) {
+               lo->ll_run_time_phase1 += cfs_duration_sec(cfs_time_current() +
+                               HALF_SEC - lfsck->li_time_last_checkpoint);
+               lo->ll_time_last_checkpoint = cfs_time_current_sec();
+               lo->ll_objs_checked_phase1 += com->lc_new_checked;
+               com->lc_new_checked = 0;
+       }
+
+       rc = lfsck_layout_store(env, com);
+       up_write(&com->lc_sem);
+
+       RETURN(rc);
 }
 
 static int lfsck_layout_slave_post(const struct lu_env *env,
@@ -845,10 +2198,10 @@ static int lfsck_layout_slave_post(const struct lu_env *env,
                list_del_init(&com->lc_link);
                list_add_tail(&com->lc_link, &lfsck->li_list_double_scan);
        } else if (result == 0) {
-               if (lfsck->li_paused) {
-                       lo->ll_status = LS_PAUSED;
-               } else {
+               lo->ll_status = lfsck->li_status;
+               if (lo->ll_status == 0)
                        lo->ll_status = LS_STOPPED;
+               if (lo->ll_status != LS_PAUSED) {
                        list_del_init(&com->lc_link);
                        list_add_tail(&com->lc_link, &lfsck->li_list_idle);
                }
@@ -875,6 +2228,8 @@ static int lfsck_layout_slave_post(const struct lu_env *env,
 
        up_write(&com->lc_sem);
 
+       lfsck_layout_slave_notify_master(env, com, LE_PHASE1_DONE, result);
+
        return rc;
 }
 
@@ -1062,23 +2417,41 @@ out:
 static int lfsck_layout_master_double_scan(const struct lu_env *env,
                                           struct lfsck_component *com)
 {
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct lfsck_layout             *lo      = com->lc_file_ram;
+       struct l_wait_info               lwi     = { 0 };
+
+       if (unlikely(lo->ll_status != LS_SCANNING_PHASE2))
+               return 0;
+
+       llmd->llmd_to_double_scan = 1;
+       wake_up_all(&athread->t_ctl_waitq);
+       l_wait_event(mthread->t_ctl_waitq,
+                    llmd->llmd_in_double_scan ||
+                    thread_is_stopped(athread),
+                    &lwi);
+       if (llmd->llmd_assistant_status < 0)
+               return llmd->llmd_assistant_status;
+
        return 0;
 }
 
 static int lfsck_layout_slave_double_scan(const struct lu_env *env,
                                          struct lfsck_component *com)
 {
-       struct lfsck_instance   *lfsck = com->lc_lfsck;
-       struct lfsck_bookmark   *bk    = &lfsck->li_bookmark_ram;
-       struct lfsck_layout     *lo    = com->lc_file_ram;
-       int                      rc    = 1;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_layout_slave_data  *llsd   = com->lc_data;
+       struct lfsck_layout             *lo     = com->lc_file_ram;
+       struct ptlrpc_thread            *thread = &lfsck->li_thread;
+       int                              rc;
+       ENTRY;
 
-       down_write(&com->lc_sem);
+       if (unlikely(lo->ll_status != LS_SCANNING_PHASE2))
+               RETURN(0);
 
-       lo->ll_run_time_phase2 += cfs_duration_sec(cfs_time_current() +
-                               HALF_SEC - lfsck->li_time_last_checkpoint);
-       lo->ll_time_last_checkpoint = cfs_time_current_sec();
-       lo->ll_objs_checked_phase2 += com->lc_new_checked;
+       atomic_inc(&lfsck->li_double_scan_count);
 
        com->lc_new_checked = 0;
        com->lc_new_scanned = 0;
@@ -1086,35 +2459,41 @@ static int lfsck_layout_slave_double_scan(const struct lu_env *env,
        com->lc_time_next_checkpoint = com->lc_time_last_checkpoint +
                                cfs_time_seconds(LFSCK_CHECKPOINT_INTERVAL);
 
-       if (rc > 0) {
-               com->lc_journal = 0;
-               if (lo->ll_flags & LF_INCOMPLETE)
-                       lo->ll_status = LS_PARTIAL;
-               else
-                       lo->ll_status = LS_COMPLETED;
-               if (!(bk->lb_param & LPF_DRYRUN))
-                       lo->ll_flags &= ~(LF_SCANNED_ONCE | LF_INCONSISTENT);
-               lo->ll_time_last_complete = lo->ll_time_last_checkpoint;
-               lo->ll_success_count++;
-       } else if (rc == 0) {
-               if (lfsck->li_paused)
-                       lo->ll_status = LS_PAUSED;
-               else
-                       lo->ll_status = LS_STOPPED;
-       } else {
-               lo->ll_status = LS_FAILED;
-       }
+       while (1) {
+               struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(30),
+                                                    NULL, NULL);
 
-       if (lo->ll_status != LS_PAUSED) {
-               spin_lock(&lfsck->li_lock);
-               list_del_init(&com->lc_link);
-               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
-               spin_unlock(&lfsck->li_lock);
+               rc = lfsck_layout_slave_query_master(env, com);
+               if (list_empty(&llsd->llsd_master_list)) {
+                       if (unlikely(!thread_is_running(thread)))
+                               rc = 0;
+                       else
+                               rc = 1;
+
+                       GOTO(done, rc);
+               }
+
+               if (rc < 0)
+                       GOTO(done, rc);
+
+               rc = l_wait_event(thread->t_ctl_waitq,
+                                 !thread_is_running(thread) ||
+                                 list_empty(&llsd->llsd_master_list),
+                                 &lwi);
+               if (unlikely(!thread_is_running(thread)))
+                       GOTO(done, rc = 0);
+
+               if (rc == -ETIMEDOUT)
+                       continue;
+
+               GOTO(done, rc = (rc < 0 ? rc : 1));
        }
 
-       rc = lfsck_layout_store(env, com);
+done:
+       rc = lfsck_layout_double_scan_result(env, com, rc);
 
-       up_write(&com->lc_sem);
+       if (atomic_dec_and_test(&lfsck->li_double_scan_count))
+               wake_up_all(&lfsck->li_thread.t_ctl_waitq);
 
        return rc;
 }
@@ -1122,14 +2501,58 @@ static int lfsck_layout_slave_double_scan(const struct lu_env *env,
 static void lfsck_layout_master_data_release(const struct lu_env *env,
                                             struct lfsck_component *com)
 {
+       struct lfsck_layout_master_data *llmd   = com->lc_data;
+       struct lfsck_instance           *lfsck  = com->lc_lfsck;
+       struct lfsck_tgt_descs          *ltds;
+       struct lfsck_tgt_desc           *ltd;
+       struct lfsck_tgt_desc           *next;
+
+       LASSERT(llmd != NULL);
+       LASSERT(thread_is_init(&llmd->llmd_thread) ||
+               thread_is_stopped(&llmd->llmd_thread));
+       LASSERT(list_empty(&llmd->llmd_req_list));
+
+       com->lc_data = NULL;
+
+       ltds = &lfsck->li_ost_descs;
+       spin_lock(&ltds->ltd_lock);
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_ost_phase1_list,
+                                ltd_layout_phase_list) {
+               list_del_init(&ltd->ltd_layout_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_ost_phase2_list,
+                                ltd_layout_phase_list) {
+               list_del_init(&ltd->ltd_layout_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_ost_list,
+                                ltd_layout_list) {
+               list_del_init(&ltd->ltd_layout_list);
+       }
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_mdt_phase1_list,
+                                ltd_layout_phase_list) {
+               list_del_init(&ltd->ltd_layout_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_mdt_phase2_list,
+                                ltd_layout_phase_list) {
+               list_del_init(&ltd->ltd_layout_phase_list);
+       }
+       list_for_each_entry_safe(ltd, next, &llmd->llmd_mdt_list,
+                                ltd_layout_list) {
+               list_del_init(&ltd->ltd_layout_list);
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       OBD_FREE_PTR(llmd);
 }
 
 static void lfsck_layout_slave_data_release(const struct lu_env *env,
                                            struct lfsck_component *com)
 {
-       struct lfsck_layout_slave_data  *llsd   = com->lc_data;
-       struct lfsck_layout_seq         *lls;
-       struct lfsck_layout_seq         *next;
+       struct lfsck_layout_slave_data   *llsd  = com->lc_data;
+       struct lfsck_layout_seq          *lls;
+       struct lfsck_layout_seq          *next;
+       struct lfsck_layout_slave_target *llst;
+       struct lfsck_layout_slave_target *tmp;
 
        LASSERT(llsd != NULL);
 
@@ -1142,13 +2565,241 @@ static void lfsck_layout_slave_data_release(const struct lu_env *env,
                OBD_FREE_PTR(lls);
        }
 
+       list_for_each_entry_safe(llst, tmp, &llsd->llsd_master_list,
+                                llst_list) {
+               list_del_init(&llst->llst_list);
+               OBD_FREE_PTR(llst);
+       }
+
        OBD_FREE_PTR(llsd);
 }
 
+static void lfsck_layout_master_quit(const struct lu_env *env,
+                                    struct lfsck_component *com)
+{
+       struct lfsck_layout_master_data *llmd    = com->lc_data;
+       struct ptlrpc_thread            *mthread = &com->lc_lfsck->li_thread;
+       struct ptlrpc_thread            *athread = &llmd->llmd_thread;
+       struct l_wait_info               lwi     = { 0 };
+
+       llmd->llmd_exit = 1;
+       wake_up_all(&athread->t_ctl_waitq);
+       l_wait_event(mthread->t_ctl_waitq,
+                    thread_is_init(athread) ||
+                    thread_is_stopped(athread),
+                    &lwi);
+}
+
+static int lfsck_layout_master_in_notify(const struct lu_env *env,
+                                        struct lfsck_component *com,
+                                        struct lfsck_request *lr)
+{
+       struct lfsck_instance           *lfsck = com->lc_lfsck;
+       struct lfsck_layout             *lo    = com->lc_file_ram;
+       struct lfsck_layout_master_data *llmd  = com->lc_data;
+       struct lfsck_tgt_descs          *ltds;
+       struct lfsck_tgt_desc           *ltd;
+       ENTRY;
+
+       if (lr->lr_event != LE_PHASE1_DONE &&
+           lr->lr_event != LE_PHASE2_DONE &&
+           lr->lr_event != LE_STOP)
+               RETURN(-EINVAL);
+
+       if (lr->lr_flags & LEF_FROM_OST)
+               ltds = &lfsck->li_ost_descs;
+       else
+               ltds = &lfsck->li_mdt_descs;
+       spin_lock(&ltds->ltd_lock);
+       ltd = LTD_TGT(ltds, lr->lr_index);
+       if (ltd == NULL) {
+               spin_unlock(&ltds->ltd_lock);
+
+               RETURN(-ENODEV);
+       }
+
+       list_del_init(&ltd->ltd_layout_phase_list);
+       switch (lr->lr_event) {
+       case LE_PHASE1_DONE:
+               if (lr->lr_status <= 0) {
+                       ltd->ltd_layout_done = 1;
+                       list_del_init(&ltd->ltd_layout_list);
+                       lo->ll_flags |= LF_INCOMPLETE;
+                       break;
+               }
+
+               if (lr->lr_flags & LEF_FROM_OST) {
+                       if (list_empty(&ltd->ltd_layout_list))
+                               list_add_tail(&ltd->ltd_layout_list,
+                                             &llmd->llmd_ost_list);
+                       list_add_tail(&ltd->ltd_layout_phase_list,
+                                     &llmd->llmd_ost_phase2_list);
+               } else {
+                       if (list_empty(&ltd->ltd_layout_list))
+                               list_add_tail(&ltd->ltd_layout_list,
+                                             &llmd->llmd_mdt_list);
+                       list_add_tail(&ltd->ltd_layout_phase_list,
+                                     &llmd->llmd_mdt_phase2_list);
+               }
+               break;
+       case LE_PHASE2_DONE:
+               ltd->ltd_layout_done = 1;
+               list_del_init(&ltd->ltd_layout_list);
+               break;
+       case LE_STOP:
+               ltd->ltd_layout_done = 1;
+               list_del_init(&ltd->ltd_layout_list);
+               if (!(lr->lr_flags & LEF_FORCE_STOP))
+                       lo->ll_flags |= LF_INCOMPLETE;
+               break;
+       default:
+               break;
+       }
+       spin_unlock(&ltds->ltd_lock);
+
+       if (lr->lr_flags & LEF_FORCE_STOP) {
+               struct lfsck_stop *stop = &lfsck_env_info(env)->lti_stop;
+
+               memset(stop, 0, sizeof(*stop));
+               stop->ls_status = lr->lr_status;
+               stop->ls_flags = lr->lr_param;
+               lfsck_stop(env, lfsck->li_bottom, stop);
+       } else if (lfsck_layout_master_to_orphan(llmd)) {
+               wake_up_all(&llmd->llmd_thread.t_ctl_waitq);
+       }
+
+       RETURN(0);
+}
+
+static int lfsck_layout_slave_in_notify(const struct lu_env *env,
+                                       struct lfsck_component *com,
+                                       struct lfsck_request *lr)
+{
+       struct lfsck_instance            *lfsck = com->lc_lfsck;
+       struct lfsck_layout_slave_data   *llsd  = com->lc_data;
+       struct lfsck_layout_slave_target *llst;
+       ENTRY;
+
+       if (lr->lr_event != LE_PHASE2_DONE &&
+           lr->lr_event != LE_STOP)
+               RETURN(-EINVAL);
+
+       llst = lfsck_layout_llst_find_and_del(llsd, lr->lr_index);
+       if (llst == NULL)
+               RETURN(-ENODEV);
+
+       lfsck_layout_llst_put(llst);
+       if (list_empty(&llsd->llsd_master_list)) {
+               switch (lr->lr_event) {
+               case LE_PHASE2_DONE:
+                       wake_up_all(&lfsck->li_thread.t_ctl_waitq);
+                       break;
+               case LE_STOP: {
+                       struct lfsck_stop *stop = &lfsck_env_info(env)->lti_stop;
+
+                       memset(stop, 0, sizeof(*stop));
+                       stop->ls_status = lr->lr_status;
+                       stop->ls_flags = lr->lr_param;
+                       lfsck_stop(env, lfsck->li_bottom, stop);
+                       break;
+               }
+               default:
+                       break;
+               }
+       }
+
+       RETURN(0);
+}
+
+static int lfsck_layout_query(const struct lu_env *env,
+                             struct lfsck_component *com)
+{
+       struct lfsck_layout *lo = com->lc_file_ram;
+
+       return lo->ll_status;
+}
+
+static int lfsck_layout_master_stop_notify(const struct lu_env *env,
+                                          struct lfsck_component *com,
+                                          struct lfsck_tgt_descs *ltds,
+                                          struct lfsck_tgt_desc *ltd,
+                                          struct ptlrpc_request_set *set)
+{
+       struct lfsck_thread_info          *info  = lfsck_env_info(env);
+       struct lfsck_async_interpret_args *laia  = &info->lti_laia;
+       struct lfsck_request              *lr    = &info->lti_lr;
+       struct lfsck_instance             *lfsck = com->lc_lfsck;
+       int                                rc;
+
+       LASSERT(list_empty(&ltd->ltd_layout_list));
+       LASSERT(list_empty(&ltd->ltd_layout_phase_list));
+
+       memset(lr, 0, sizeof(*lr));
+       lr->lr_index = lfsck_dev_idx(lfsck->li_bottom);
+       lr->lr_event = LE_STOP;
+       lr->lr_active = LT_LAYOUT;
+       if (ltds == &lfsck->li_ost_descs) {
+               lr->lr_flags = LEF_TO_OST;
+       } else {
+               if (ltd->ltd_index == lfsck_dev_idx(lfsck->li_bottom))
+                       return 0;
+
+               lr->lr_flags = 0;
+       }
+       lr->lr_status = LS_CO_STOPPED;
+
+       laia->laia_com = com;
+       laia->laia_ltds = ltds;
+       laia->laia_ltd = ltd;
+       laia->laia_lr = lr;
+
+       rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
+                                lfsck_layout_master_async_interpret,
+                                laia, LFSCK_NOTIFY);
+       if (rc != 0)
+               CERROR("%s: Fail to notify %s %x for co-stop: rc = %d\n",
+                      lfsck_lfsck2name(lfsck),
+                      (lr->lr_flags & LEF_TO_OST) ? "OST" : "MDT",
+                      ltd->ltd_index, rc);
+
+       return rc;
+}
+
+/* with lfsck::li_lock held */
+static int lfsck_layout_slave_join(const struct lu_env *env,
+                                  struct lfsck_component *com,
+                                  struct lfsck_start_param *lsp)
+{
+       struct lfsck_instance            *lfsck = com->lc_lfsck;
+       struct lfsck_layout_slave_data   *llsd  = com->lc_data;
+       struct lfsck_layout_slave_target *llst;
+       struct lfsck_start               *start = lsp->lsp_start;
+       int                               rc    = 0;
+       ENTRY;
+
+       if (!lsp->lsp_index_valid || start == NULL ||
+           !(start->ls_flags & LPF_ALL_MDT))
+               RETURN(-EALREADY);
+
+       spin_unlock(&lfsck->li_lock);
+       rc = lfsck_layout_llst_add(llsd, lsp->lsp_index);
+       spin_lock(&lfsck->li_lock);
+       if (rc == 0 && !thread_is_running(&lfsck->li_thread)) {
+               spin_unlock(&lfsck->li_lock);
+               llst = lfsck_layout_llst_find_and_del(llsd, lsp->lsp_index);
+               if (llst != NULL)
+                       lfsck_layout_llst_put(llst);
+               spin_lock(&lfsck->li_lock);
+               rc = -EAGAIN;
+       }
+
+       RETURN(rc);
+}
+
 static struct lfsck_operations lfsck_layout_master_ops = {
        .lfsck_reset            = lfsck_layout_reset,
        .lfsck_fail             = lfsck_layout_fail,
-       .lfsck_checkpoint       = lfsck_layout_checkpoint,
+       .lfsck_checkpoint       = lfsck_layout_master_checkpoint,
        .lfsck_prep             = lfsck_layout_master_prep,
        .lfsck_exec_oit         = lfsck_layout_master_exec_oit,
        .lfsck_exec_dir         = lfsck_layout_exec_dir,
@@ -1156,12 +2807,16 @@ static struct lfsck_operations lfsck_layout_master_ops = {
        .lfsck_dump             = lfsck_layout_dump,
        .lfsck_double_scan      = lfsck_layout_master_double_scan,
        .lfsck_data_release     = lfsck_layout_master_data_release,
+       .lfsck_quit             = lfsck_layout_master_quit,
+       .lfsck_in_notify        = lfsck_layout_master_in_notify,
+       .lfsck_query            = lfsck_layout_query,
+       .lfsck_stop_notify      = lfsck_layout_master_stop_notify,
 };
 
 static struct lfsck_operations lfsck_layout_slave_ops = {
        .lfsck_reset            = lfsck_layout_reset,
        .lfsck_fail             = lfsck_layout_fail,
-       .lfsck_checkpoint       = lfsck_layout_checkpoint,
+       .lfsck_checkpoint       = lfsck_layout_slave_checkpoint,
        .lfsck_prep             = lfsck_layout_slave_prep,
        .lfsck_exec_oit         = lfsck_layout_slave_exec_oit,
        .lfsck_exec_dir         = lfsck_layout_exec_dir,
@@ -1169,6 +2824,9 @@ static struct lfsck_operations lfsck_layout_slave_ops = {
        .lfsck_dump             = lfsck_layout_dump,
        .lfsck_double_scan      = lfsck_layout_slave_double_scan,
        .lfsck_data_release     = lfsck_layout_slave_data_release,
+       .lfsck_in_notify        = lfsck_layout_slave_in_notify,
+       .lfsck_query            = lfsck_layout_query,
+       .lfsck_join             = lfsck_layout_slave_join,
 };
 
 int lfsck_layout_setup(const struct lu_env *env, struct lfsck_instance *lfsck)
@@ -1191,7 +2849,23 @@ int lfsck_layout_setup(const struct lu_env *env, struct lfsck_instance *lfsck)
        com->lc_lfsck = lfsck;
        com->lc_type = LT_LAYOUT;
        if (lfsck->li_master) {
+               struct lfsck_layout_master_data *llmd;
+
                com->lc_ops = &lfsck_layout_master_ops;
+               OBD_ALLOC_PTR(llmd);
+               if (llmd == NULL)
+                       GOTO(out, rc = -ENOMEM);
+
+               INIT_LIST_HEAD(&llmd->llmd_req_list);
+               spin_lock_init(&llmd->llmd_lock);
+               INIT_LIST_HEAD(&llmd->llmd_ost_list);
+               INIT_LIST_HEAD(&llmd->llmd_ost_phase1_list);
+               INIT_LIST_HEAD(&llmd->llmd_ost_phase2_list);
+               INIT_LIST_HEAD(&llmd->llmd_mdt_list);
+               INIT_LIST_HEAD(&llmd->llmd_mdt_phase1_list);
+               INIT_LIST_HEAD(&llmd->llmd_mdt_phase2_list);
+               init_waitqueue_head(&llmd->llmd_thread.t_ctl_waitq);
+               com->lc_data = llmd;
        } else {
                struct lfsck_layout_slave_data *llsd;
 
@@ -1201,6 +2875,8 @@ int lfsck_layout_setup(const struct lu_env *env, struct lfsck_instance *lfsck)
                        GOTO(out, rc = -ENOMEM);
 
                INIT_LIST_HEAD(&llsd->llsd_seq_list);
+               INIT_LIST_HEAD(&llsd->llsd_master_list);
+               spin_lock_init(&llsd->llsd_lock);
                com->lc_data = llsd;
        }
        com->lc_file_size = sizeof(*lo);
@@ -1260,6 +2936,9 @@ int lfsck_layout_setup(const struct lu_env *env, struct lfsck_instance *lfsck)
                /* fall through */
        case LS_PAUSED:
        case LS_CRASHED:
+       case LS_CO_FAILED:
+       case LS_CO_STOPPED:
+       case LS_CO_PAUSED:
                spin_lock(&lfsck->li_lock);
                list_add_tail(&com->lc_link, &lfsck->li_list_scan);
                spin_unlock(&lfsck->li_lock);