From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C56E8C04AAC for ; Mon, 20 May 2019 12:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 912D720645 for ; Mon, 20 May 2019 12:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558356775; bh=RjQFV7d97jsIaIDeSyZk8Yms3sZBoQs7QVq41FlS79w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t75dLFknGfnFw001wdWQ1b6CFOCMVxAHckXvVTxSuCoAedpj2GSstlt/6amyn8CGo fv3I70nTCImIVdX44eQSCiLFhNU3B74OMH+iUCN5sMPWnOIgHcmdyuzlxZrPvHuvzH clkB649O4bIlqGvmL0QK7zyPuWCPntsCs7uceYNI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733123AbfETMSK (ORCPT ); Mon, 20 May 2019 08:18:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:59242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730757AbfETMSH (ORCPT ); Mon, 20 May 2019 08:18:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B05AE213F2; Mon, 20 May 2019 12:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558354687; bh=RjQFV7d97jsIaIDeSyZk8Yms3sZBoQs7QVq41FlS79w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AoCcmKV0GIdQ7J8kSABBOF1dFBtj9ytLSpS3hQE6bBNt/35UTHAYwP9bEMU6fza+F w2vblVnFnmte2PuiR8wJtUZ1CxxfG+itbr/BlZ+aB80RDygI3MUcG4al02yLKL5+/W /gr2qem2/ToZjxnd4Ks9/NOkEzDrCxDKTdgwjoYc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Debabrata Banerjee , Theodore Tso , Jan Kara , stable@kernel.org Subject: [PATCH 4.9 29/44] ext4: fix ext4_show_options for file systems w/o journal Date: Mon, 20 May 2019 14:14:18 +0200 Message-Id: <20190520115234.583932733@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115230.720347034@linuxfoundation.org> References: <20190520115230.720347034@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Debabrata Banerjee commit 50b29d8f033a7c88c5bc011abc2068b1691ab755 upstream. Instead of removing EXT4_MOUNT_JOURNAL_CHECKSUM from s_def_mount_opt as I assume was intended, all other options were blown away leading to _ext4_show_options() output being incorrect. Fixes: 1e381f60dad9 ("ext4: do not allow journal_opts for fs w/o journal") Signed-off-by: Debabrata Banerjee Signed-off-by: Theodore Ts'o Reviewed-by: Jan Kara Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4034,7 +4034,7 @@ static int ext4_fill_super(struct super_ "data=, fs mounted w/o journal"); goto failed_mount_wq; } - sbi->s_def_mount_opt &= EXT4_MOUNT_JOURNAL_CHECKSUM; + sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM; clear_opt(sb, JOURNAL_CHECKSUM); clear_opt(sb, DATA_FLAGS); sbi->s_journal = NULL;