On Mon, May 06, 2024 at 05:01:17PM +0200, Pankaj Raghav (Samsung) wrote: > From: Pankaj Raghav <p.raghav@xxxxxxxxxxx> > > This test fails when xfs is formatted with 64k filesystem block size*. > It fails because the soft quota is not exceeded with the hardcoded 64k > pwrite, thereby, the grace time is not set. Even though soft quota is > set to 12k for uid1, it is rounded up to the nearest blocksize. > > *** Report for user quotas on device /dev/sdb3 > Block grace time: 7days; Inode grace time: 7days > Block limits File limits > User used soft hard grace used soft hard grace > ---------------------------------------------------------------------- > 0 -- 0 0 0 0 3 0 0 0 > 1 -- 64 64 1024 0 1 0 0 0 > 2 -- 64 0 0 0 1 0 0 0 > > Adapt the pwrite to do more than 64k write when the FS blocksize is 64k. > > Cap the blksz to be at least 64k to retain the same behaviour as before > for smaller filesystem blocksizes. > > * This happens even on a 64k pagesize system and it is not related to > LBS effort. > > Signed-off-by: Pankaj Raghav <p.raghav@xxxxxxxxxxx> > --- > tests/xfs/161 | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/tests/xfs/161 b/tests/xfs/161 > index 486fa6ca..94290f18 100755 > --- a/tests/xfs/161 > +++ b/tests/xfs/161 > @@ -38,9 +38,15 @@ _qmount_option "usrquota" > _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > _scratch_mount >> $seqres.full > > +min_blksz=65536 > +file_blksz=$(_get_file_block_size "$SCRATCH_MNT") > +# Write more than one block to exceed the soft block quota limit. > +blksz=$(( 2 * $file_blksz)) > + > +blksz=$(( blksz > min_blksz ? blksz : min_blksz )) If we don't set $min_blksize and always write (2 * $file_blksz) does the test still work? --D > # Force the block counters for uid 1 and 2 above zero > -_pwrite_byte 0x61 0 64k $SCRATCH_MNT/a >> $seqres.full > -_pwrite_byte 0x61 0 64k $SCRATCH_MNT/b >> $seqres.full > +_pwrite_byte 0x61 0 $blksz $SCRATCH_MNT/a >> $seqres.full > +_pwrite_byte 0x61 0 $blksz $SCRATCH_MNT/b >> $seqres.full > sync > chown 1 $SCRATCH_MNT/a > chown 2 $SCRATCH_MNT/b > -- > 2.34.1 >
