X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_internal.h;h=ebefeae810f97fba408c2fdd0abd71421976339a;hb=d0ba82e44038b2658bbd1a06d52641fda9fc1fe7;hp=8862f83ea58f620c68acddc1de50fabbcc189843;hpb=46b927d45eb2ee5db3e35df2a0ade4c11ba9f345;p=fs%2Flustre-release.git diff --git a/lustre/lfsck/lfsck_internal.h b/lustre/lfsck/lfsck_internal.h index 8862f83..ebefeae 100644 --- a/lustre/lfsck/lfsck_internal.h +++ b/lustre/lfsck/lfsck_internal.h @@ -101,8 +101,14 @@ struct lfsck_bookmark { /* For 64-bits aligned. */ __u16 lb_padding; + /* The FID for .lustre/lost+found/MDTxxxx */ + struct lu_fid lb_lpf_fid; + + /* The FID for the last MDT-object created by the LFSCK repairing. */ + struct lu_fid lb_last_fid; + /* For future using. */ - __u64 lb_reserved[6]; + __u64 lb_reserved[2]; }; struct lfsck_namespace { @@ -175,8 +181,11 @@ struct lfsck_namespace { /* The latest object has been processed (failed) during double scan. */ struct lu_fid ln_fid_latest_scanned_phase2; - /* For further using. 256-bytes aligned now. */ - __u64 ln_reserved[2]; + /* How many FID-in-dirent entries have been repaired. */ + __u64 ln_dirent_repaired; + + /* How many linkEA entries have been repaired. */ + __u64 ln_linkea_repaired; }; enum lfsck_layout_inconsistency_type { @@ -224,7 +233,8 @@ struct lfsck_layout { /* Position for the last LFSCK checkpoint. */ __u64 ll_pos_last_checkpoint; - /* Position for the first should be updated object. */ + /* Position for the first object to be fixed or + * failed to be checked in the phase1. */ __u64 ll_pos_first_inconsistent; /* How many objects have been checked. */ @@ -239,7 +249,7 @@ struct lfsck_layout { /* How many objects failed to be processed during double scan. */ __u64 ll_objs_failed_phase2; - /* kinds of inconsistency have been repaired. + /* kinds of inconsistency have been or to be repaired. * ll_objs_repaired[type - 1] is the count for the given @type. */ __u64 ll_objs_repaired[LLIT_MAX]; @@ -286,6 +296,11 @@ struct lfsck_operations { int result, bool init); + int (*lfsck_interpret)(const struct lu_env *env, + struct ptlrpc_request *req, + void *args, + int rc); + int (*lfsck_dump)(const struct lu_env *env, struct lfsck_component *com, char *buf, @@ -383,6 +398,7 @@ struct lfsck_component { void *lc_file_ram; void *lc_file_disk; void *lc_data; + struct lu_fid lc_fid_latest_scanned_phase2; /* The time for last checkpoint, jiffies */ cfs_time_t lc_time_last_checkpoint; @@ -443,6 +459,8 @@ struct lfsck_instance { struct lu_fid li_local_root_fid; /* backend root "/" */ struct lu_fid li_global_root_fid; /* /ROOT */ struct dt_object *li_bookmark_obj; + struct dt_object *li_lpf_obj; + struct lu_client_seq *li_seq; struct lfsck_bookmark li_bookmark_ram; struct lfsck_bookmark li_bookmark_disk; struct lfsck_position li_pos_current; @@ -492,7 +510,8 @@ struct lfsck_instance { unsigned int li_oit_over:1, /* oit is finished. */ li_drop_dryrun:1, /* Ever dryrun, not now. */ li_master:1, /* Master instance or not. */ - li_current_oit_processed:1; + li_current_oit_processed:1, + li_start_unplug:1; }; enum lfsck_linkea_flags { @@ -508,6 +527,8 @@ struct lfsck_async_interpret_args { struct lfsck_tgt_descs *laia_ltds; struct lfsck_tgt_desc *laia_ltd; struct lfsck_request *laia_lr; + int laia_result; + unsigned int laia_shared:1; }; struct lfsck_thread_args { @@ -517,6 +538,8 @@ struct lfsck_thread_args { struct lfsck_start_param *lta_lsp; }; +#define LFSCK_TMPBUF_LEN 64 + struct lfsck_thread_info { struct lu_name lti_name; struct lu_buf lti_buf; @@ -524,8 +547,10 @@ struct lfsck_thread_info { struct lu_buf lti_big_buf; struct lu_fid lti_fid; struct lu_fid lti_fid2; + struct lu_fid lti_fid3; 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; @@ -537,8 +562,10 @@ struct lfsck_thread_info { * then lti_ent::lde_name will be lti_key. */ struct lu_dirent lti_ent; char lti_key[NAME_MAX + 16]; + char lti_tmpbuf[LFSCK_TMPBUF_LEN]; struct lfsck_request lti_lr; struct lfsck_async_interpret_args lti_laia; + struct lfsck_start lti_start; struct lfsck_stop lti_stop; ldlm_policy_data_t lti_policy; struct ldlm_res_id lti_resid; @@ -547,9 +574,18 @@ struct lfsck_thread_info { struct filter_fid lti_new_pfid; }; struct dt_allocation_hint lti_hint; + struct lu_orphan_rec lti_rec; + struct lov_user_md lti_lum; }; /* lfsck_lib.c */ +int lfsck_fid_alloc(const struct lu_env *env, struct lfsck_instance *lfsck, + struct lu_fid *fid, bool locked); +int lfsck_create_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); @@ -562,6 +598,7 @@ int lfsck_pos_dump(char **buf, int *len, 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); void lfsck_control_speed(struct lfsck_instance *lfsck); void lfsck_control_speed_by_self(struct lfsck_component *com); int lfsck_reset(const struct lu_env *env, struct lfsck_instance *lfsck, @@ -593,10 +630,14 @@ int lfsck_async_request(const struct lu_env *env, struct obd_export *exp, int lfsck_master_engine(void *args); /* lfsck_bookmark.c */ +void lfsck_bookmark_cpu_to_le(struct lfsck_bookmark *des, + struct lfsck_bookmark *src); int lfsck_bookmark_store(const struct lu_env *env, struct lfsck_instance *lfsck); int lfsck_bookmark_setup(const struct lu_env *env, struct lfsck_instance *lfsck); +int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck, + struct lfsck_start *start, bool reset); /* lfsck_namespace.c */ int lfsck_namespace_setup(const struct lu_env *env,