From patchwork Thu Aug 18 14:42:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Whitney X-Patchwork-Id: 9288317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6FC85607FF for ; Thu, 18 Aug 2016 14:42:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 619122929D for ; Thu, 18 Aug 2016 14:42:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 562402929F; Thu, 18 Aug 2016 14:42:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC18C2929D for ; Thu, 18 Aug 2016 14:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1767771AbcHROkj (ORCPT ); Thu, 18 Aug 2016 10:40:39 -0400 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 Received: by mail-qt0-f193.google.com with SMTP id q11so1222345qtb.2; Thu, 18 Aug 2016 07:39:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=vNpp97mwtEvoB7a2qaZ1ZBRzCz6BtISNLY3+uyOnyGE=; b=Ob0VqDLprN0y6JfXNv1tUYPDoceoJhg3mLITp5s7rlioF/VjgKq6vh0Y0ZvR02fNu/ v05LuUUv/Jb2Prn6lP2kho+hbjctVi3r193zsI9N3YrfJQqv9xCa7OLqNeNpc3cjJMzc KGpll4xNik+ZzOChI4x+j956EkIxm4z/oYTB2kOXVJ96P9iwgtZ94uoyHcjBdmWJqbsl Bkgepx4k2ZXo0yjtmizBsRRxmtLzoM4zARX+wiEsnFPMMUjDgpvNUjSFnm20kx7OyYSB tmRHNhOZ1cfVGjOBnsJGo6ql0ij7YPxHtkCMa6o25kAVzVtSOvcJGvM4ePk6zaygp2Qz Ah/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=vNpp97mwtEvoB7a2qaZ1ZBRzCz6BtISNLY3+uyOnyGE=; b=OJTFuR3LdebzoWdqJjMtbsK9BXkJTaUCVekVJFLrcNTMI+tz0Vt+AEnGNJg8aswjVM H8O/sJij3sy6b/7R2aqqZsgmgrPXTouYQ6fZglPNmctWlnRdgiJEpAELUzBhQhx2ZhgV DWqzvVrLwhKKm0R68T8WKtk3czf/CJFj9QsBwExPdxj++PItk8a8SYtBplwFjRifgkgA jRWL4ZqUiS5lFzpk8MZcG/JgovWlTrRXLTFTEao9TB2MtXQILKI4mlrd816fsMDrqAKv oI5yu6eZhcl6gIKIn2Zf6CCS2z26QGbrebnGBl6fZF6GVsm0WuBs9VyMUJmPoeuQxC9r 3RoA== X-Gm-Message-State: AEkooutgLTOwhxNswbU0f+BrTueT2dk1R4ubjkTIWp6ZpPYWgHFSmIW6W9k6CRtK81qY+Q== X-Received: by 10.200.54.28 with SMTP id m28mr2714236qtb.87.1471531157799; Thu, 18 Aug 2016 07:39:17 -0700 (PDT) Received: from localhost.localdomain (c-50-187-52-22.hsd1.nh.comcast.net. [50.187.52.22]) by smtp.gmail.com with ESMTPSA id l63sm1211794qkf.16.2016.08.18.07.39.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Aug 2016 07:39:17 -0700 (PDT) Date: Thu, 18 Aug 2016 10:42:53 -0400 From: Eric Whitney To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, tytso@mit.edu Subject: [PATCH] common/rc: improve _require_metadata_journaling() for ext4 Message-ID: <20160818144253.GA14069@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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!