LU-1199 build: Cleanup ldiskfs kernel config defines

[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 b07928e..c2bae71 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.h
+++ b/lustre/osd-ldiskfs/osd_scrub.h
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * lustre/osd-ldiskfs/osd_scrub.h
@@ -73,6 +73,9 @@ enum scrub_flags {
 
        /* OI scrub is triggered automatically. */
        SF_AUTO         = 0x0000000000000004ULL,
+
+       /* The device is upgraded from 1.8 format. */
+       SF_UPGRADE      = 0x0000000000000008ULL,
 };
 
 enum scrub_param {
@@ -140,7 +143,7 @@ struct scrub_file {
        /* 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. */
@@ -172,8 +175,8 @@ struct osd_scrub {
 
        /* 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;