X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_lfsck.h;h=ee7d7839f8b4e69238a249b436385b6360d2dfcc;hb=e14246641c04c9e3004043f58f469532223d06d6;hp=b20eff9d7ff092d7e81854e8e300e86b554eee04;hpb=e1245db78d4de34d5e3236edbfb5b2b0eec638a0;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_lfsck.h b/lustre/include/lustre_lfsck.h
index b20eff9..ee7d783 100644
--- a/lustre/include/lustre_lfsck.h
+++ b/lustre/include/lustre_lfsck.h
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
  */
 /*
  * lustre/include/lustre_lfsck.h
@@ -38,94 +38,60 @@
 #include <lu_object.h>
 #include <dt_object.h>
 
-/**
- * status machine:
- *
- * 					LS_INIT
- * 					   |
- * 				     (lfsck|start)
- * 					   |
- *					   v
- *				   LS_SCANNING_PHASE1
- *					|	^
- *					|	:
- *					| (lfsck:restart)
- *					|	:
- *					v	:
- *	-----------------------------------------------------------------
- *	|		    |^		|^	   |^	      |^ 	|^
- *	|		    |:		|:	   |:	      |:	|:
- *	v		    v:		v:	   v:	      v: 	v:
- * LS_SCANNING_PHASE2	LS_FAILED  LS_STOPPED  LS_PAUSED LS_CRASHED LS_PARTIAL
- *	|	^	    ^:		^:	   ^:	      ^:	^:
- *	|	:	    |:		|:	   |:	      |:	|:
- *	| (lfsck:restart)   |:		|:	   |:	      |:	|:
- *	v	:	    |v		|v	   |v	      |v	|v
- *	-----------------------------------------------------------------
- *	    |
- *	    v
- *    LS_COMPLETED
- */
-enum lfsck_status {
-	/* The lfsck file is new created, for new MDT, upgrading from old disk,
-	 * or re-creating the lfsck file manually. */
-	LS_INIT			= 0,
-
-	/* The first-step system scanning. */
-	LS_SCANNING_PHASE1	= 1,
-
-	/* The second-step system scanning. */
-	LS_SCANNING_PHASE2	= 2,
-
-	/* The LFSCK processing has completed for all objects. */
-	LS_COMPLETED		= 3,
-
-	/* The LFSCK exited automatically for failure, will not auto restart. */
-	LS_FAILED		= 4,
-
-	/* The LFSCK is stopped manually, will not auto restart. */
-	LS_STOPPED		= 5,
-
-	/* LFSCK is paused automatically when umount,
-	 * will be restarted automatically when remount. */
-	LS_PAUSED		= 6,
-
-	/* System crashed during the LFSCK,
-	 * will be restarted automatically after recovery. */
-	LS_CRASHED		= 7,
-
-	/* Some OST/MDT failed during the LFSCK, or not join the LFSCK. */
-	LS_PARTIAL		= 8,
-
-	LS_MAX
-};
-
 struct lfsck_start_param {
 	struct lfsck_start	*lsp_start;
-	struct ldlm_namespace	*lsp_namespace;
+	__u32			 lsp_index;
+	unsigned int		 lsp_index_valid:1;
 };
 
-enum lfsck_events {
-	LE_LASTID_REBUILDING	= 1,
-	LE_LASTID_REBUILT	= 2,
+/* For LE_PAIRS_VERIFY returned status */
+enum lfsck_pv_status {
+	LPVS_INIT		= 0,
+	LPVS_INCONSISTENT	= 1,
+	LPVS_INCONSISTENT_TOFIX = 2,
 };
 
 typedef int (*lfsck_out_notify)(const struct lu_env *env, void *data,
 				enum lfsck_events event);
 
+int lfsck_register_namespace(const struct lu_env *env, struct dt_device *key,
+			     struct ldlm_namespace *ns);
 int lfsck_register(const struct lu_env *env, struct dt_device *key,
-		   struct dt_device *next, lfsck_out_notify notify,
-		   void *notify_data, bool master);
+		   struct dt_device *next, struct obd_device *obd,
+		   lfsck_out_notify notify, void *notify_data, bool master);
 void lfsck_degister(const struct lu_env *env, struct dt_device *key);
 
+int lfsck_add_target(const struct lu_env *env, struct dt_device *key,
+		     struct dt_device *tgt, struct obd_export *exp,
+		     __u32 index, bool for_ost);
+void lfsck_del_target(const struct lu_env *env, struct dt_device *key,
+		      struct dt_device *tgt, __u32 index, bool for_ost);
+
 int lfsck_start(const struct lu_env *env, struct dt_device *key,
 		struct lfsck_start_param *lsp);
 int lfsck_stop(const struct lu_env *env, struct dt_device *key,
-	       bool pause);
-
-int lfsck_get_speed(struct dt_device *key, void *buf, int len);
+	       struct lfsck_stop *stop);
+int lfsck_in_notify(const struct lu_env *env, struct dt_device *key,
+		    struct lfsck_request *lr, struct thandle *th);
+int lfsck_query(const struct lu_env *env, struct dt_device *key,
+		struct lfsck_request *req, struct lfsck_reply *rep,
+		struct lfsck_query *que);
+
+int lfsck_get_speed(struct seq_file *m, struct dt_device *key);
 int lfsck_set_speed(struct dt_device *key, int val);
-
-int lfsck_dump(struct dt_device *key, void *buf, int len, enum lfsck_type type);
+int lfsck_get_windows(struct seq_file *m, struct dt_device *key);
+int lfsck_set_windows(struct dt_device *key, int val);
+
+int lfsck_dump(struct seq_file *m, struct dt_device *key, enum lfsck_type type);
+
+static inline void lfsck_pack_rfa(struct lfsck_request *lr,
+				  const struct lu_fid *fid,
+				  __u32 event, __u16 com)
+{
+	memset(lr, 0, sizeof(*lr));
+	lr->lr_fid = *fid;
+	lr->lr_event = event;
+	lr->lr_active = com;
+}
 
 #endif /* _LUSTRE_LFSCK_H */