LU-4217 build: bump build warnings to 2.7 development

[fs/lustre-release.git] / lustre / lfsck / lfsck_internal.h

diff --git a/lustre/lfsck/lfsck_internal.h b/lustre/lfsck/lfsck_internal.h
index 0a0e5e6..56cdff0 100644 (file)
--- a/lustre/lfsck/lfsck_internal.h
+++ b/lustre/lfsck/lfsck_internal.h
@@ -43,7 +43,7 @@
 #include <lustre_dlm.h>
 #include <lustre_fid.h>
 
-#define HALF_SEC                       (CFS_HZ >> 1)
+#define HALF_SEC                       (HZ >> 1)
 #define LFSCK_CHECKPOINT_INTERVAL      60
 
 #define LFSCK_NAMEENTRY_DEAD           1 /* The object has been unlinked. */
@@ -80,7 +80,7 @@ enum lfsck_status {
 };
 
 enum lfsck_flags {
-       /* Finish to the cycle scanning. */
+       /* Finish the first cycle scanning. */
        LF_SCANNED_ONCE = 0x00000001ULL,
 
        /* There is some namespace inconsistency. */
@@ -293,7 +293,7 @@ struct lfsck_instance {
        struct dt_device         *li_bottom;
        struct ldlm_namespace    *li_namespace;
        struct local_oid_storage *li_los;
-       struct dt_object         *li_local_root; /* backend root "/" */
+       struct lu_fid             li_local_root_fid;  /* backend root "/" */
        struct lu_fid             li_global_root_fid; /* /ROOT */
        struct dt_object         *li_bookmark_obj;
        struct lfsck_bookmark     li_bookmark_ram;
@@ -312,6 +312,9 @@ struct lfsck_instance {
        /* It for directory traversal */
        struct dt_it             *li_di_dir;
 
+       /* namespace-based directory traversal position. */
+       __u64                     li_cookie_dir;
+
        /* Arguments for low layer otable-based iteration. */
        __u32                     li_args_oit;
 
@@ -509,7 +512,7 @@ static void inline lfsck_position_cpu_to_le(struct lfsck_position *des,
        des->lp_dir_cookie = cpu_to_le64(src->lp_dir_cookie);
 }
 
-static inline cfs_umode_t lfsck_object_type(const struct dt_object *obj)
+static inline umode_t lfsck_object_type(const struct dt_object *obj)
 {
        return lu_object_attr(&obj->do_lu);
 }