From: Theodore Ts'o Date: Sun, 20 Apr 2008 20:10:07 +0000 (-0400) Subject: libe2p: Print the s_min_extra_isize and s_wanted_extra_isize fields X-Git-Tag: v1.41-WIP-0427~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41a5afa87b0408bc213d72712a0f6fa9177680c4;p=thirdparty%2Fe2fsprogs.git libe2p: Print the s_min_extra_isize and s_wanted_extra_isize fields Make dumpe2fs and debugfs print out the s_min_extra_isize and s_wanted_extra_isize fields from the superblock. Update tests expect files as appropriate. Signed-off-by: "Theodore Ts'o" --- diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c index d249f88b1..b1196068d 100644 --- a/lib/e2p/ls.c +++ b/lib/e2p/ls.c @@ -270,7 +270,13 @@ void list_super2(struct ext2_super_block * sb, FILE *f) print_group(sb->s_def_resgid, f); if (sb->s_rev_level >= EXT2_DYNAMIC_REV) { fprintf(f, "First inode: %d\n", sb->s_first_ino); - fprintf(f, "Inode size: %d\n", sb->s_inode_size); + fprintf(f, "Inode size: %d\n", sb->s_inode_size); + if (sb->s_min_extra_isize) + fprintf(f, "Required extra isize: %d\n", + sb->s_min_extra_isize); + if (sb->s_want_extra_isize) + fprintf(f, "Desired extra isize: %d\n", + sb->s_want_extra_isize); } if (!e2p_is_null_uuid(sb->s_journal_uuid)) fprintf(f, "Journal UUID: %s\n", diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1 index ffaa4aae4..6ad145e4d 100644 --- a/tests/m_dasd_bs/expect.1 +++ b/tests/m_dasd_bs/expect.1 @@ -52,7 +52,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1 index 6a6c8561f..e4a5877d7 100644 --- a/tests/m_large_file/expect.1 +++ b/tests/m_large_file/expect.1 @@ -50,7 +50,9 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 +Required extra isize: 24 +Desired extra isize: 24 Default directory hash: tea diff --git a/tests/m_lazy/expect.1 b/tests/m_lazy/expect.1 index 88bd5c67c..668f881af 100644 --- a/tests/m_lazy/expect.1 +++ b/tests/m_lazy/expect.1 @@ -50,7 +50,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_lazy_resize/expect.1 b/tests/m_lazy_resize/expect.1 index b1f6b5ef8..7a02c119b 100644 --- a/tests/m_lazy_resize/expect.1 +++ b/tests/m_lazy_resize/expect.1 @@ -52,7 +52,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1 index 95fb7082b..d9224a9b0 100644 --- a/tests/m_meta_bg/expect.1 +++ b/tests/m_meta_bg/expect.1 @@ -94,7 +94,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 index cec95afa9..a63358b7b 100644 --- a/tests/m_no_opt/expect.1 +++ b/tests/m_no_opt/expect.1 @@ -50,7 +50,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1 index 25b283a7c..9e1164bba 100644 --- a/tests/m_raid_opt/expect.1 +++ b/tests/m_raid_opt/expect.1 @@ -168,7 +168,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1 index 376d1882f..1139dab9f 100644 --- a/tests/m_std/expect.1 +++ b/tests/m_std/expect.1 @@ -52,7 +52,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1 index 26dc24401..ed57e42b6 100644 --- a/tests/m_uninit/expect.1 +++ b/tests/m_uninit/expect.1 @@ -52,7 +52,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/r_move_itable/expect b/tests/r_move_itable/expect index e5145531d..4078f2c19 100644 --- a/tests/r_move_itable/expect +++ b/tests/r_move_itable/expect @@ -41,7 +41,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea @@ -342,7 +342,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea @@ -879,7 +879,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea @@ -1652,7 +1652,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect index 129cdc408..f286f6fc7 100644 --- a/tests/r_resize_inode/expect +++ b/tests/r_resize_inode/expect @@ -39,7 +39,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea @@ -487,7 +487,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea @@ -644,7 +644,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Default directory hash: tea