Whamcloud - gitweb
LU-8929 lfsck: dumper gets current position properly
[fs/lustre-release.git] / lustre / lfsck / lfsck_internal.h
index 1f23337..42dfea6 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_internal.h
@@ -47,7 +47,7 @@
 #include <md_object.h>
 #include <lustre_linkea.h>
 
-#define HALF_SEC                       (HZ >> 1)
+#define HALF_SEC                       msecs_to_jiffies(MSEC_PER_SEC >> 1)
 #define LFSCK_CHECKPOINT_INTERVAL      60
 
 enum lfsck_flags {
@@ -111,7 +111,6 @@ struct lfsck_bookmark {
 enum lfsck_namespace_trace_flags {
        LNTF_CHECK_LINKEA       = 0x01,
        LNTF_CHECK_PARENT       = 0x02,
-       LNTF_SKIP_NLINK         = 0x04,
        LNTF_CHECK_ORPHAN       = 0x08,
        LNTF_UNCERTAIN_LMV      = 0x10,
        LNTF_RECHECK_NAME_HASH  = 0x20,
@@ -274,9 +273,14 @@ struct lfsck_namespace {
         * the MDTs that contain non-verified MDT-objects. */
        __u32   ln_bitmap_size;
 
-       __u32   ln_reserved_1;
+       /* Time for the latest LFSCK scan in seconds from the beginning. */
+       __u32   ln_time_latest_reset;
+
+       /* How many linkEA overflow timestamp have been cleared. */
+       __u64   ln_linkea_overflow_cleared;
+
        /* For further using. 256-bytes aligned now. */
-       __u64   ln_reserved[15];
+       __u64   ln_reserved[14];
 };
 
 enum lfsck_layout_inconsistency_type {
@@ -353,13 +357,26 @@ struct lfsck_layout {
 
        /* For further using. 256-bytes aligned now. */
        __u32   ll_reserved_1;
-       __u64   ll_reserved_2[11];
+
+       /* The latest object has been processed (failed) during double scan. */
+       struct lu_fid   ll_fid_latest_scanned_phase2;
+
+       __u64   ll_reserved_2[9];
 
        /* The OST targets bitmap to record the OSTs that contain
         * non-verified OST-objects. */
        __u8    ll_ost_bitmap[0];
 };
 
+struct lfsck_assistant_object {
+       struct lu_fid           lso_fid;
+       __u64                   lso_oit_cookie;
+       struct lu_attr          lso_attr;
+       atomic_t                lso_ref;
+       unsigned int            lso_dead:1,
+                               lso_is_dir:1;
+};
+
 struct lfsck_component;
 struct lfsck_tgt_descs;
 struct lfsck_tgt_desc;
@@ -393,6 +410,7 @@ struct lfsck_operations {
 
        int (*lfsck_exec_dir)(const struct lu_env *env,
                              struct lfsck_component *com,
+                             struct lfsck_assistant_object *lso,
                              struct lu_dirent *ent,
                              __u16 type);
 
@@ -401,9 +419,9 @@ struct lfsck_operations {
                          int result,
                          bool init);
 
-       int (*lfsck_dump)(const struct lu_env *env,
-                         struct lfsck_component *com,
-                         struct seq_file *m);
+       void (*lfsck_dump)(const struct lu_env *env,
+                          struct lfsck_component *com,
+                          struct seq_file *m);
 
        int (*lfsck_double_scan)(const struct lu_env *env,
                                 struct lfsck_component *com);
@@ -420,7 +438,10 @@ struct lfsck_operations {
                               struct thandle *th);
 
        int (*lfsck_query)(const struct lu_env *env,
-                          struct lfsck_component *com);
+                          struct lfsck_component *com,
+                          struct lfsck_request *req,
+                          struct lfsck_reply *rep,
+                          struct lfsck_query *que, int idx);
 
        int (*lfsck_join)(const struct lu_env *env,
                          struct lfsck_component *com,
@@ -439,6 +460,10 @@ struct lfsck_tgt_desc {
        struct list_head   ltd_layout_phase_list;
        struct list_head   ltd_namespace_list;
        struct list_head   ltd_namespace_phase_list;
+       __u32              ltd_layout_status;
+       __u32              ltd_namespace_status;
+       __u64              ltd_layout_repaired;
+       __u64              ltd_namespace_repaired;
        atomic_t           ltd_ref;
        __u32              ltd_index;
        __u32              ltd_layout_gen;
@@ -446,7 +471,7 @@ struct lfsck_tgt_desc {
        unsigned int       ltd_dead:1,
                           ltd_layout_done:1,
                           ltd_namespace_done:1,
-                          ltd_namespace_failed:1;
+                          ltd_synced_failures:1;
 };
 
 struct lfsck_tgt_desc_idx {
@@ -458,7 +483,7 @@ struct lfsck_tgt_descs {
        struct lfsck_tgt_desc_idx       *ltd_tgts_idx[TGT_PTRS];
 
        /* bitmap of TGTs available */
-       cfs_bitmap_t                    *ltd_tgts_bitmap;
+       struct cfs_bitmap                       *ltd_tgts_bitmap;
 
        /* for lfsck_tgt_desc::ltd_xxx_list */
        spinlock_t                       ltd_lock;
@@ -473,12 +498,39 @@ struct lfsck_tgt_descs {
        __u32                            ltd_tgtnr;
 };
 
-#define LTD_TGT(ltd, index)    \
-       ((ltd)->ltd_tgts_idx[(index) / TGT_PTRS_PER_BLOCK]->\
-        ldi_tgts[(index) % TGT_PTRS_PER_BLOCK])
+static inline struct lfsck_tgt_desc *
+lfsck_ltd2tgt(struct lfsck_tgt_descs *ltd, __u32 index)
+{
+       __u32 idx1 = index / TGT_PTRS_PER_BLOCK;
+       __u32 idx2 = index % TGT_PTRS_PER_BLOCK;
+       struct lfsck_tgt_desc *__tgt = NULL;
 
-#define OST_TGT(lfsck, index)   LTD_TGT(&lfsck->li_ost_descs, index)
-#define MDT_TGT(lfsck, index)   LTD_TGT(&lfsck->li_mdt_descs, index)
+       if (unlikely(idx1 >= TGT_PTRS))
+               CDEBUG(D_LFSCK, "The target idx %u is invalid.\n", index);
+       else if (likely(ltd->ltd_tgts_idx[idx1] != NULL))
+               __tgt = ltd->ltd_tgts_idx[idx1]->ldi_tgts[idx2];
+
+       return __tgt;
+}
+
+static inline void lfsck_assign_tgt(struct lfsck_tgt_descs *ltd,
+                                   struct lfsck_tgt_desc *tgt, __u32 index)
+{
+       __u32 idx1 = index / TGT_PTRS_PER_BLOCK;
+       __u32 idx2 = index % TGT_PTRS_PER_BLOCK;
+
+       if (likely(idx1 < TGT_PTRS && ltd->ltd_tgts_idx[idx1] != NULL))
+               ltd->ltd_tgts_idx[idx1]->ldi_tgts[idx2] = tgt;
+}
+
+#define LFSCK_STF_BITS 4
+/* If want to adjust the LFSCK_STF_COUNT, please change LFSCK_STF_BITS. */
+#define LFSCK_STF_COUNT        (1 << LFSCK_STF_BITS)
+
+struct lfsck_sub_trace_obj {
+       struct dt_object        *lsto_obj;
+       struct mutex             lsto_mutex;
+};
 
 struct lfsck_component {
        /* into lfsck_instance::li_list_(scan,double_scan,idle} */
@@ -493,6 +545,7 @@ struct lfsck_component {
        struct lfsck_position    lc_pos_start;
        struct lfsck_instance   *lc_lfsck;
        struct dt_object        *lc_obj;
+       struct lfsck_sub_trace_obj lc_sub_trace_objs[LFSCK_STF_COUNT];
        struct lfsck_operations *lc_ops;
        void                    *lc_file_ram;
        void                    *lc_file_disk;
@@ -519,6 +572,23 @@ struct lfsck_component {
 #define LFSCK_LMV_MAX_STRIPES  LMV_MAX_STRIPE_COUNT
 #define LFSCK_LMV_DEF_STRIPES  4
 
+/* Warning: NOT change the lfsck_slave_lmv_flags members order,
+ *         otherwise the lfsck_record_lmv() may be wrong. */
+enum lfsck_slave_lmv_flags {
+       LSLF_NONE       = 0,
+       LSLF_BAD_INDEX2 = 1,
+       LSLF_NO_LMVEA   = 2,
+       LSLF_DANGLING   = 3,
+       LSLF_BAD_INDEX1 = 4,
+};
+
+/* When the namespace LFSCK scans a striped directory, it will record all
+ * the known shards' information in the structure "lfsck_slave_lmv_rec",
+ * including the shard's FID, index, slave LMV EA, and so on. Each shard
+ * will take one lfsck_slave_lmv_rec slot. After the 1st cycle scanning
+ * the striped directory, the LFSCK will get all the information about
+ * whether there are some inconsistency, and then it can repair them in
+ * the 2nd cycle scanning. */
 struct lfsck_slave_lmv_rec {
        struct lu_fid   lslr_fid;
        __u32           lslr_stripe_count;
@@ -543,9 +613,31 @@ struct lfsck_lmv {
                                         ll_inline:1,
                                         ll_failed:1,
                                         ll_ignore:1;
-       struct lfsck_slave_lmv_rec      *ll_lslr;
+       struct lfsck_slave_lmv_rec      *ll_lslr; /* may be vmalloc'd */
+};
+
+/* If the namespace LFSCK finds that the master MDT-object of a striped
+ * directory lost its master LMV EA, it will re-generate the master LMV
+ * EA and notify the LFSCK instance on the MDT on which the striped dir
+ * master MDT-object resides to rescan the striped directory. To do that,
+ * the notify handler will insert a "lfsck_lmv_unit" structure into the
+ * lfsck::li_list_lmv. The LFSCK instance will scan such list from time
+ * to time to check whether needs to rescan some stirped directories. */
+struct lfsck_lmv_unit {
+       struct list_head         llu_link;
+       struct lfsck_lmv         llu_lmv;
+       struct dt_object        *llu_obj;
+       struct lfsck_instance   *llu_lfsck;
 };
 
+struct lfsck_rec_lmv_save {
+       struct lu_fid           lrls_fid;
+       struct lmv_mds_md_v1    lrls_lmv;
+};
+
+/* Allow lfsck_record_lmv() to be called recursively at most three times. */
+#define LFSCK_REC_LMV_MAX_DEPTH 3
+
 struct lfsck_instance {
        struct mutex              li_mutex;
        spinlock_t                li_lock;
@@ -567,6 +659,9 @@ struct lfsck_instance {
        /* For the components those are not scanning now. */
        struct list_head          li_list_idle;
 
+       /* For the lfsck_lmv_unit to be handled. */
+       struct list_head          li_list_lmv;
+
        atomic_t                  li_ref;
        atomic_t                  li_double_scan_count;
        struct ptlrpc_thread      li_thread;
@@ -586,8 +681,10 @@ struct lfsck_instance {
        struct local_oid_storage *li_los;
        struct lu_fid             li_local_root_fid;  /* backend root "/" */
        struct lu_fid             li_global_root_fid; /* /ROOT */
+       struct dt_object         *li_lfsck_dir;
        struct dt_object         *li_bookmark_obj;
        struct dt_object         *li_lpf_obj;
+       struct dt_object         *li_lpf_root_obj;
        struct lu_client_seq     *li_seq;
        struct lfsck_bookmark     li_bookmark_ram;
        struct lfsck_bookmark     li_bookmark_disk;
@@ -643,6 +740,7 @@ struct lfsck_instance {
                                  li_master:1, /* Master instance or not. */
                                  li_current_oit_processed:1,
                                  li_start_unplug:1;
+       struct lfsck_rec_lmv_save li_rec_lmv_save[LFSCK_REC_LMV_MAX_DEPTH];
 };
 
 struct lfsck_async_interpret_args {
@@ -663,15 +761,14 @@ struct lfsck_thread_args {
 };
 
 struct lfsck_assistant_req {
-       struct list_head        lar_list;
+       struct list_head                 lar_list;
+       struct lfsck_assistant_object   *lar_parent;
 };
 
 struct lfsck_namespace_req {
        struct lfsck_assistant_req       lnr_lar;
-       struct dt_object                *lnr_obj;
        struct lfsck_lmv                *lnr_lmv;
        struct lu_fid                    lnr_fid;
-       __u64                            lnr_oit_cookie;
        __u64                            lnr_dir_cookie;
        __u32                            lnr_attr;
        __u32                            lnr_size;
@@ -680,6 +777,13 @@ struct lfsck_namespace_req {
        char                             lnr_name[0];
 };
 
+struct lfsck_layout_req {
+       struct lfsck_assistant_req       llr_lar;
+       struct dt_object                *llr_child;
+       __u32                            llr_ost_idx;
+       __u32                            llr_lov_idx; /* offset in LOV EA */
+};
+
 struct lfsck_assistant_operations {
        int (*la_handler_p1)(const struct lu_env *env,
                             struct lfsck_component *com,
@@ -714,7 +818,7 @@ struct lfsck_assistant_data {
        /* list for the ost targets in phase1 scanning. */
        struct list_head                         lad_ost_phase1_list;
 
-       /* list for the ost targets in phase1 scanning. */
+       /* list for the ost targets in phase2 scanning. */
        struct list_head                         lad_ost_phase2_list;
 
        /* list for the mdt targets involve LFSCK. */
@@ -723,15 +827,16 @@ struct lfsck_assistant_data {
        /* list for the mdt targets in phase1 scanning. */
        struct list_head                         lad_mdt_phase1_list;
 
-       /* list for the mdt targets in phase1 scanning. */
+       /* list for the mdt targets in phase2 scanning. */
        struct list_head                         lad_mdt_phase2_list;
 
        const char                              *lad_name;
        struct ptlrpc_thread                     lad_thread;
+       struct task_struct                      *lad_task;
 
        struct lfsck_assistant_operations       *lad_ops;
 
-       cfs_bitmap_t                            *lad_bitmap;
+       struct cfs_bitmap                               *lad_bitmap;
 
        __u32                                    lad_touch_gen;
        int                                      lad_prefetched;
@@ -742,10 +847,18 @@ struct lfsck_assistant_data {
                                                 lad_in_double_scan:1,
                                                 lad_exit:1,
                                                 lad_incomplete:1;
+       bool                                     lad_advance_lock;
 };
 
 #define LFSCK_TMPBUF_LEN       64
 
+struct lfsck_lock_handle {
+       struct lustre_handle    llh_pdo_lh;
+       struct lustre_handle    llh_reg_lh;
+       enum ldlm_mode          llh_pdo_mode;
+       enum ldlm_mode          llh_reg_mode;
+};
+
 struct lfsck_thread_info {
        struct lu_name          lti_name_const;
        struct lu_name          lti_name;
@@ -758,10 +871,8 @@ struct lfsck_thread_info {
        struct lu_fid           lti_fid2;
        struct lu_fid           lti_fid3;
        struct lu_fid           lti_fid4;
-       struct lu_fid           lti_fid5;
        struct lu_attr          lti_la;
        struct lu_attr          lti_la2;
-       struct lu_attr          lti_la3;
        struct ost_id           lti_oi;
        union {
                struct lustre_mdt_attrs lti_lma;
@@ -778,7 +889,8 @@ struct lfsck_thread_info {
        struct lfsck_async_interpret_args lti_laia2;
        struct lfsck_start      lti_start;
        struct lfsck_stop       lti_stop;
-       ldlm_policy_data_t      lti_policy;
+       union ldlm_policy_data  lti_policy;
+       struct ldlm_enqueue_info lti_einfo;
        struct ldlm_res_id      lti_resid;
        union {
                struct filter_fid_old   lti_old_pfid;
@@ -794,6 +906,7 @@ struct lfsck_thread_info {
        struct lmv_mds_md_v1    lti_lmv2;
        struct lmv_mds_md_v1    lti_lmv3;
        struct lmv_mds_md_v1    lti_lmv4;
+       struct lfsck_lock_handle lti_llh;
 };
 
 /* lfsck_lib.c */
@@ -801,27 +914,29 @@ int lfsck_fid_alloc(const struct lu_env *env, struct lfsck_instance *lfsck,
                    struct lu_fid *fid, bool locked);
 int lfsck_ibits_lock(const struct lu_env *env, struct lfsck_instance *lfsck,
                     struct dt_object *obj, struct lustre_handle *lh,
-                    __u64 bits, ldlm_mode_t mode);
-void lfsck_ibits_unlock(struct lustre_handle *lh, ldlm_mode_t mode);
+                    __u64 bits, enum ldlm_mode mode);
+void lfsck_ibits_unlock(struct lustre_handle *lh, enum ldlm_mode mode);
+int lfsck_lock(const struct lu_env *env, struct lfsck_instance *lfsck,
+              struct dt_object *obj, const char *name,
+              struct lfsck_lock_handle *llh, __u64 bits, enum ldlm_mode mode);
+void lfsck_unlock(struct lfsck_lock_handle *llh);
 int lfsck_find_mdt_idx_by_fid(const struct lu_env *env,
                              struct lfsck_instance *lfsck,
                              const struct lu_fid *fid);
-int lfsck_create_lpf(const struct lu_env *env, struct lfsck_instance *lfsck);
 int lfsck_verify_lpf(const struct lu_env *env, struct lfsck_instance *lfsck);
 struct lfsck_instance *lfsck_instance_find(struct dt_device *key, bool ref,
                                           bool unlink);
 struct lfsck_component *lfsck_component_find(struct lfsck_instance *lfsck,
                                             __u16 type);
-const char *lfsck_status2names(enum lfsck_status status);
 void lfsck_component_cleanup(const struct lu_env *env,
                             struct lfsck_component *com);
 void lfsck_instance_cleanup(const struct lu_env *env,
                            struct lfsck_instance *lfsck);
-int lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
+void lfsck_bits_dump(struct seq_file *m, int bits, const char *names[],
+                    const char *prefix);
+void lfsck_time_dump(struct seq_file *m, __u64 time, const char *name);
+void lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
                    const char *prefix);
-int lfsck_time_dump(struct seq_file *m, __u64 time, const char *prefix);
-int lfsck_pos_dump(struct seq_file *m, struct lfsck_position *pos,
-                  const char *prefix);
 void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
                    struct lfsck_position *pos, bool init);
 bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit);
@@ -831,6 +946,14 @@ void lfsck_thread_args_fini(struct lfsck_thread_args *lta);
 struct lfsck_assistant_data *
 lfsck_assistant_data_init(struct lfsck_assistant_operations *lao,
                          const char *name);
+struct lfsck_assistant_object *
+lfsck_assistant_object_init(const struct lu_env *env, const struct lu_fid *fid,
+                           const struct lu_attr *attr, __u64 cookie,
+                           bool is_dir);
+struct dt_object *
+lfsck_assistant_object_load(const struct lu_env *env,
+                           struct lfsck_instance *lfsck,
+                           struct lfsck_assistant_object *lso);
 int lfsck_async_interpret_common(const struct lu_env *env,
                                 struct ptlrpc_request *req,
                                 void *args, int rc);
@@ -839,6 +962,7 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp,
                        struct ptlrpc_request_set *set,
                        ptlrpc_interpterer_t interpterer,
                        void *args, int request);
+int lfsck_query_all(const struct lu_env *env, struct lfsck_component *com);
 int lfsck_start_assistant(const struct lu_env *env, struct lfsck_component *com,
                          struct lfsck_start_param *lsp);
 int lfsck_checkpoint_generic(const struct lu_env *env,
@@ -849,9 +973,23 @@ int lfsck_double_scan_generic(const struct lu_env *env,
                              struct lfsck_component *com, int status);
 void lfsck_quit_generic(const struct lu_env *env,
                        struct lfsck_component *com);
+int lfsck_load_one_trace_file(const struct lu_env *env,
+                             struct lfsck_component *com,
+                             struct dt_object *parent,
+                             struct dt_object **child,
+                             const struct dt_index_features *ft,
+                             const char *name, bool reset);
+int lfsck_load_sub_trace_files(const struct lu_env *env,
+                              struct lfsck_component *com,
+                              const struct dt_index_features *ft,
+                              const char *prefix, bool reset);
 
 /* lfsck_engine.c */
 int lfsck_unpack_ent(struct lu_dirent *ent, __u64 *cookie, __u16 *type);
+void lfsck_close_dir(const struct lu_env *env,
+                    struct lfsck_instance *lfsck, int result);
+int lfsck_open_dir(const struct lu_env *env,
+                  struct lfsck_instance *lfsck, __u64 cookie);
 int lfsck_master_engine(void *args);
 int lfsck_assistant_engine(void *args);
 
@@ -870,14 +1008,18 @@ int lfsck_namespace_trace_update(const struct lu_env *env,
                                 struct lfsck_component *com,
                                 const struct lu_fid *fid,
                                 const __u8 flags, bool add);
+int lfsck_namespace_check_exist(const struct lu_env *env,
+                               struct dt_object *dir,
+                               struct dt_object *obj, const char *name);
 int __lfsck_links_read(const struct lu_env *env, struct dt_object *obj,
-                      struct linkea_data *ldata);
+                      struct linkea_data *ldata, bool with_rec);
 int lfsck_namespace_rebuild_linkea(const struct lu_env *env,
                                   struct lfsck_component *com,
                                   struct dt_object *obj,
                                   struct linkea_data *ldata);
 int lfsck_namespace_repair_dangling(const struct lu_env *env,
                                    struct lfsck_component *com,
+                                   struct dt_object *parent,
                                    struct dt_object *child,
                                    struct lfsck_namespace_req *lnr);
 int lfsck_namespace_repair_dirent(const struct lu_env *env,
@@ -886,19 +1028,14 @@ int lfsck_namespace_repair_dirent(const struct lu_env *env,
                                  struct dt_object *child,
                                  const char *name, const char *name2,
                                  __u16 type, bool update, bool dec);
-int lfsck_verify_linkea(const struct lu_env *env, struct dt_device *dev,
-                       struct dt_object *obj, const struct lu_name *cname,
-                       const struct lu_fid *pfid);
+int lfsck_verify_linkea(const struct lu_env *env, struct dt_object *obj,
+                       const struct lu_name *cname, const struct lu_fid *pfid);
 int lfsck_links_get_first(const struct lu_env *env, struct dt_object *obj,
                          char *name, struct lu_fid *pfid);
-int lfsck_remove_name_entry(const struct lu_env *env,
-                           struct lfsck_instance *lfsck,
-                           struct dt_object *parent,
-                           const char *name, __u32 type);
 int lfsck_update_name_entry(const struct lu_env *env,
                            struct lfsck_instance *lfsck,
-                           struct dt_object *parent, const char *name,
-                           const struct lu_fid *pfid, __u32 type);
+                           struct dt_object *dir, const char *name,
+                           const struct lu_fid *fid, __u32 type);
 int lfsck_namespace_setup(const struct lu_env *env,
                          struct lfsck_instance *lfsck);
 
@@ -924,6 +1061,12 @@ int lfsck_namespace_verify_stripe_slave(const struct lu_env *env,
                                        struct lfsck_component *com,
                                        struct dt_object *obj,
                                        struct lfsck_lmv *llmv);
+int lfsck_namespace_scan_shard(const struct lu_env *env,
+                              struct lfsck_component *com,
+                              struct dt_object *child);
+int lfsck_namespace_notify_lmv_master_local(const struct lu_env *env,
+                                           struct lfsck_component *com,
+                                           struct dt_object *obj);
 int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
                                         struct lfsck_component *com,
                                         struct dt_object *shard,
@@ -932,6 +1075,9 @@ int lfsck_namespace_repair_bad_name_hash(const struct lu_env *env,
 int lfsck_namespace_striped_dir_rescan(const struct lu_env *env,
                                       struct lfsck_component *com,
                                       struct lfsck_namespace_req *lnr);
+int lfsck_namespace_handle_striped_master(const struct lu_env *env,
+                                         struct lfsck_component *com,
+                                         struct lfsck_namespace_req *lnr);
 
 /* lfsck_layout.c */
 int lfsck_layout_setup(const struct lu_env *env, struct lfsck_instance *lfsck);
@@ -948,7 +1094,7 @@ static inline bool name_is_dot_or_dotdot(const char *name, int namelen)
               (namelen == 1 || (namelen == 2 && name[1] == '.'));
 }
 
-static inline struct dt_device *lfsck_obj2dt_dev(struct dt_object *obj)
+static inline struct dt_device *lfsck_obj2dev(struct dt_object *obj)
 {
        return container_of0(obj->do_lu.lo_dev, struct dt_device, dd_lu_dev);
 }
@@ -1095,9 +1241,25 @@ static inline void lfsck_object_put(const struct lu_env *env,
        lu_object_put(env, &obj->do_lu);
 }
 
-static inline u32 lfsck_dev_idx(struct dt_device *dev)
+static inline struct seq_server_site
+*lfsck_dev_site(struct lfsck_instance *lfsck)
+{
+       return lu_site2seq(lfsck->li_bottom->dd_lu_dev.ld_site);
+}
+
+static inline u32 lfsck_dev_idx(struct lfsck_instance *lfsck)
 {
-       return dev->dd_lu_dev.ld_site->ld_seq_site->ss_node_id;
+       return lfsck_dev_site(lfsck)->ss_node_id;
+}
+
+static inline struct dt_object *
+lfsck_object_find_by_dev_new(const struct lu_env *env, struct dt_device *dev,
+                            const struct lu_fid *fid)
+{
+       struct lu_object_conf   *conf = &lfsck_env_info(env)->lti_conf;
+
+       conf->loc_flags = LOC_F_NEW;
+       return lu2dt(lu_object_find_slice(env, dt2lu_dev(dev), fid, conf));
 }
 
 static inline struct dt_object *
@@ -1105,68 +1267,111 @@ lfsck_object_find_by_dev_nowait(const struct lu_env *env, struct dt_device *dev,
                                const struct lu_fid *fid)
 {
        struct lu_object_conf   *conf = &lfsck_env_info(env)->lti_conf;
-       struct dt_object        *obj;
 
        conf->loc_flags = LOC_F_NOWAIT;
-       obj = lu2dt(lu_object_find_slice(env, dt2lu_dev(dev), fid, conf));
-       if (unlikely(obj == NULL))
-               return ERR_PTR(-ENOENT);
-
-       return obj;
+       return lu2dt(lu_object_find_slice(env, dt2lu_dev(dev), fid, conf));
 }
 
 static inline struct dt_object *
 lfsck_object_find_by_dev(const struct lu_env *env, struct dt_device *dev,
                         const struct lu_fid *fid)
 {
-       struct dt_object *obj;
-
-       obj = lu2dt(lu_object_find_slice(env, dt2lu_dev(dev), fid, NULL));
-       if (unlikely(obj == NULL))
-               return ERR_PTR(-ENOENT);
-
-       return obj;
+       return lu2dt(lu_object_find_slice(env, dt2lu_dev(dev), fid, NULL));
 }
 
-static inline struct dt_object *lfsck_object_find(const struct lu_env *env,
-                                                 struct lfsck_instance *lfsck,
-                                                 const struct lu_fid *fid)
-{
-       return lfsck_object_find_by_dev(env, lfsck->li_next, fid);
-}
-
-static inline struct dt_object *
-lfsck_object_find_bottom(const struct lu_env *env, struct lfsck_instance *lfsck,
-                        const struct lu_fid *fid)
+static inline struct dt_device *
+lfsck_find_dev_by_fid(const struct lu_env *env, struct lfsck_instance *lfsck,
+                     const struct lu_fid *fid)
 {
        struct dt_device *dev;
        int               idx;
 
+       if (!lfsck->li_master)
+               return lfsck->li_bottom;
+
        idx = lfsck_find_mdt_idx_by_fid(env, lfsck, fid);
        if (idx < 0)
                return ERR_PTR(idx);
 
-       if (idx == lfsck_dev_idx(lfsck->li_bottom)) {
+       if (idx == lfsck_dev_idx(lfsck)) {
                dev = lfsck->li_bottom;
        } else {
                struct lfsck_tgt_desc *ltd;
 
-               ltd = LTD_TGT(&lfsck->li_mdt_descs, idx);
+               ltd = lfsck_ltd2tgt(&lfsck->li_mdt_descs, idx);
                if (unlikely(ltd == NULL))
                        return ERR_PTR(-ENODEV);
 
                dev = ltd->ltd_tgt;
        }
 
+       return dev;
+}
+
+static inline struct dt_object *
+lfsck_object_find_bottom(const struct lu_env *env, struct lfsck_instance *lfsck,
+                        const struct lu_fid *fid)
+{
+       struct dt_device *dev;
+
+       dev = lfsck_find_dev_by_fid(env, lfsck, fid);
+       if (IS_ERR(dev))
+               return (struct dt_object *)dev;
+
        return lfsck_object_find_by_dev(env, dev, fid);
 }
 
+static inline struct dt_object *
+lfsck_object_find_bottom_nowait(const struct lu_env *env,
+                               struct lfsck_instance *lfsck,
+                               const struct lu_fid *fid)
+{
+       struct dt_device *dev;
+
+       dev = lfsck_find_dev_by_fid(env, lfsck, fid);
+       if (IS_ERR(dev))
+               return (struct dt_object *)dev;
+
+       return lfsck_object_find_by_dev_nowait(env, dev, fid);
+}
+
+static inline struct dt_object *
+lfsck_object_find_bottom_new(const struct lu_env *env,
+                            struct lfsck_instance *lfsck,
+                            const struct lu_fid *fid)
+{
+       struct dt_device *dev;
+
+       dev = lfsck_find_dev_by_fid(env, lfsck, fid);
+       if (IS_ERR(dev))
+               return (struct dt_object *)dev;
+
+       return lfsck_object_find_by_dev_new(env, dev, fid);
+}
+
+static inline struct dt_object *
+lfsck_object_locate(struct dt_device *dev, struct dt_object *obj)
+{
+       if (lfsck_obj2dev(obj) == dev) {
+               return obj;
+       } else {
+               struct lu_object *lo;
+
+               lo = lu_object_locate(obj->do_lu.lo_header,
+                                     dev->dd_lu_dev.ld_type);
+               if (unlikely(lo == NULL))
+                       return ERR_PTR(-ENOENT);
+
+               return lu2dt(lo);
+       }
+}
+
 static inline struct lfsck_tgt_desc *lfsck_tgt_get(struct lfsck_tgt_descs *ltds,
                                                   __u32 index)
 {
        struct lfsck_tgt_desc *ltd;
 
-       ltd = LTD_TGT(ltds, index);
+       ltd = lfsck_ltd2tgt(ltds, index);
        if (ltd != NULL)
                atomic_inc(&ltd->ltd_ref);
 
@@ -1191,8 +1396,17 @@ static inline void lfsck_component_put(const struct lu_env *env,
                                       struct lfsck_component *com)
 {
        if (atomic_dec_and_test(&com->lc_ref)) {
+               struct lfsck_sub_trace_obj *lsto;
+               int                         i;
+
+               for (i = 0, lsto = &com->lc_sub_trace_objs[0];
+                    i < LFSCK_STF_COUNT; i++, lsto++) {
+                       if (lsto->lsto_obj != NULL)
+                               lfsck_object_put(env, lsto->lsto_obj);
+               }
+
                if (com->lc_obj != NULL)
-                       lu_object_put_nocache(env, &com->lc_obj->do_lu);
+                       lfsck_object_put(env, com->lc_obj);
                if (com->lc_file_ram != NULL)
                        OBD_FREE(com->lc_file_ram, com->lc_file_size);
                if (com->lc_file_disk != NULL)
@@ -1234,7 +1448,7 @@ static inline void lfsck_lad_set_bitmap(const struct lu_env *env,
                                        __u32 index)
 {
        struct lfsck_assistant_data     *lad    = com->lc_data;
-       cfs_bitmap_t                    *bitmap = lad->lad_bitmap;
+       struct cfs_bitmap               *bitmap = lad->lad_bitmap;
 
        LASSERT(com->lc_lfsck->li_master);
        LASSERT(bitmap != NULL);
@@ -1255,20 +1469,33 @@ static inline int lfsck_links_read(const struct lu_env *env,
 {
        ldata->ld_buf =
                lu_buf_check_and_alloc(&lfsck_env_info(env)->lti_linkea_buf,
-                                      PAGE_CACHE_SIZE);
+                                      MAX_LINKEA_SIZE);
+
+       return __lfsck_links_read(env, obj, ldata, false);
+}
+
+/* Read linkEA for the given object, the linkEA should contain
+ * at least one entry, otherwise, -ENODATA will be returned. */
+static inline int lfsck_links_read_with_rec(const struct lu_env *env,
+                                           struct dt_object *obj,
+                                           struct linkea_data *ldata)
+{
+       ldata->ld_buf =
+               lu_buf_check_and_alloc(&lfsck_env_info(env)->lti_linkea_buf,
+                                      MAX_LINKEA_SIZE);
 
-       return __lfsck_links_read(env, obj, ldata);
+       return __lfsck_links_read(env, obj, ldata, true);
 }
 
-static inline int lfsck_links_read2(const struct lu_env *env,
-                                   struct dt_object *obj,
-                                   struct linkea_data *ldata)
+static inline int lfsck_links_read2_with_rec(const struct lu_env *env,
+                                            struct dt_object *obj,
+                                            struct linkea_data *ldata)
 {
        ldata->ld_buf =
                lu_buf_check_and_alloc(&lfsck_env_info(env)->lti_linkea_buf2,
-                                      PAGE_CACHE_SIZE);
+                                      MAX_LINKEA_SIZE);
 
-       return __lfsck_links_read(env, obj, ldata);
+       return __lfsck_links_read(env, obj, ldata, true);
 }
 
 static inline struct lfsck_lmv *lfsck_lmv_get(struct lfsck_lmv *llmv)
@@ -1279,6 +1506,11 @@ static inline struct lfsck_lmv *lfsck_lmv_get(struct lfsck_lmv *llmv)
        return llmv;
 }
 
+static inline int lfsck_sub_trace_file_fid2idx(const struct lu_fid *fid)
+{
+       return fid->f_oid & (LFSCK_STF_COUNT - 1);
+}
+
 static inline void lfsck_lmv_header_le_to_cpu(struct lmv_mds_md_v1 *dst,
                                              const struct lmv_mds_md_v1 *src)
 {
@@ -1298,4 +1530,20 @@ static inline void lfsck_lmv_header_cpu_to_le(struct lmv_mds_md_v1 *dst,
        dst->lmv_hash_type = cpu_to_le32(src->lmv_hash_type);
        dst->lmv_layout_version = cpu_to_le32(src->lmv_layout_version);
 }
+
+static inline struct lfsck_assistant_object *
+lfsck_assistant_object_get(struct lfsck_assistant_object *lso)
+{
+       atomic_inc(&lso->lso_ref);
+
+       return lso;
+}
+
+static inline void
+lfsck_assistant_object_put(const struct lu_env *env,
+                          struct lfsck_assistant_object *lso)
+{
+       if (atomic_dec_and_test(&lso->lso_ref))
+               OBD_FREE_PTR(lso);
+}
 #endif /* _LFSCK_INTERNAL_H */