From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 26 Feb 2021 12:39:06 +0000 (+0100)
Subject: qa/run_xfstests.sh: mount ext4 with dioread_nolock
X-Git-Tag: v17.1.0~2779^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88f1087f9c56a9a6bee42ae465b2e88a66869951;p=ceph-ci.git

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 <idryomov@gmail.com>
---

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