aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Whitney <enwlinux@gmail.com>2018-01-10 16:19:05 -0500
committerEryu Guan <eguan@redhat.com>2018-01-12 11:40:13 +0800
commit2931de473cc18a8f866fa0a08805d50ed0f4079b (patch)
tree683f4943e45de784847b439e3a936b09944f08dd
parentdbb857f8d17c21dae662abe9a554a5f1bce8c545 (diff)
downloadxfstests-dev-2931de473cc18a8f866fa0a08805d50ed0f4079b.tar.gz
common/rc: ext4 doesn't support O_DIRECT with data journaling
Modify _require_odirect() to skip O_DIRECT tests if the ext4 mount option data=journal has been applied. Because ext4 disables its O_DIRECT support when in data journaling mode, no significant value is obtained by running these tests and they consume a significant amount of run time. Additionally, this change eliminates the need to triage false negative O_DIRECT test results caused by test problems, as has occurred from time to time. Signed-off-by: Eric Whitney <enwlinux@gmail.com> Reviewed-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Eryu Guan <eguan@redhat.com>
-rw-r--r--common/rc2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/rc b/common/rc
index d47c1dbe87..fa3b215072 100644
--- a/common/rc
+++ b/common/rc
@@ -2150,6 +2150,8 @@ _require_odirect()
if [ $FSTYP = "ext4" ] ; then
if echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption"; then
_notrun "ext4 encryption doesn't support O_DIRECT"
+ elif echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then
+ _notrun "ext4 data journaling doesn't support O_DIRECT"
fi
fi
testfile=$TEST_DIR/$$.direct