diff options
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/mkfs_ext2.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 69b25c946..3258d7eee 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -53,11 +53,6 @@ | |||
53 | #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 | 53 | #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 |
54 | #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 | 54 | #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 |
55 | 55 | ||
56 | // from e2fsprogs | ||
57 | #define s_reserved_gdt_blocks s_padding1 | ||
58 | #define s_mkfs_time s_reserved[0] | ||
59 | #define s_flags s_reserved[22] | ||
60 | |||
61 | #define EXT2_HASH_HALF_MD4 1 | 56 | #define EXT2_HASH_HALF_MD4 1 |
62 | #define EXT2_FLAGS_SIGNED_HASH 0x0001 | 57 | #define EXT2_FLAGS_SIGNED_HASH 0x0001 |
63 | #define EXT2_FLAGS_UNSIGNED_HASH 0x0002 | 58 | #define EXT2_FLAGS_UNSIGNED_HASH 0x0002 |
@@ -482,8 +477,10 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
482 | STORE_LE(sb->s_magic, EXT2_SUPER_MAGIC); | 477 | STORE_LE(sb->s_magic, EXT2_SUPER_MAGIC); |
483 | STORE_LE(sb->s_inode_size, inodesize); | 478 | STORE_LE(sb->s_inode_size, inodesize); |
484 | // set "Required extra isize" and "Desired extra isize" fields to 28 | 479 | // set "Required extra isize" and "Desired extra isize" fields to 28 |
485 | if (inodesize != sizeof(*inode)) | 480 | if (inodesize != sizeof(*inode)) { |
486 | STORE_LE(sb->s_reserved[21], 0x001C001C); | 481 | STORE_LE(sb->s_min_extra_isize, 0x001c); |
482 | STORE_LE(sb->s_want_extra_isize, 0x001c); | ||
483 | } | ||
487 | STORE_LE(sb->s_first_ino, EXT2_GOOD_OLD_FIRST_INO); | 484 | STORE_LE(sb->s_first_ino, EXT2_GOOD_OLD_FIRST_INO); |
488 | STORE_LE(sb->s_log_block_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); | 485 | STORE_LE(sb->s_log_block_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); |
489 | STORE_LE(sb->s_log_frag_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); | 486 | STORE_LE(sb->s_log_frag_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); |