Teach _require_odirect that ext4's data=journal mode doesn't support
O_DIRECT.
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
---
common/rc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index 069df58..791e6e5 100644
--- a/common/rc
+++ b/common/rc
@@ -1932,9 +1932,13 @@ _require_xfs_db_command()
# check that kernel and filesystem support direct I/O
_require_odirect()
{
- if [ $FSTYP = "ext4" ] &&
- echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption" ; then
- _notrun "ext4 encryption doesn't support O_DIRECT"
+ if [ $FSTYP = "ext4" ] ; then
+ if echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption" ; then
+ _notrun "ext4 encryption doesn't support O_DIRECT"
+ fi
+ if echo "$MOUNT_OPTIONS" | grep -q "data=journal" ; then
+ _notrun "ext4 data=journal mode doesn't support O_DIRECT"
+ fi
fi
testfile=$TEST_DIR/$$.direct
$XFS_IO_PROG -F -f -d -c "pwrite 0 20k" $testfile > /dev/null 2>&1
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
