From 3fdb2899df7ec9d3a7d8e2e0ef2f31a1f34f4d08 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Tue, 21 Jul 2020 09:46:30 -0300 Subject: [PATCH] btrfs/210: Ignore output from "quota rescan" after "quota enable" Command "quota enable" triggers a quota rescan, but it can finish quick in some machines leading to the next command "quota rescan" to be able to start scanning again, and then printing "quota rescan started" making the test fail. In some machines this don't happen because the first rescan initiated by "quota enable" is still running when "quota rescan" is executed, returning -EINPROGRESS from ioctl BTRFS_IOC_QUOTA_RESCAN_STATUS and not printing the message. Ignoring any output from "quota rescan" solves the issue in both cases, and this is already being done by others tests as well. Signed-off-by: Marcos Paulo de Souza Reviewed-by: Filipe Manana Signed-off-by: Eryu Guan --- tests/btrfs/210 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/btrfs/210 b/tests/btrfs/210 index daa76a87..13d1a87b 100755 --- a/tests/btrfs/210 +++ b/tests/btrfs/210 @@ -46,7 +46,7 @@ _pwrite_byte 0xcd 0 16M "$SCRATCH_MNT/src/file" > /dev/null # by qgroup sync $BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" -$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null $BTRFS_UTIL_PROG qgroup create 1/0 "$SCRATCH_MNT" # Create a snapshot with qgroup inherit -- 2.30.2