From 1781a22507a4b621d2e26e0e970be864bfe4adae Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Mon, 17 Aug 2020 13:37:18 +0300 Subject: [PATCH] btrfs/174: Adjust error message when setting compressed flag Following kernel commit "btrfs: add missing check for nocow and compression inode flags" btrfs refuses setting +c on +C files during validation of the args. Account for this by adjusting the expected error message. Signed-off-by: Nikolay Borisov Reviewed-by: Anand Jain Reviewed-by: Marcos Paulo de Souza Signed-off-by: Eryu Guan --- tests/btrfs/174 | 2 +- tests/btrfs/174.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/btrfs/174 b/tests/btrfs/174 index af335221..bca1dc5c 100755 --- a/tests/btrfs/174 +++ b/tests/btrfs/174 @@ -47,7 +47,7 @@ $LSATTR_PROG -l "$swapfile" | _filter_scratch | _filter_spaces # Compression we reject outright. echo "Enable compression" -$CHATTR_PROG +c "$swapfile" 2>&1 | grep -o "Text file busy" +$CHATTR_PROG +c "$swapfile" 2>&1 | grep -o "Invalid argument while setting flags" $LSATTR_PROG -l "$swapfile" | _filter_scratch | _filter_spaces echo "Snapshot" diff --git a/tests/btrfs/174.out b/tests/btrfs/174.out index bc24f1fb..15bdf79e 100644 --- a/tests/btrfs/174.out +++ b/tests/btrfs/174.out @@ -2,7 +2,7 @@ QA output created by 174 Disable nocow SCRATCH_MNT/swapvol/swap No_COW Enable compression -Text file busy +Invalid argument while setting flags SCRATCH_MNT/swapvol/swap No_COW Snapshot Text file busy -- 2.30.2