Re: [PATCH v2] btrfs/024: Remove no longer valid test

Nikolay Borisov
2020-08-30T19:30:44Z

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
>