* [PATCH 1/3] btrfs/024: Remove no longer valid test
@ 2020-08-17 10:37 Nikolay Borisov
2020-08-17 10:37 ` [PATCH 2/3] btrfs/173: Adjust compress file check Nikolay Borisov
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-17 10:37 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Nikolay Borisov
Kernel commit "btrfs: add missing check for nocow and compression inode
flags" invalidates the "file compressed, fs mounted with nodatacow"
mode due to doing more rigorous flags validation, just remove the test.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
tests/btrfs/024 | 7 -------
1 file changed, 7 deletions(-)
diff --git a/tests/btrfs/024 b/tests/btrfs/024
index 0c2ffd7389ab..bcb9048da636 100755
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -42,13 +42,6 @@ __workout()
$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
}
-echo "*** test nodatacow"
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount "-o nodatacow"
-__workout
-_scratch_unmount
-_check_scratch_fs
-
echo "*** test compress=no"
_scratch_mkfs > /dev/null 2>&1
_scratch_mount "-o compress=no"
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] btrfs/173: Adjust compress file check
2020-08-17 10:37 [PATCH 1/3] btrfs/024: Remove no longer valid test Nikolay Borisov
@ 2020-08-17 10:37 ` Nikolay Borisov
2020-08-17 10:47 ` Anand Jain
2020-08-17 10:37 ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Nikolay Borisov
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-17 10:37 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Nikolay Borisov
Following kernel commit "btrfs: add missing check for nocow and
compression inode flags" the enforcement of "can't set +c on a +C" file
has been moved to the ioctl code. Modify the test to account for this.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
tests/btrfs/173 | 4 +---
tests/btrfs/173.out | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/btrfs/173 b/tests/btrfs/173
index 515d8cfa0994..c427320ad664 100755
--- a/tests/btrfs/173
+++ b/tests/btrfs/173
@@ -48,9 +48,7 @@ swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
echo "Compressed file"
rm -f "$SCRATCH_MNT/swap"
_format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10))
-$CHATTR_PROG +c "$SCRATCH_MNT/swap"
-swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch
-swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
+$CHATTR_PROG +c "$SCRATCH_MNT/swap" 2>&1 | grep -o "Invalid argument while setting flags"
status=0
exit
diff --git a/tests/btrfs/173.out b/tests/btrfs/173.out
index 6d7856bf9e02..2920384045ad 100644
--- a/tests/btrfs/173.out
+++ b/tests/btrfs/173.out
@@ -2,4 +2,4 @@ QA output created by 173
COW file
swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument
Compressed file
-swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument
+Invalid argument while setting flags
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag
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:37 ` Nikolay Borisov
2020-08-17 10:49 ` 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
3 siblings, 2 replies; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-17 10:37 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Nikolay Borisov
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] btrfs/173: Adjust compress file check
2020-08-17 10:37 ` [PATCH 2/3] btrfs/173: Adjust compress file check Nikolay Borisov
@ 2020-08-17 10:47 ` Anand Jain
0 siblings, 0 replies; 11+ messages in thread
From: Anand Jain @ 2020-08-17 10:47 UTC (permalink / raw)
To: Nikolay Borisov, fstests; +Cc: linux-btrfs
On 17/8/20 6:37 pm, Nikolay Borisov wrote:
> Following kernel commit "btrfs: add missing check for nocow and
> compression inode flags"
Can you add this to the test case header.
Otherwise looks good.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
> the enforcement of "can't set +c on a +C" file
> has been moved to the ioctl code. Modify the test to account for this.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
> tests/btrfs/173 | 4 +---
> tests/btrfs/173.out | 2 +-
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/tests/btrfs/173 b/tests/btrfs/173
> index 515d8cfa0994..c427320ad664 100755
> --- a/tests/btrfs/173
> +++ b/tests/btrfs/173
> @@ -48,9 +48,7 @@ swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
> echo "Compressed file"
> rm -f "$SCRATCH_MNT/swap"
> _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10))
> -$CHATTR_PROG +c "$SCRATCH_MNT/swap"
> -swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch
> -swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
> +$CHATTR_PROG +c "$SCRATCH_MNT/swap" 2>&1 | grep -o "Invalid argument while setting flags"
>
> status=0
> exit
> diff --git a/tests/btrfs/173.out b/tests/btrfs/173.out
> index 6d7856bf9e02..2920384045ad 100644
> --- a/tests/btrfs/173.out
> +++ b/tests/btrfs/173.out
> @@ -2,4 +2,4 @@ QA output created by 173
> COW file
> swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument
> Compressed file
> -swapon: SCRATCH_MNT/swap: swapon failed: Invalid argument
> +Invalid argument while setting flags
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag
2020-08-17 10:37 ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Nikolay Borisov
@ 2020-08-17 10:49 ` Anand Jain
2020-08-17 14:24 ` Marcos Paulo de Souza
1 sibling, 0 replies; 11+ messages in thread
From: Anand Jain @ 2020-08-17 10:49 UTC (permalink / raw)
To: Nikolay Borisov, fstests; +Cc: linux-btrfs
On 17/8/20 6:37 pm, Nikolay Borisov wrote:
> Following kernel commit "btrfs: add missing check for nocow and
> compression inode flags"
Here too, can you pls add this to the test case header.
Otherwise looks good.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
> 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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] btrfs/024: Remove no longer valid test
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:37 ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Nikolay Borisov
@ 2020-08-17 12:20 ` Nikolay Borisov
2020-08-17 13:40 ` [PATCH v2] " Nikolay Borisov
3 siblings, 0 replies; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-17 12:20 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs
On 17.08.20 г. 13:37 ч., Nikolay Borisov wrote:
> Kernel commit "btrfs: add missing check for nocow and compression inode
> flags" invalidates the "file compressed, fs mounted with nodatacow"
> mode due to doing more rigorous flags validation, just remove the test.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
This patch is missing the removal of the respective output from 024.out.
I'll be sending a fixed up version later.
> ---
> tests/btrfs/024 | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/tests/btrfs/024 b/tests/btrfs/024
> index 0c2ffd7389ab..bcb9048da636 100755
> --- a/tests/btrfs/024
> +++ b/tests/btrfs/024
> @@ -42,13 +42,6 @@ __workout()
> $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
> }
>
> -echo "*** test nodatacow"
> -_scratch_mkfs > /dev/null 2>&1
> -_scratch_mount "-o nodatacow"
> -__workout
> -_scratch_unmount
> -_check_scratch_fs
> -
> echo "*** test compress=no"
> _scratch_mkfs > /dev/null 2>&1
> _scratch_mount "-o compress=no"
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] btrfs/024: Remove no longer valid test
2020-08-17 10:37 [PATCH 1/3] btrfs/024: Remove no longer valid test Nikolay Borisov
` (2 preceding siblings ...)
2020-08-17 12:20 ` [PATCH 1/3] btrfs/024: Remove no longer valid test Nikolay Borisov
@ 2020-08-17 13:40 ` Nikolay Borisov
2020-08-17 14:17 ` Marcos Paulo de Souza
2020-08-30 16:08 ` Eryu Guan
3 siblings, 2 replies; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-17 13:40 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Nikolay Borisov
Kernel commit "btrfs: add missing check for nocow and compression inode
flags" invalidates the "file compressed, fs mounted with nodatacow"
mode due to doing more rigorous flags validation, just remove the test.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
V2:
* Also remove the output
tests/btrfs/024 | 7 -------
tests/btrfs/024.out | 3 ---
2 files changed, 10 deletions(-)
diff --git a/tests/btrfs/024 b/tests/btrfs/024
index 0c2ffd7389ab..bcb9048da636 100755
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -42,13 +42,6 @@ __workout()
$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
}
-echo "*** test nodatacow"
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount "-o nodatacow"
-__workout
-_scratch_unmount
-_check_scratch_fs
-
echo "*** test compress=no"
_scratch_mkfs > /dev/null 2>&1
_scratch_mount "-o compress=no"
diff --git a/tests/btrfs/024.out b/tests/btrfs/024.out
index 7eacb0aca674..33c4f49366fd 100644
--- a/tests/btrfs/024.out
+++ b/tests/btrfs/024.out
@@ -1,7 +1,4 @@
QA output created by 024
-*** test nodatacow
-wrote 1048576/1048576 bytes at offset 0
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
*** test compress=no
wrote 1048576/1048576 bytes at offset 0
XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2] btrfs/024: Remove no longer valid test
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
1 sibling, 0 replies; 11+ messages in thread
From: Marcos Paulo de Souza @ 2020-08-17 14:17 UTC (permalink / raw)
To: Nikolay Borisov, fstests; +Cc: linux-btrfs
On Mon, 2020-08-17 at 16:40 +0300, Nikolay Borisov wrote:
> Kernel commit "btrfs: add missing check for nocow and compression
> inode
> flags" invalidates the "file compressed, fs mounted with nodatacow"
> mode due to doing more rigorous flags validation, just remove the
> test
LGTM, so:
Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com>
> .
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
> V2:
> * Also remove the output
>
> tests/btrfs/024 | 7 -------
> tests/btrfs/024.out | 3 ---
> 2 files changed, 10 deletions(-)
>
> diff --git a/tests/btrfs/024 b/tests/btrfs/024
> index 0c2ffd7389ab..bcb9048da636 100755
> --- a/tests/btrfs/024
> +++ b/tests/btrfs/024
> @@ -42,13 +42,6 @@ __workout()
> $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file |
> _filter_xfs_io
> }
>
> -echo "*** test nodatacow"
> -_scratch_mkfs > /dev/null 2>&1
> -_scratch_mount "-o nodatacow"
> -__workout
> -_scratch_unmount
> -_check_scratch_fs
> -
> echo "*** test compress=no"
> _scratch_mkfs > /dev/null 2>&1
> _scratch_mount "-o compress=no"
> diff --git a/tests/btrfs/024.out b/tests/btrfs/024.out
> index 7eacb0aca674..33c4f49366fd 100644
> --- a/tests/btrfs/024.out
> +++ b/tests/btrfs/024.out
> @@ -1,7 +1,4 @@
> QA output created by 024
> -*** test nodatacow
> -wrote 1048576/1048576 bytes at offset 0
> -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> *** test compress=no
> wrote 1048576/1048576 bytes at offset 0
> XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag
2020-08-17 10:37 ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Nikolay Borisov
2020-08-17 10:49 ` Anand Jain
@ 2020-08-17 14:24 ` Marcos Paulo de Souza
1 sibling, 0 replies; 11+ messages in thread
From: Marcos Paulo de Souza @ 2020-08-17 14:24 UTC (permalink / raw)
To: Nikolay Borisov, fstests; +Cc: linux-btrfs
On Mon, 2020-08-17 at 13:37 +0300, Nikolay Borisov wrote:
> 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.
LGTM, so
Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com>
>
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] btrfs/024: Remove no longer valid test
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
1 sibling, 1 reply; 11+ messages in thread
From: Eryu Guan @ 2020-08-30 16:08 UTC (permalink / raw)
To: Nikolay Borisov; +Cc: fstests, linux-btrfs
Hi Nikolay,
On Mon, Aug 17, 2020 at 04:40:26PM +0300, Nikolay Borisov wrote:
> Kernel commit "btrfs: add missing check for nocow and compression inode
> flags" invalidates the "file compressed, fs mounted with nodatacow"
> mode due to doing more rigorous flags validation, just remove the test.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
I applied this patch, but left patch 2 and 3, as Anand suggested minor
updates, and I assume you'll send new version of patch 2 and 3 :)
Thanks,
Eryu
> ---
> V2:
> * Also remove the output
>
> tests/btrfs/024 | 7 -------
> tests/btrfs/024.out | 3 ---
> 2 files changed, 10 deletions(-)
>
> diff --git a/tests/btrfs/024 b/tests/btrfs/024
> index 0c2ffd7389ab..bcb9048da636 100755
> --- a/tests/btrfs/024
> +++ b/tests/btrfs/024
> @@ -42,13 +42,6 @@ __workout()
> $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
> }
>
> -echo "*** test nodatacow"
> -_scratch_mkfs > /dev/null 2>&1
> -_scratch_mount "-o nodatacow"
> -__workout
> -_scratch_unmount
> -_check_scratch_fs
> -
> echo "*** test compress=no"
> _scratch_mkfs > /dev/null 2>&1
> _scratch_mount "-o compress=no"
> diff --git a/tests/btrfs/024.out b/tests/btrfs/024.out
> index 7eacb0aca674..33c4f49366fd 100644
> --- a/tests/btrfs/024.out
> +++ b/tests/btrfs/024.out
> @@ -1,7 +1,4 @@
> QA output created by 024
> -*** test nodatacow
> -wrote 1048576/1048576 bytes at offset 0
> -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> *** test compress=no
> wrote 1048576/1048576 bytes at offset 0
> XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> --
> 2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] btrfs/024: Remove no longer valid test
2020-08-30 16:08 ` Eryu Guan
@ 2020-08-30 19:30 ` Nikolay Borisov
0 siblings, 0 replies; 11+ messages in thread
From: Nikolay Borisov @ 2020-08-30 19:30 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-btrfs
On 30.08.20 г. 19:08 ч., Eryu Guan wrote:
> Hi Nikolay,
>
> On Mon, Aug 17, 2020 at 04:40:26PM +0300, Nikolay Borisov wrote:
>> Kernel commit "btrfs: add missing check for nocow and compression inode
>> flags" invalidates the "file compressed, fs mounted with nodatacow"
>> mode due to doing more rigorous flags validation, just remove the test.
>>
>> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
>
> I applied this patch, but left patch 2 and 3, as Anand suggested minor
> updates, and I assume you'll send new version of patch 2 and 3 :)
Please merge the patches as is, I don't intend on sending v2.
>
> Thanks,
> Eryu
>
>> ---
>> V2:
>> * Also remove the output
>>
>> tests/btrfs/024 | 7 -------
>> tests/btrfs/024.out | 3 ---
>> 2 files changed, 10 deletions(-)
>>
>> diff --git a/tests/btrfs/024 b/tests/btrfs/024
>> index 0c2ffd7389ab..bcb9048da636 100755
>> --- a/tests/btrfs/024
>> +++ b/tests/btrfs/024
>> @@ -42,13 +42,6 @@ __workout()
>> $XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $work_file | _filter_xfs_io
>> }
>>
>> -echo "*** test nodatacow"
>> -_scratch_mkfs > /dev/null 2>&1
>> -_scratch_mount "-o nodatacow"
>> -__workout
>> -_scratch_unmount
>> -_check_scratch_fs
>> -
>> echo "*** test compress=no"
>> _scratch_mkfs > /dev/null 2>&1
>> _scratch_mount "-o compress=no"
>> diff --git a/tests/btrfs/024.out b/tests/btrfs/024.out
>> index 7eacb0aca674..33c4f49366fd 100644
>> --- a/tests/btrfs/024.out
>> +++ b/tests/btrfs/024.out
>> @@ -1,7 +1,4 @@
>> QA output created by 024
>> -*** test nodatacow
>> -wrote 1048576/1048576 bytes at offset 0
>> -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>> *** test compress=no
>> wrote 1048576/1048576 bytes at offset 0
>> XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>> --
>> 2.17.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-08-30 19:30 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 3/3] btrfs/174: Adjust error message when setting compressed flag Nikolay Borisov
2020-08-17 10:49 ` 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
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).