| Message ID | c4d569b4e92cbc6ca2a7bd87e0bc0df1758bbba8.1694525360.git.anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: misc-tests/034-metadata-uuid remove kernel support | expand |
On Thu, Sep 21, 2023 at 06:35:10AM +0800, Anand Jain wrote: > The kernel patch, ("btrfs: reject device with CHANGING_FSID_V2 flag"), > removes kernel support for the CHANGING_FSID_V2 flag. So, drop its > related testcase. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- > Apply this on top of > > [PATCH 0/4 v4] btrfs-progs: recover from failed metadata_uuid port kernel > btrfs-progs: tune use the latest bdev in fs_devices for super_copy > btrfs-progs: add support to fix superblock with CHANGING_FSID_V2 flag > btrfs-progs: recover from the failed btrfstune -m|M > btrfs-progs: test btrfstune -m|M ability to fix previous failures The above patches are now in devel but the test still fails because you haven't removed the check for builtin/module status of btrfs.
-reload_btrfs() {
- run_check $SUDO_HELPER rmmod btrfs
- run_check $SUDO_HELPER modprobe btrfs
On 3/10/23 01:10, David Sterba wrote:
> On Thu, Sep 21, 2023 at 06:35:10AM +0800, Anand Jain wrote:
>> The kernel patch, ("btrfs: reject device with CHANGING_FSID_V2 flag"),
>> removes kernel support for the CHANGING_FSID_V2 flag. So, drop its
>> related testcase.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>> Apply this on top of
>>
>> [PATCH 0/4 v4] btrfs-progs: recover from failed metadata_uuid port kernel
>> btrfs-progs: tune use the latest bdev in fs_devices for super_copy
>> btrfs-progs: add support to fix superblock with CHANGING_FSID_V2 flag
>> btrfs-progs: recover from the failed btrfstune -m|M
>> btrfs-progs: test btrfstune -m|M ability to fix previous failures
>
> The above patches are now in devel but the test still fails because you
> haven't removed the check for builtin/module status of btrfs.
It was removed. From your devel branch.
$ git log -p 86b1e47c80d62519975eae95b39ea053a220abec
commit 86b1e47c80d62519975eae95b39ea053a220abec
Author: Anand Jain <anand.jain@oracle.com>
Date: Thu Sep 21 06:35:10 2023 +0800
btrfs-progs: test: misc/034 remove kernel support
::
-reload_btrfs() {
- run_check $SUDO_HELPER rmmod btrfs
- run_check $SUDO_HELPER modprobe btrfs
}
diff --git a/tests/misc-tests/034-metadata-uuid/test.sh b/tests/misc-tests/034-metadata-uuid/test.sh index 0b06f1266f57..852770488051 100755 --- a/tests/misc-tests/034-metadata-uuid/test.sh +++ b/tests/misc-tests/034-metadata-uuid/test.sh @@ -222,42 +222,8 @@ failure_recovery_progs() { rm -f -- "$image1" "$image2" } -failure_recovery_kernel() { - local image1 - local image2 - local loop1 - local loop2 - local devcount - - reload_btrfs - - image1=$(extract_image "$1") - image2=$(extract_image "$2") - loop1=$(run_check_stdout $SUDO_HELPER losetup --find --show "$image1") - loop2=$(run_check_stdout $SUDO_HELPER losetup --find --show "$image2") - - run_check $SUDO_HELPER udevadm settle - - # Scan to make sure btrfs detects both devices before trying to mount - run_check $SUDO_HELPER "$TOP/btrfs" device scan "$loop1" - run_check $SUDO_HELPER "$TOP/btrfs" device scan "$loop2" - - # Mount and unmount, on trans commit all disks should be consistent - run_check $SUDO_HELPER mount "$loop1" "$TEST_MNT" - run_check $SUDO_HELPER umount "$TEST_MNT" - - # perform any specific check - "$3" "$loop1" "$loop2" - - # cleanup - run_check $SUDO_HELPER losetup -d "$loop1" - run_check $SUDO_HELPER losetup -d "$loop2" - rm -f -- "$image1" "$image2" -} - failure_recovery() { failure_recovery_progs $@ - failure_recovery_kernel $@ } reload_btrfs() {
The kernel patch, ("btrfs: reject device with CHANGING_FSID_V2 flag"), removes kernel support for the CHANGING_FSID_V2 flag. So, drop its related testcase. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- Apply this on top of [PATCH 0/4 v4] btrfs-progs: recover from failed metadata_uuid port kernel btrfs-progs: tune use the latest bdev in fs_devices for super_copy btrfs-progs: add support to fix superblock with CHANGING_FSID_V2 flag btrfs-progs: recover from the failed btrfstune -m|M btrfs-progs: test btrfstune -m|M ability to fix previous failures tests/misc-tests/034-metadata-uuid/test.sh | 34 ---------------------- 1 file changed, 34 deletions(-)