LU-1866 osd: ancillary work for initial OI scrub

[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 c3e54b3..fcb0ae3 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 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.

  */
 /*
  * lustre/osd-ldiskfs/osd_scrub.h
  */
 /*
  * lustre/osd-ldiskfs/osd_scrub.h


@@ -140,7 +140,7 @@ struct scrub_file {
        /* How many prior objects have been updated during scanning. */
        __u64   sf_items_updated_prior;
 
        /* How many prior objects have been updated during scanning. */
        __u64   sf_items_updated_prior;
 

-       /* How many objects marked as I_LUSTRE_NOSCRUB. */
+       /* How many objects marked as LDISKFS_STATE_LUSTRE_NOSCRUB. */

        __u64   sf_items_noscrub;
 
        /* How many IGIF objects. */
        __u64   sf_items_noscrub;
 
        /* How many IGIF objects. */


@@ -172,8 +172,8 @@ struct osd_scrub {
 
        /* 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. */

-       cfs_rw_semaphore_t      os_rwsem;
-       cfs_spinlock_t          os_lock;
+       struct rw_semaphore     os_rwsem;
+       spinlock_t              os_lock;

 
        /* Scrub file in memory. */
        struct scrub_file       os_file;
 
        /* Scrub file in memory. */
        struct scrub_file       os_file;


@@ -198,7 +198,6 @@ struct osd_scrub {
                                                * found by RPC prior */
                                os_waiting:1, /* Waiting for scan window. */
                                os_full_speed:1, /* run w/o speed limit */
                                                * found by RPC prior */
                                os_waiting:1, /* Waiting for scan window. */
                                os_full_speed:1, /* run w/o speed limit */

-                               os_no_scrub:1, /* NOT auto trigger OI scrub*/

                                os_paused:1; /* The scrub is paused. */
 };
 
                                os_paused:1; /* The scrub is paused. */
 };