On Mon, May 16, 2022 at 04:08:05PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Quota warning code has been removed from the upstream kernel and now
> returns -EINVAL errors. Seeing as we can't set warnings anymore and
> they have always been non-functional in the kernel, just remove the
> calls to set warnings filter those errors out so those tests pass
> again.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---
> tests/xfs/050 | 9 ---------
> tests/xfs/153 | 9 ---------
> tests/xfs/299 | 9 ---------
> 3 files changed, 27 deletions(-)
>
> diff --git a/tests/xfs/050 b/tests/xfs/050
> index 1847611b..2220e470 100755
> --- a/tests/xfs/050
> +++ b/tests/xfs/050
> @@ -84,9 +84,6 @@ _exercise()
> _qsetup $1
>
> echo "Using type=$type id=$id" >>$seqres.full
> -
> - $XFS_QUOTA_PROG -x -c "warn -$type 65535 -d" $SCRATCH_DEV
> -
> echo
> echo "*** report no quota settings" | tee -a $seqres.full
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> @@ -113,7 +110,6 @@ _exercise()
> _file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0
> _file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
I don't think we can revert this line from commit e5bbd47e
("xfs/{050,299}: clear quota warnings in between checks") because any
kernel released in the past two years will increment the warning
counter, and not resetting it to zero between tests means the golden
output will break.
We could, however, use more sed magic to force the warning counts in the
repquota output to be zero, which (I think) enables these changes to
move forward.
--D
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -122,8 +118,6 @@ _exercise()
> echo "*** push past the soft block limit" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/softie $id $type $bsize 300
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" \
> - -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -136,8 +130,6 @@ _exercise()
> _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
> done
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" \
> - -c "warn -i -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -149,7 +141,6 @@ _exercise()
> echo "ls -l $SCRATCH_MNT" >>$seqres.full
> ls -l $SCRATCH_MNT >>$seqres.full
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_and_check_blks | LC_COLLATE=POSIX sort -ru
> diff --git a/tests/xfs/153 b/tests/xfs/153
> index 8e1430c0..dbe26b68 100755
> --- a/tests/xfs/153
> +++ b/tests/xfs/153
> @@ -89,9 +89,6 @@ run_tests()
> _qsetup $1
>
> echo "Using type=$type id=$id" >>$seqres.full
> -
> - $XFS_QUOTA_PROG -x -c "warn -$type 65535 -d" $SCRATCH_DEV
> -
> echo
> echo "*** report no quota settings" | tee -a $seqres.full
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> @@ -122,7 +119,6 @@ run_tests()
> _file_as_id $SCRATCH_MNT/softie4 0 $type 1024 0
> _scratch_umount_idmapped
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -133,8 +129,6 @@ run_tests()
> _file_as_id $SCRATCH_MNT/softie 0 $type $bsize 300
> _scratch_umount_idmapped
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" \
> - -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -149,8 +143,6 @@ run_tests()
> _scratch_umount_idmapped
> done
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" \
> - -c "warn -i -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -164,7 +156,6 @@ run_tests()
> echo "ls -l $SCRATCH_MNT" >>$seqres.full
> ls -l $SCRATCH_MNT >>$seqres.full
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_and_check_blks | LC_COLLATE=POSIX sort -ru
> diff --git a/tests/xfs/299 b/tests/xfs/299
> index a3077b0c..4b9df3c6 100755
> --- a/tests/xfs/299
> +++ b/tests/xfs/299
> @@ -70,9 +70,6 @@ _exercise()
> _qsetup $1
>
> echo "Using type=$type id=$id" >>$seqres.full
> -
> - $XFS_QUOTA_PROG -x -c "warn -$type 65535 -d" $SCRATCH_DEV
> -
> echo
> echo "*** report no quota settings" | tee -a $seqres.full
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> @@ -99,7 +96,6 @@ _exercise()
> _file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0
> _file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -108,8 +104,6 @@ _exercise()
> echo "*** push past the soft block limit" | tee -a $seqres.full
> _file_as_id $SCRATCH_MNT/softie $id $type $bsize 200
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" \
> - -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -122,8 +116,6 @@ _exercise()
> _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
> done
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" \
> - -c "warn -i -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_quota_report | LC_COLLATE=POSIX sort -ru
> @@ -135,7 +127,6 @@ _exercise()
> echo "ls -l $SCRATCH_MNT" >>$seqres.full
> ls -l $SCRATCH_MNT >>$seqres.full
> _qmount
> - $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" $SCRATCH_DEV
> $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
> -c "repquota -birnN -$type" $SCRATCH_DEV |
> _filter_and_check_blks | LC_COLLATE=POSIX sort -ru
> --
> 2.35.1
>
