Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3536 osd: allocate it for each iteration.
[fs/lustre-release.git]
/
lustre
/
osd-ldiskfs
/
osd_scrub.h
diff --git
a/lustre/osd-ldiskfs/osd_scrub.h
b/lustre/osd-ldiskfs/osd_scrub.h
index
3c32dcb
..
ac966ab
100644
(file)
--- a/
lustre/osd-ldiskfs/osd_scrub.h
+++ b/
lustre/osd-ldiskfs/osd_scrub.h
@@
-20,7
+20,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
4
, Intel Corporation.
*/
/*
* lustre/osd-ldiskfs/osd_scrub.h
*/
/*
* lustre/osd-ldiskfs/osd_scrub.h
@@
-96,14
+96,17
@@
enum scrub_start {
/* Reset scrub start position. */
SS_RESET = 0x00000004,
/* 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. */
/* Set dryrun flag. */
- SS_SET_DRYRUN = 0x000000
1
0,
+ SS_SET_DRYRUN = 0x000000
2
0,
/* Clear dryrun flag. */
/* Clear dryrun flag. */
- SS_CLEAR_DRYRUN = 0x000000
2
0,
+ SS_CLEAR_DRYRUN = 0x000000
4
0,
};
/* The flags here are only used inside OSD, NOT be visible by dump(). */
};
/* 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;
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. */
/* 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_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 */
};
#endif /* _OSD_SCRUB_H */