Re: [PATCH 4/6] xfs/220: avoid failure when disabling quota accounting is not supported

Darrick J. Wong
2021-07-14T23:30:50Z

On Mon, Jul 12, 2021 at 01:11:44PM +0200, Christoph Hellwig wrote:
> Doing a proper _requires for quotaoff support is rather hard, as we need
> to test it on a specific file system. Instead just use sed to remove
> the warning and let the test case pass. Eventually it should just be
> removed entirely.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> tests/xfs/220 | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/tests/xfs/220 b/tests/xfs/220
> index 8d955225..c847a0dc 100755
> --- a/tests/xfs/220
> +++ b/tests/xfs/220
> @@ -54,7 +54,12 @@ _scratch_mount -o uquota
>
> # turn off quota and remove space allocated to the quota files
> # (this used to give wrong ENOSYS returns in 2.6.31)
> -xfs_quota -x -c off -c remove $SCRATCH_DEV
> +#
> +# The sed expression below replaces a notrun to cater for kernels that have
> +# removed the ability to disable quota accounting at runtime. On those
> +# kernel this test is rather useless, and in a few years we can drop it.
> +xfs_quota -x -c off -c remove $SCRATCH_DEV 2>&1 | \

Please replace 'xfs_quota' with '$XFS_QUOTA_PROG' in all these tests
you're touching.

> + sed -e '/XFS_QUOTARM: Invalid argument/d'

Between 'off' and 'remove', which one returned EINVAL?

--D

>
> # and unmount again
> _scratch_unmount
> --
> 2.30.2
>