e2fsck: misc cleanups for pfsck

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

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 6348575..bd76ffb 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -270,8 +270,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
 
@@ -361,11 +361,6 @@ struct e2fsck_struct {
        ext2_ino_t              stashed_ino;
        struct ext2_inode       *stashed_inode;
 
-       /* if @global_ctx is null, this field is unused */
-#ifdef HAVE_PTHREAD
-       struct e2fsck_thread     thread_info;
-#endif
-
        /*
         * Location of the lost and found directory
         */
@@ -483,7 +478,9 @@ struct e2fsck_struct {
        /* Fast commit replay state */
        struct e2fsck_fc_replay_state fc_replay_state;
 #ifdef HAVE_PTHREAD
-       __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 */
@@ -725,7 +722,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);