From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35369 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1767661AbcHROkd (ORCPT ); Thu, 18 Aug 2016 10:40:33 -0400 Date: Thu, 18 Aug 2016 10:42:53 -0400 From: Eric Whitney Subject: [PATCH] common/rc: improve _require_metadata_journaling() for ext4 Message-ID: <20160818144253.GA14069@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: fstests-owner@vger.kernel.org To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, tytso@mit.edu List-ID: 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 --- common/rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/rc b/common/rc index 3fb0600..9a3c9bd 100644 --- a/common/rc +++ b/common/rc @@ -3057,6 +3057,9 @@ _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 may not have loaded a journal + echo $MOUNT_OPTIONS | grep -q noload && \ + _notrun "$FSTYP on $DEV not mounted with metadata journaling" ;; *) # by default we pass; if you need to, add your fs above! -- 2.1.4