diff mbox series

[1/2] xfs/122: embiggen struct xfs_agi size for inobtcount feature

Message ID 160382542261.1203756.6377970904886103725.stgit@magnolia
State New
Headers show
Series xfs_db: add minimal directory navigation | expand

Commit Message

Darrick J. Wong Oct. 27, 2020, 7:03 p.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

Make the expected AGI size larger for the inobtcount feature.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/010     |    3 ++-
 tests/xfs/030     |    2 ++
 tests/xfs/122.out |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

Comments

Brian Foster Oct. 29, 2020, 5:39 p.m. UTC | #1
On Tue, Oct 27, 2020 at 12:03:42PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Make the expected AGI size larger for the inobtcount feature.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---

It would be nice for the commit log to have a sentence or two about the
other changes as well, but either way:

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  tests/xfs/010     |    3 ++-
>  tests/xfs/030     |    2 ++
>  tests/xfs/122.out |    2 +-
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/tests/xfs/010 b/tests/xfs/010
> index 1f9bcdff..95cc2555 100755
> --- a/tests/xfs/010
> +++ b/tests/xfs/010
> @@ -113,7 +113,8 @@ _check_scratch_fs
>  _corrupt_finobt_root $SCRATCH_DEV
>  
>  filter_finobt_repair() {
> -	sed -e '/^agi has bad CRC/d' | \
> +	sed -e '/^agi has bad CRC/d' \
> +	    -e '/^bad finobt block/d' | \
>  		_filter_repair_lostblocks
>  }
>  
> diff --git a/tests/xfs/030 b/tests/xfs/030
> index 04440f9c..906d9019 100755
> --- a/tests/xfs/030
> +++ b/tests/xfs/030
> @@ -44,6 +44,8 @@ _check_ag()
>  			    -e '/^bad agbno AGBNO for refcntbt/d' \
>  			    -e '/^agf has bad CRC/d' \
>  			    -e '/^agi has bad CRC/d' \
> +			    -e '/^bad inobt block count/d' \
> +			    -e '/^bad finobt block count/d' \
>  			    -e '/^Missing reverse-mapping record.*/d' \
>  			    -e '/^bad levels LEVELS for [a-z]* root.*/d' \
>  			    -e '/^unknown block state, ag AGNO, block.*/d'
> diff --git a/tests/xfs/122.out b/tests/xfs/122.out
> index cfe09c6d..b0773756 100644
> --- a/tests/xfs/122.out
> +++ b/tests/xfs/122.out
> @@ -113,7 +113,7 @@ sizeof(struct xfs_scrub_metadata) = 64
>  sizeof(struct xfs_unmount_log_format) = 8
>  sizeof(xfs_agf_t) = 224
>  sizeof(xfs_agfl_t) = 36
> -sizeof(xfs_agi_t) = 336
> +sizeof(xfs_agi_t) = 344
>  sizeof(xfs_alloc_key_t) = 8
>  sizeof(xfs_alloc_rec_incore_t) = 8
>  sizeof(xfs_alloc_rec_t) = 8
>
Darrick J. Wong Oct. 29, 2020, 8:27 p.m. UTC | #2
On Thu, Oct 29, 2020 at 01:39:20PM -0400, Brian Foster wrote:
> On Tue, Oct 27, 2020 at 12:03:42PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Make the expected AGI size larger for the inobtcount feature.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> 
> It would be nice for the commit log to have a sentence or two about the
> other changes as well, but either way:

I think I'll just make them a separate patch.

--D

