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 EA217C04AAC for ; Mon, 20 May 2019 12:37:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF9FA21726 for ; Mon, 20 May 2019 12:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355836; bh=4ezE4YFsHI4mkI3Af6ni4X1jrp/rvkB9HrQmp0MjJxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Uh64q2uyF3KHgg4bYF3ZI3sq0nrUgivM6UAHjup6Ytv/Qdg+oFHlv8TpKDukCyP+Z L8yfxrE/EyGDKJZnc+9HNAABhR6CYJxKYn1nblhl/xI4FTToCf5T8K5eRK1xNGP4w6 IiviLkhkqko/cvO2ea8XQxPLwRMHHbPud8IVKIeU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390404AbfETMhM (ORCPT ); Mon, 20 May 2019 08:37:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:55864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403899AbfETMgp (ORCPT ); Mon, 20 May 2019 08:36:45 -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 8458B20645; Mon, 20 May 2019 12:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355805; bh=4ezE4YFsHI4mkI3Af6ni4X1jrp/rvkB9HrQmp0MjJxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vc9Myvq8AEnelk4vQEWJvdNHzzBVmS/+PLHgREmY69LOf2RTbR6Q3jQrtK3IYxO7G 4K9X6OXoeUGlfH/Ga+kwBQPUyf7wARRsMQd7pYEkhukLyaViHYGcvAkCvaQ+TxXzMn YQh9bQOsuztpNXMAdNMjDwryys1UYueoFoNucrzE= 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 5.1 091/128] ext4: fix ext4_show_options for file systems w/o journal Date: Mon, 20 May 2019 14:14:38 +0200 Message-Id: <20190520115255.508554293@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@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 @@ -4269,7 +4269,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;