From 88f1087f9c56a9a6bee42ae465b2e88a66869951 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 26 Feb 2021 13:39:06 +0100 Subject: [PATCH] qa/run_xfstests.sh: mount ext4 with dioread_nolock dioread_nolock was made default in kernel 5.6, changing the expected output of ext4/001: for dioread_nolock we want 001.out.nozero instead of 001.out.default. Add dioread_nolock to EXT_MOUNT_OPTIONS so that _link_out_file() selects 001.out.nozero. Signed-off-by: Ilya Dryomov --- qa/run_xfstests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/run_xfstests.sh b/qa/run_xfstests.sh index 892bdfebe55..70e4943314b 100755 --- a/qa/run_xfstests.sh +++ b/qa/run_xfstests.sh @@ -280,7 +280,7 @@ XFSTESTS_DIR="/var/lib/xfstests" # hardcoded into dbench binary TEST_DIR="/mnt/test_dir" SCRATCH_MNT="/mnt/scratch_mnt" MKFS_OPTIONS="" -EXT_MOUNT_OPTIONS="-o block_validity" +EXT_MOUNT_OPTIONS="-o block_validity,dioread_nolock" trap cleanup EXIT ERR HUP INT QUIT setup -- 2.39.5