> Reviewed-by: Brian Foster <bfoster@redhat.com>
> 
> >  tests/xfs/010     |    3 ++-
> >  tests/xfs/030     |    2 ++
> >  tests/xfs/122.out |    2 +-
> >  3 files changed, 5 insertions(+), 2 deletions(-)
> > 
> > 
> > diff --git a/tests/xfs/010 b/tests/xfs/010
> > index 1f9bcdff..95cc2555 100755
> > --- a/tests/xfs/010
> > +++ b/tests/xfs/010
> > @@ -113,7 +113,8 @@ _check_scratch_fs
> >  _corrupt_finobt_root $SCRATCH_DEV
> >  
> >  filter_finobt_repair() {
> > -	sed -e '/^agi has bad CRC/d' | \
> > +	sed -e '/^agi has bad CRC/d' \
> > +	    -e '/^bad finobt block/d' | \
> >  		_filter_repair_lostblocks
> >  }
> >  
> > diff --git a/tests/xfs/030 b/tests/xfs/030
> > index 04440f9c..906d9019 100755
> > --- a/tests/xfs/030
> > +++ b/tests/xfs/030
> > @@ -44,6 +44,8 @@ _check_ag()
> >  			    -e '/^bad agbno AGBNO for refcntbt/d' \
> >  			    -e '/^agf has bad CRC/d' \
> >  			    -e '/^agi has bad CRC/d' \
> > +			    -e '/^bad inobt block count/d' \
> > +			    -e '/^bad finobt block count/d' \
> >  			    -e '/^Missing reverse-mapping record.*/d' \
> >  			    -e '/^bad levels LEVELS for [a-z]* root.*/d' \
> >  			    -e '/^unknown block state, ag AGNO, block.*/d'
> > diff --git a/tests/xfs/122.out b/tests/xfs/122.out
> > index cfe09c6d..b0773756 100644
> > --- a/tests/xfs/122.out
> > +++ b/tests/xfs/122.out
> > @@ -113,7 +113,7 @@ sizeof(struct xfs_scrub_metadata) = 64
> >  sizeof(struct xfs_unmount_log_format) = 8
> >  sizeof(xfs_agf_t) = 224
> >  sizeof(xfs_agfl_t) = 36
> > -sizeof(xfs_agi_t) = 336
> > +sizeof(xfs_agi_t) = 344
> >  sizeof(xfs_alloc_key_t) = 8
> >  sizeof(xfs_alloc_rec_incore_t) = 8
> >  sizeof(xfs_alloc_rec_t) = 8
> > 
>
diff mbox series

Patch

diff --git a/tests/xfs/010 b/tests/xfs/010
index 1f9bcdff..95cc2555 100755
--- a/tests/xfs/010
+++ b/tests/xfs/010
@@ -113,7 +113,8 @@  _check_scratch_fs
 _corrupt_finobt_root $SCRATCH_DEV
 
 filter_finobt_repair() {
-	sed -e '/^agi has bad CRC/d' | \
+	sed -e '/^agi has bad CRC/d' \
+	    -e '/^bad finobt block/d' | \
 		_filter_repair_lostblocks
 }
 
diff --git a/tests/xfs/030 b/tests/xfs/030
index 04440f9c..906d9019 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -44,6 +44,8 @@  _check_ag()
 			    -e '/^bad agbno AGBNO for refcntbt/d' \
 			    -e '/^agf has bad CRC/d' \
 			    -e '/^agi has bad CRC/d' \
+			    -e '/^bad inobt block count/d' \
+			    -e '/^bad finobt block count/d' \
 			    -e '/^Missing reverse-mapping record.*/d' \
 			    -e '/^bad levels LEVELS for [a-z]* root.*/d' \
 			    -e '/^unknown block state, ag AGNO, block.*/d'
diff --git a/tests/xfs/122.out b/tests/xfs/122.out
index cfe09c6d..b0773756 100644
--- a/tests/xfs/122.out
+++ b/tests/xfs/122.out
@@ -113,7 +113,7 @@  sizeof(struct xfs_scrub_metadata) = 64
 sizeof(struct xfs_unmount_log_format) = 8
 sizeof(xfs_agf_t) = 224
 sizeof(xfs_agfl_t) = 36
-sizeof(xfs_agi_t) = 336
+sizeof(xfs_agi_t) = 344
 sizeof(xfs_alloc_key_t) = 8
 sizeof(xfs_alloc_rec_incore_t) = 8
 sizeof(xfs_alloc_rec_t) = 8