diff mbox series

common/rc: skip encrypted direct I/O tests on f2fs

Message ID 20191024204529.90714-1-ebiggers@kernel.org (mailing list archive)
State New, archived
Headers show
Series common/rc: skip encrypted direct I/O tests on f2fs | expand

Commit Message

Eric Biggers Oct. 24, 2019, 8:45 p.m. UTC 
From: Eric Biggers <ebiggers@google.com>

Skip the O_DIRECT tests on f2fs when the test_dummy_encryption mount
option is given, for the same reason as given for ext4 in
commit 9b154b26e4a1 ("common/rc: ext4 doesn't support O_DIRECT with
encryption").

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 common/rc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/common/rc b/common/rc
index cfaabf10..7c94307a 100644
--- a/common/rc
+++ b/common/rc
@@ -2216,10 +2216,13 @@  _require_xfs_io_command()
 # check that kernel and filesystem support direct I/O
 _require_odirect()
 {
-	if [ $FSTYP = "ext4" ] ; then
+	if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; 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 "$FSTYP encryption doesn't support O_DIRECT"
+		fi
+	fi
+	if [ $FSTYP = "ext4" ] ; then
+		if echo "$MOUNT_OPTIONS" | grep -q "data=journal"; then
 			_notrun "ext4 data journaling doesn't support O_DIRECT"
 		fi
 	fi