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" <tytso@mit.edu>

diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index d249f88b16ffde1e84d6a99487fd2d829e8a562f..b1196068d11f0f5660aa7383757ad78d8023be93 100644 (file)
--- 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 ffaa4aae4521d0ef6876471d6f95c94fc4f5b338..6ad145e4d0e5c4377e12e298f967d52185ed80cc 100644 (file)
--- 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 6a6c8561f53244ef15d83246ad25f1e6ee8bb838..e4a5877d750eec13598615b51175c431d8951f4c 100644 (file)
--- 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 88bd5c67c2559f832caf846bb7e15673beb8b117..668f881af01efdd156363617418a4b35c2edb67e 100644 (file)
--- 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 b1f6b5ef8b0d09812a198773d583db32a746de7c..7a02c119b975ef607a5c4472a97c43b74571793e 100644 (file)
--- 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 95fb7082b705fe8f2eebe3444acf647641c0e53c..d9224a9b0e27421fc59f7e25aa2f4b4bf70b2c9d 100644 (file)
--- 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 cec95afa9af9e5d4e287f90541ddbcea01aeb3f4..a63358b7be6844a3b2dde4bc05a75e3731fdea9b 100644 (file)
--- 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 25b283a7cabf0aa946a5b7af4770f05e33d58ebc..9e1164bba7aa76dd429adbbb624be76f13991641 100644 (file)
--- 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 376d1882f14384605942f786098526d4eec39bc4..1139dab9f258cde94d5b8d7973f8956bc599644f 100644 (file)
--- 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 26dc24401bad057fd8ccf5804832dd814326058c..ed57e42b66492d5a8d00e79d4808c94674916ba1 100644 (file)
--- 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 e5145531d696ff2ed8bb114df00b431e77df1b28..4078f2c192b725f445f0cf50a23f1929b8400bf2 100644 (file)
--- 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 129cdc40814066a719a3df6de4bbd2c1566d0c9e..f286f6fc72fd6bfc9a7f4dda9ef0abde3147da1a 100644 (file)
--- 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