From: Eric Whitney <enwlinux@gmail.com>
Date: Fri, 19 Aug 2016 16:47:38 +0000 (-0400)
Subject: common/rc: improve _require_metadata_journaling() for ext4
X-Git-Tag: v2022.05.01~2387
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=991b809160707c4dbd914876e281df9a94e496f9;p=users%2Fhch%2Fxfstests-dev.git

common/rc: improve _require_metadata_journaling() for ext4

The code in _require_metadata_journaling() currently rejects ext4
file systems that have been created without a journal.  However, an
ext4 file system with a journal should also be rejected if the
journal is not loaded and made available for use at mount time.

Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/common/rc b/common/rc
index e6831b502..4a30fb369 100644
--- a/common/rc
+++ b/common/rc
@@ -3057,6 +3057,8 @@ _require_metadata_journaling()
 		_require_dumpe2fs
 		$DUMPE2FS_PROG -h $DEV 2>&1 | grep -q has_journal || \
 			_notrun "$FSTYP on $DEV not configured with metadata journaling"
+		# ext4 might not load a journal
+		_exclude_scratch_mount_option "noload"
 		;;
 	*)
 		# by default we pass; if you need to, add your fs above!