Skip to contentSkip to conversation

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

PATCH New Eric Biggers 1 participant 1 message Oct 24, 2019

lore
Share & tools
lore
#0 lore raw

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

From: Eric Biggers <[email protected]>

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").

---
 common/rc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
common/rc +6 -3
index cfaabf10..7c94307a 100644
@@ -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
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog