X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_scrub.h;h=ac966ab36462109f26cf87d56ea895a55fa57fa9;hb=9ff3b408aee72b97ebff9dc04becb14f1e6887b2;hp=3c32dcb61ee7fe27cc39dc0a3b05fe2bcd354981;hpb=bfbc2ea49b14a56791911557e01f966acb58b8da;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_scrub.h b/lustre/osd-ldiskfs/osd_scrub.h
index 3c32dcb..ac966ab 100644
--- a/lustre/osd-ldiskfs/osd_scrub.h
+++ b/lustre/osd-ldiskfs/osd_scrub.h
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * lustre/osd-ldiskfs/osd_scrub.h
@@ -96,14 +96,17 @@ enum scrub_start {
 	/* Reset scrub start position. */
 	SS_RESET		= 0x00000004,
 
-	/* Trigger scrub automatically. */
-	SS_AUTO			= 0x00000008,
+	/* Trigger full scrub automatically. */
+	SS_AUTO_FULL		= 0x00000008,
+
+	/* Trigger partial scrub automatically. */
+	SS_AUTO_PARTIAL		= 0x00000010,
 
 	/* Set dryrun flag. */
-	SS_SET_DRYRUN		= 0x00000010,
+	SS_SET_DRYRUN		= 0x00000020,
 
 	/* Clear dryrun flag. */
-	SS_CLEAR_DRYRUN 	= 0x00000020,
+	SS_CLEAR_DRYRUN		= 0x00000040,
 };
 
 /* The flags here are only used inside OSD, NOT be visible by dump(). */
@@ -187,7 +190,7 @@ struct osd_scrub {
 	struct lvfs_run_ctxt    os_ctxt;
 	struct ptlrpc_thread    os_thread;
 	struct osd_idmap_cache  os_oic;
-	cfs_list_t		os_inconsistent_items;
+	struct list_head	os_inconsistent_items;
 
 	/* write lock for scrub prep/update/post/checkpoint,
 	 * read lock for scrub dump. */
@@ -228,7 +231,12 @@ struct osd_scrub {
 				os_waiting:1, /* Waiting for scan window. */
 				os_full_speed:1, /* run w/o speed limit */
 				os_paused:1, /* The scrub is paused. */
-				os_convert_igif:1;
+				os_convert_igif:1,
+				os_partial_scan:1,
+				os_in_join:1,
+				os_full_scrub:1;
+	__u64			os_bad_oimap_count;
+	__u64			os_bad_oimap_time;
 };
 
 #endif /* _OSD_SCRUB_H */