X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_internal.h;h=4abe593d07e098e3b78de96f419c5aee9075e647;hp=a4aa737b40262124d91e21e52658933538ffbfdd;hb=8a11cb6282cfbdc8617b809344e6a11223e86a38;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850

diff --git a/lustre/lfsck/lfsck_internal.h b/lustre/lfsck/lfsck_internal.h
index a4aa737..4abe593 100644
--- a/lustre/lfsck/lfsck_internal.h
+++ b/lustre/lfsck/lfsck_internal.h
@@ -360,6 +360,15 @@ struct lfsck_layout {
 	__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 +402,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);
 
@@ -446,7 +456,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 {
@@ -473,12 +483,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;
+
+	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)
 
-#define OST_TGT(lfsck, index)   LTD_TGT(&lfsck->li_ost_descs, index)
-#define MDT_TGT(lfsck, index)   LTD_TGT(&lfsck->li_mdt_descs, index)
+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 +530,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;
@@ -628,8 +666,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;
@@ -706,15 +746,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;
@@ -723,6 +762,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,
@@ -785,10 +831,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;
+	ldlm_mode_t		llh_pdo_mode;
+	ldlm_mode_t		llh_reg_mode;
+};
+
 struct lfsck_thread_info {
 	struct lu_name		lti_name_const;
 	struct lu_name		lti_name;
@@ -800,11 +854,8 @@ struct lfsck_thread_info {
 	struct lu_fid		lti_fid;
 	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;
@@ -838,6 +889,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 */
@@ -847,10 +899,13 @@ 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);
+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, ldlm_mode_t 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);
@@ -863,7 +918,7 @@ 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[],
 		    const char *prefix);
-int lfsck_time_dump(struct seq_file *m, __u64 time, const char *prefix);
+int lfsck_time_dump(struct seq_file *m, __u64 time, const char *name);
 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,
@@ -875,6 +930,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);
@@ -929,6 +992,7 @@ int lfsck_namespace_rebuild_linkea(const struct lu_env *env,
 				   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,
@@ -937,19 +1001,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);
 
@@ -1008,7 +1067,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);
 }
@@ -1155,9 +1214,15 @@ 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 dev->dd_lu_dev.ld_site->ld_seq_site->ss_node_id;
+	return lu_site2seq(lfsck->li_bottom->dd_lu_dev.ld_site);
+}
+
+static inline u32 lfsck_dev_idx(struct lfsck_instance *lfsck)
+{
+	return lfsck_dev_site(lfsck)->ss_node_id;
 }
 
 static inline struct dt_object *
@@ -1177,13 +1242,6 @@ lfsck_object_find_by_dev(const struct lu_env *env, struct dt_device *dev,
 	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_device *
 lfsck_find_dev_by_fid(const struct lu_env *env, struct lfsck_instance *lfsck,
 		      const struct lu_fid *fid)
@@ -1191,16 +1249,19 @@ lfsck_find_dev_by_fid(const struct lu_env *env, struct lfsck_instance *lfsck,
 	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);
 
@@ -1237,12 +1298,29 @@ lfsck_object_find_bottom_nowait(const struct lu_env *env,
 	return lfsck_object_find_by_dev_nowait(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);
 
@@ -1267,8 +1345,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)
@@ -1355,6 +1442,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)
 {
@@ -1374,4 +1466,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 */