| Message ID | 20240408133243.694134-4-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] xfs: remove support for tools and kernels with v5 support | expand |
On Mon, Apr 08, 2024 at 03:32:40PM +0200, Christoph Hellwig wrote: > 512 byte block sizes are only supported for v4 file systems, and > xfs/078 crudely forces use of v4 file systems for it. This doesn't > work if the kernel is built without v4 support. Given that v4 > support is slowly being phased out and 512 byte block sizes have never > been common, drop this part of the test. I've long wondered just how many people actually used that blocksize... > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > tests/xfs/078 | 9 ++------- > tests/xfs/078.out | 18 ------------------ > 2 files changed, 2 insertions(+), 25 deletions(-) > > diff --git a/tests/xfs/078 b/tests/xfs/078 > index 1f475c963..501551e5e 100755 > --- a/tests/xfs/078 > +++ b/tests/xfs/078 > @@ -69,12 +69,8 @@ _grow_loop() > echo > > echo "*** mkfs loop file (size=$original)" > - mkfs_crc_opts="" > - if [ $bsize -lt 1024 -a -z "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then > - mkfs_crc_opts="-m crc=0" > - fi ...because this was particularly nasty. Why wouldn't this test have skipped this iteration if the fs config doesn't support 512 blocksizes? Who cares. Anyway, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > - $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize $dparam $LOOP_DEV \ > - | _filter_mkfs 2>/dev/null > + $MKFS_XFS_PROG -b size=$bsize $dparam $LOOP_DEV | \ > + _filter_mkfs 2>/dev/null > > echo "*** extend loop file" > _destroy_loop_device $LOOP_DEV > @@ -104,7 +100,6 @@ _grow_loop $((168024*4096)) 1376452608 4096 1 > > # Some other blocksize cases... > _grow_loop $((168024*2048)) 1376452608 2048 1 > -_grow_loop $((168024*512)) 1376452608 512 1 16m > _grow_loop $((168024*1024)) 688230400 1024 1 > > # Other corner cases suggested by dgc > diff --git a/tests/xfs/078.out b/tests/xfs/078.out > index cc3c47d13..7bf5ed03e 100644 > --- a/tests/xfs/078.out > +++ b/tests/xfs/078.out > @@ -37,24 +37,6 @@ data blocks changed from 168024 to 672096 > *** unmount > *** check > > -=== GROWFS (from 86028288 to 1376452608, 512 blocksize) > - > -*** mkfs loop file (size=86028288) > -meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks > -data = bsize=XXX blocks=XXX, imaxpct=PCT > - = sunit=XXX swidth=XXX, unwritten=X > -naming =VERN bsize=XXX > -log =LDEV bsize=XXX blocks=XXX > -realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX > -*** extend loop file > -wrote 512/512 bytes at offset 1376452608 > -*** mount loop filesystem > -*** grow loop filesystem > -xfs_growfs --BlockSize=512 --Blocks=163840 > -data blocks changed from 163840 to 2688384 > -*** unmount > -*** check > - > === GROWFS (from 172056576 to 688230400, 1024 blocksize) > > *** mkfs loop file (size=172056576) > -- > 2.39.2 > >
diff --git a/tests/xfs/078 b/tests/xfs/078 index 1f475c963..501551e5e 100755 --- a/tests/xfs/078 +++ b/tests/xfs/078 @@ -69,12 +69,8 @@ _grow_loop() echo echo "*** mkfs loop file (size=$original)" - mkfs_crc_opts="" - if [ $bsize -lt 1024 -a -z "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then - mkfs_crc_opts="-m crc=0" - fi - $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize $dparam $LOOP_DEV \ - | _filter_mkfs 2>/dev/null + $MKFS_XFS_PROG -b size=$bsize $dparam $LOOP_DEV | \ + _filter_mkfs 2>/dev/null echo "*** extend loop file" _destroy_loop_device $LOOP_DEV @@ -104,7 +100,6 @@ _grow_loop $((168024*4096)) 1376452608 4096 1 # Some other blocksize cases... _grow_loop $((168024*2048)) 1376452608 2048 1 -_grow_loop $((168024*512)) 1376452608 512 1 16m _grow_loop $((168024*1024)) 688230400 1024 1 # Other corner cases suggested by dgc diff --git a/tests/xfs/078.out b/tests/xfs/078.out index cc3c47d13..7bf5ed03e 100644 --- a/tests/xfs/078.out +++ b/tests/xfs/078.out @@ -37,24 +37,6 @@ data blocks changed from 168024 to 672096 *** unmount *** check -=== GROWFS (from 86028288 to 1376452608, 512 blocksize) - -*** mkfs loop file (size=86028288) -meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks -data = bsize=XXX blocks=XXX, imaxpct=PCT - = sunit=XXX swidth=XXX, unwritten=X -naming =VERN bsize=XXX -log =LDEV bsize=XXX blocks=XXX -realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX -*** extend loop file -wrote 512/512 bytes at offset 1376452608 -*** mount loop filesystem -*** grow loop filesystem -xfs_growfs --BlockSize=512 --Blocks=163840 -data blocks changed from 163840 to 2688384 -*** unmount -*** check - === GROWFS (from 172056576 to 688230400, 1024 blocksize) *** mkfs loop file (size=172056576)
512 byte block sizes are only supported for v4 file systems, and xfs/078 crudely forces use of v4 file systems for it. This doesn't work if the kernel is built without v4 support. Given that v4 support is slowly being phased out and 512 byte block sizes have never been common, drop this part of the test. Signed-off-by: Christoph Hellwig <hch@lst.de> --- tests/xfs/078 | 9 ++------- tests/xfs/078.out | 18 ------------------ 2 files changed, 2 insertions(+), 25 deletions(-)