| Message ID | 172912045624.2583984.16971966548333767345.stgit@frogsfrogsfrogs (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] common/xfs: _notrun tests that fail due to block size < sector size | expand |
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Wed, Oct 16, 2024 at 04:15:32PM -0700, Darrick J. Wong wrote: > From: Pankaj Raghav <p.raghav@samsung.com> > > This test fails for >= 64k filesystem block size on a 4k PAGE_SIZE > system(see LBS efforts[1]). Adapt the blksz so that we create more than > one block for the testcase. > > Cap the blksz to be at least 64k to retain the same behaviour as before > for smaller filesystem blocksizes. > > [1] LBS effort: https://lore.kernel.org/lkml/20230915183848.1018717-1-kernel@pankajraghav.com/ > > Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> > Reviewed-by: Darrick J. Wong <djwong@kernel.org> > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/xfs/161 | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > > diff --git a/tests/xfs/161 b/tests/xfs/161 > index 002ee7d800dcf1..948121c0569484 100755 > --- a/tests/xfs/161 > +++ b/tests/xfs/161 > @@ -37,7 +37,11 @@ _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > _scratch_mount >> $seqres.full > > > -blksz=$(_get_file_block_size "$SCRATCH_MNT") > +min_blksz=65536 > +file_blksz=$(_get_file_block_size "$SCRATCH_MNT") > +blksz=$(( 2 * $file_blksz)) > + > +blksz=$(( blksz > min_blksz ? blksz : min_blksz )) Just to be curious, is there any machine with pagesize bigger than 65536 :) Reviewed-by: Zorro Lang <zlang@redhat.com> > # Write more than one block to exceed the soft block quota limit via > # xfs_quota. > filesz=$(( 2 * $blksz)) >
diff --git a/tests/xfs/161 b/tests/xfs/161 index 002ee7d800dcf1..948121c0569484 100755 --- a/tests/xfs/161 +++ b/tests/xfs/161 @@ -37,7 +37,11 @@ _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full _scratch_mount >> $seqres.full -blksz=$(_get_file_block_size "$SCRATCH_MNT") +min_blksz=65536 +file_blksz=$(_get_file_block_size "$SCRATCH_MNT") +blksz=$(( 2 * $file_blksz)) + +blksz=$(( blksz > min_blksz ? blksz : min_blksz )) # Write more than one block to exceed the soft block quota limit via # xfs_quota. filesz=$(( 2 * $blksz))