public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] common/rc: skip encrypted direct I/O tests on f2fs
@ 2019-10-24 20:45 Eric Biggers
  0 siblings, 0 replies; only message in thread
From: Eric Biggers @ 2019-10-24 20:45 UTC (permalink / raw)
  To: fstests; +Cc: linux-f2fs-devel

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 --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
-- 
2.24.0.rc0.303.g954a862665-goog


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-10-24 20:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-24 20:45 [PATCH] common/rc: skip encrypted direct I/O tests on f2fs Eric Biggers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox