fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nikolay Borisov <nborisov@suse.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag
Date: Mon, 17 Aug 2020 13:37:18 +0300	[thread overview]
Message-ID: <20200817103718.10239-3-nborisov@suse.com> (raw)
In-Reply-To: <20200817103718.10239-1-nborisov@suse.com>

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 <nborisov@suse.com>
---
 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 af3352212170..bca1dc5c0b3b 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 bc24f1fb8be3..15bdf79e7bfb 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.17.1


  parent reply	other threads:[~2020-08-17 10:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-17 10:37 [PATCH 1/3] btrfs/024: Remove no longer valid test Nikolay Borisov
2020-08-17 10:37 ` [PATCH 2/3] btrfs/173: Adjust compress file check Nikolay Borisov
2020-08-17 10:47   ` Anand Jain
2020-08-17 10:37 ` Nikolay Borisov [this message]
2020-08-17 10:49   ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Anand Jain
2020-08-17 14:24   ` Marcos Paulo de Souza
2020-08-17 12:20 ` [PATCH 1/3] btrfs/024: Remove no longer valid test Nikolay Borisov
2020-08-17 13:40 ` [PATCH v2] " Nikolay Borisov
2020-08-17 14:17   ` Marcos Paulo de Souza
2020-08-30 16:08   ` Eryu Guan
2020-08-30 19:30     ` Nikolay Borisov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200817103718.10239-3-nborisov@suse.com \
    --to=nborisov@suse.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).