[PATCH] Fix tst_super_size after ext2_super_block changes

[PATCH] Fix tst_super_size after ext2_super_block changes

[Artem Blagodarenko]

Commits "Reserve feature bit and SB field bit for filename encoding"
and "Add timestamp extension bits to superblock" change
ext2_super_block structure, but don't change tst_super_size test,
so "make check" fails with message:

error: s_reserved size 380 should be 392

Signed-off-by: Artem Blagodarenko <artem.blagodarenko@gmail.com>
---
 lib/ext2fs/tst_super_size.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/ext2fs/tst_super_size.c b/lib/ext2fs/tst_super_size.c
index 0adac411..a932685d 100644
--- a/lib/ext2fs/tst_super_size.c
+++ b/lib/ext2fs/tst_super_size.c
@@ -142,7 +142,16 @@ int main(int argc, char **argv)
 	check_field(s_lpf_ino, 4);
 	check_field(s_prj_quota_inum, 4);
 	check_field(s_checksum_seed, 4);
-	check_field(s_reserved, 98 * 4);
+	check_field(s_wtime_hi, 1);
+	check_field(s_mtime_hi, 1);
+	check_field(s_mkfs_time_hi, 1);
+	check_field(s_lastcheck_hi, 1);
+	check_field(s_first_error_time_hi, 1);
+	check_field(s_last_error_time_hi, 1);
+	check_field(s_pad, 2);
+	check_field(s_encoding, 2);
+	check_field(s_encoding_flags, 2);
+	check_field(s_reserved, 95 * 4);
 	check_field(s_checksum, 4);
 	do_field("Superblock end", 0, 0, cur_offset, 1024);
 #endif
-- 
2.14.3

Re: [PATCH] Fix tst_super_size after ext2_super_block changes

[Andreas Dilger]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

On Nov 28, 2018, at 9:08 AM, Artem Blagodarenko <artem.blagodarenko@gmail.com> wrote:
> 
> Commits "Reserve feature bit and SB field bit for filename encoding"
> and "Add timestamp extension bits to superblock" change
> ext2_super_block structure, but don't change tst_super_size test,
> so "make check" fails with message:
> 
> error: s_reserved size 380 should be 392

How did these patches even land without "make check" being run once?
Does this test failure not cause "make check" to fail?

Anyway, you can add:

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> Signed-off-by: Artem Blagodarenko <artem.blagodarenko@gmail.com>
> ---
> lib/ext2fs/tst_super_size.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/ext2fs/tst_super_size.c b/lib/ext2fs/tst_super_size.c
> index 0adac411..a932685d 100644
> --- a/lib/ext2fs/tst_super_size.c
> +++ b/lib/ext2fs/tst_super_size.c
> @@ -142,7 +142,16 @@ int main(int argc, char **argv)
> 	check_field(s_lpf_ino, 4);
> 	check_field(s_prj_quota_inum, 4);
> 	check_field(s_checksum_seed, 4);
> -	check_field(s_reserved, 98 * 4);
> +	check_field(s_wtime_hi, 1);
> +	check_field(s_mtime_hi, 1);
> +	check_field(s_mkfs_time_hi, 1);
> +	check_field(s_lastcheck_hi, 1);
> +	check_field(s_first_error_time_hi, 1);
> +	check_field(s_last_error_time_hi, 1);
> +	check_field(s_pad, 2);
> +	check_field(s_encoding, 2);
> +	check_field(s_encoding_flags, 2);
> +	check_field(s_reserved, 95 * 4);
> 	check_field(s_checksum, 4);
> 	do_field("Superblock end", 0, 0, cur_offset, 1024);
> #endif
> --
> 2.14.3
> 


Cheers, Andreas






[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]

Re: [PATCH] Fix tst_super_size after ext2_super_block changes

[Theodore Y. Ts'o]

On Wed, Nov 28, 2018 at 12:09:26PM -0700, Andreas Dilger wrote:
> On Nov 28, 2018, at 9:08 AM, Artem Blagodarenko <artem.blagodarenko@gmail.com> wrote:
> > 
> > Commits "Reserve feature bit and SB field bit for filename encoding"
> > and "Add timestamp extension bits to superblock" change
> > ext2_super_block structure, but don't change tst_super_size test,
> > so "make check" fails with message:
> > 
> > error: s_reserved size 380 should be 392
> 
> How did these patches even land without "make check" being run once?
> Does this test failure not cause "make check" to fail?

My bad; I failed to run the make check before pushing it out.  I fixed
this before seeing Artem's patch, and the fix was what he pushed out.

     	    	   	   	      - Ted