LU-1866 lfsck: enhance otable-based iteration

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_internal.h

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index 01ffd80..1dec8c2 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -216,11 +216,9 @@ struct osd_otable_cache {
 
 struct osd_otable_it {
        struct osd_device       *ooi_dev;
+       pid_t                    ooi_pid;
        struct osd_otable_cache  ooi_cache;
 
-       /* For osd_otable_it_key. */
-       __u8                     ooi_key[16];
-
        /* The following bits can be updated/checked w/o lock protection.
         * If more bits will be introduced in the future and need lock to
         * protect, please add comment. */
@@ -230,7 +228,9 @@ struct osd_otable_it {
                                                    * filled into cache. */
                                 ooi_user_ready:1, /* The user out of OSD is
                                                    * ready to iterate. */
-                                ooi_waiting:1; /* it::next is waiting. */
+                                ooi_waiting:1, /* it::next is waiting. */
+                                ooi_stopping:1; /* Someone is stopping
+                                                 * the iteration. */
 };
 
 extern const int osd_dto_credits_noquota[];
@@ -267,7 +267,6 @@ struct osd_device {
        spinlock_t                od_osfs_lock;
 
        unsigned int              od_noscrub:1,
-                                 od_init_scrub:1,
                                  od_handle_nolma:1;
 
        struct fsfilt_operations *od_fsops;