From patchwork Fri Aug 19 16:47:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Whitney X-Patchwork-Id: 9290595 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 314EC60574 for ; Fri, 19 Aug 2016 16:44:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2099E294DF for ; Fri, 19 Aug 2016 16:44:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 110D3294E3; Fri, 19 Aug 2016 16:44:05 +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 7FFE0294DF for ; Fri, 19 Aug 2016 16:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754432AbcHSQoD (ORCPT ); Fri, 19 Aug 2016 12:44:03 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:35641 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599AbcHSQoD (ORCPT ); Fri, 19 Aug 2016 12:44:03 -0400 Received: by mail-qt0-f194.google.com with SMTP id q11so932988qtb.2; Fri, 19 Aug 2016 09:44:02 -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=1AzGq6OtM52bYR7VHFp0AUDiocePBVqXY3dwjmCOXAk=; b=veh3/CXUTGpY0Dk3sFGh4bCcGvaLcXdoY79+7TM5uNFgc2edTz0+WcKZML5MB4je/1 dyZ5uqRS//21Og5ibgrkUE+MZyzsmot1z3hUkd5B0UL3NiNLZ9W3T7ACzEVX2GVwM76R kWRueGGt7shc/zQaaziwbMqQhkvheNIS/F3tnCNdPA1KNeHYGZFnTvY6cSixXPLUBAi2 K7MUkSx3WMii5EUz8VQuoLA/tvzgRd8y2tjzQ30MiYvNdXNkz6wRZLcUVSORH0isQKbl MHY5KIZiDIaxoORTrZWcX/xiKfh+j6l8eLMYrv+IhExUW0vRheyuUQd1FUbnWQIbweoY 8qFg== 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=1AzGq6OtM52bYR7VHFp0AUDiocePBVqXY3dwjmCOXAk=; b=DCPN0XKOrQotmgOW/e7ErBUEIfwzYnclDWxt+/Aa2gOcR+nqQR/oJibicJCQTWUgLQ kQO/8yPiSY1oNKpDyrnx5hll1hEjbDoaeZoyytLcghDKX0sjm6hS548iypjLR1U6Glpw R0q9+8gY7TaeE58osFeXDNVa2XZ07F2Nrz/hWWDyl7SdBNjbi9+453GPgt95HxYmpEy8 YUBimifyfXgxaZ92bYkLNJZKLV4If4cYsTJfmHoBFbvxakZL3rgNAzofSSKLp1S5QmdD gUGa8LxO4MnOk9mFxU1dLEEJ+cjdICwpo25hELK9Rt6Di/Z01TxGyz6wfTbIJqhlwqFE rqEw== X-Gm-Message-State: AEkoousqy10w0cEnnCdjbP6aNNnrymIttOV6Itch8jyHCyt2W2e+ONZnHWoPfU0Rd7SvtA== X-Received: by 10.237.35.201 with SMTP id k9mr9748170qtc.92.1471625042077; Fri, 19 Aug 2016 09:44:02 -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 u6sm2691429qtu.2.2016.08.19.09.44.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Aug 2016 09:44:01 -0700 (PDT) Date: Fri, 19 Aug 2016 12:47:38 -0400 From: Eric Whitney To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, tytso@mit.edu Subject: [PATCH V2] common/rc: improve _require_metadata_journaling() for ext4 Message-ID: <20160819164738.GA1903@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. V2: Replaced code with call to _exclude_scratch_mount_option() per review comment. Signed-off-by: Eric Whitney --- common/rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/rc b/common/rc index 3fb0600..9d1fc07 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!