e2fsck: reduce memory usage for many directories

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

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 5e7db42c24187bbab1289306fb1ce4c94fce34c2..feb605c7bad244ad2488b9161965ba80436dd3e5 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -104,12 +104,12 @@ struct dir_info {
  * directories which contain a hash tree index.
  */
 struct dx_dir_info {
-       ext2_ino_t              ino;            /* Inode number */
-       int                     numblocks;      /* number of blocks */
-       int                     hashversion;
-       short                   depth;          /* depth of tree */
-       struct dx_dirblock_info *dx_block;      /* Array of size numblocks */
-       int                     casefolded_hash;
+       ext2_ino_t              ino;            /* Inode number */
+       short                   depth;          /* depth of tree (15 bits) */
+       __u8                    hashversion;
+       __u8                    casefolded_hash:1;
+       blk_t                   numblocks;      /* number of blocks in dir */
+       struct dx_dirblock_info *dx_block;      /* Array of size numblocks */
 };
 
 #define DX_DIRBLOCK_ROOT       1
@@ -120,8 +120,8 @@ struct dx_dir_info {
 
 struct dx_dirblock_info {
        int             type;
-       blk64_t         phys;
        int             flags;
+       blk64_t         phys;
        blk64_t         parent;
        blk64_t         previous;
        ext2_dirhash_t  min_hash;