mirror of
https://github.com/kdave/btrfs-progs
synced 2025-02-06 04:41:58 +00:00
btrfs-progs: test: misc/034 remove kernel support
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> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
9290442c46
commit
86b1e47c80
@ -222,47 +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() {
|
||||
run_check $SUDO_HELPER rmmod btrfs
|
||||
run_check $SUDO_HELPER modprobe btrfs
|
||||
}
|
||||
|
||||
test_progs() {
|
||||
@ -276,15 +237,6 @@ test_progs() {
|
||||
check_image_restore
|
||||
}
|
||||
|
||||
check_kernel_reloadable() {
|
||||
# for full coverage we need btrfs to actually be a module
|
||||
modinfo btrfs > /dev/null 2>&1 || _not_run "btrfs must be a module"
|
||||
run_mayfail $SUDO_HELPER modprobe -r btrfs || _not_run "btrfs must be unloadable"
|
||||
run_mayfail $SUDO_HELPER modprobe btrfs || _not_run "loading btrfs module failed"
|
||||
}
|
||||
|
||||
check_kernel_reloadable
|
||||
|
||||
test_progs
|
||||
|
||||
# disk1 is an image which has no metadata uuid flags set and disk2 is part of
|
||||
|
Loading…
Reference in New Issue
Block a user