LU-8465 e2fsck: misc cleanups for pfsck

[tools/e2fsprogs.git] / e2fsck / e2fsck.h

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 31c7fa4..6ef58b1 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -271,8 +271,8 @@ struct e2fsck_thread {
        dgrp_t          et_group_next;
        /* Scanned inode number */
        ext2_ino_t      et_inode_number;
-       char            et_log_buf[2048];
        char            et_log_length;
+       char            et_log_buf[2048];
 };
 #endif
 
@@ -449,11 +449,6 @@ struct e2fsck_struct {
        ext2_ino_t              stashed_ino;
        struct ext2_inode       *stashed_inode;
 
-       /* if @global_ctx is null, this field is unused */
-#ifdef CONFIG_PFSCK
-       struct e2fsck_thread     thread_info;
-#endif
-
        /*
         * Directory information
         */
@@ -497,8 +492,11 @@ struct e2fsck_struct {
        __u32                   fs_fragmented_dir;
        __u32                   large_files;
        __u32                   extent_depth_count[MAX_EXTENT_DEPTH_COUNT];
+
 #ifdef CONFIG_PFSCK
-       __u32                    fs_num_threads;
+       /* if @global_ctx is null, this field is unused */
+       struct e2fsck_thread     thread_info;
+       __u32                    pfs_num_threads;
        __u32                    mmp_update_thread;
        int                      fs_need_locking;
        /* serialize fix operation for multiple threads */
@@ -730,7 +728,7 @@ int check_backup_super_block(e2fsck_t ctx);
 void check_resize_inode(e2fsck_t ctx);
 
 /* util.c */
-#define E2FSCK_MAX_THREADS     (65536)
+#define E2FSCK_MAX_THREADS     (65535)
 extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,
                                    const char *description);
 extern int ask(e2fsck_t ctx, const char * string, int def);