From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8594337B337; Mon, 5 May 2025 22:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485948; cv=none; b=d+/cNNBvYtHHo4HdPz89PzakULzG409i0AARtUuOvrebaJn56ofljnIVUoRk46zuyudmDLdvtiEsxZEfROPUuw3iSKgn12CWzhR+mi9pSi7FdPonbI2pJhCYjAClIj35mKjFZdg0SDE8AgKKQycuYyKvb+gSAugPKOcQ0PWBZFs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485948; c=relaxed/simple; bh=dN+aC9LiGoqaFweqErPqc152KYVhkyj5+N2Nlzn/Ics=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O2Qo+O7NaUZQEjhnpuaH26G8q7LfL54U2jzEpY74pkCc0vXCnCXmyHBDz/mxTFXOVlWgJcvLXpY1FC43jM45idgCy4nB3NnMUG55sVOlLbV7R30iufQElfYES/38GeuGLFP/2tdmUgshLquIhpLG5ujnT9nNGc7pHFKr86cjK34= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p8iA/80X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p8iA/80X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F23AC4CEE4; Mon, 5 May 2025 22:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485947; bh=dN+aC9LiGoqaFweqErPqc152KYVhkyj5+N2Nlzn/Ics=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p8iA/80XVhDTd3T2sd8Mit2g+v3MkTmRw41tUv6x4snAYFCDj9j8SZMmrYWWZAy4M mxZa7ir3pshmoTlgGE26ZJqPubWiavOIEDYc3TFg/XjSogF1Z5TtmfNnRDlAj0ZRev +RQlBrenSp7oaj8mKTM8EXVQdymOILJOwACLmnN37q5spEIn7I7PwoqVEaL09pEg/5 JR0U9A13A+qfoLk93Zits43rPBx3mLEELczEDJXOtGpIp3qSDQocVlDNkbUFWr+u1i iaL+ZsyxJkfJUMqaDyJCTD1TXBuCjB0CtlLOBL98qS8mX3XBBlHSnQmGDzCHWlYjQh WBvx81Hz6jJcw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baokun Li , Zhang Yi , Jan Kara , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 079/294] ext4: reject the 'data_err=abort' option in nojournal mode Date: Mon, 5 May 2025 18:52:59 -0400 Message-Id: <20250505225634.2688578-79-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit From: Baokun Li [ Upstream commit 26343ca0df715097065b02a6cddb4a029d5b9327 ] data_err=abort aborts the journal on I/O errors. However, this option is meaningless if journal is disabled, so it is rejected in nojournal mode to reduce unnecessary checks. Also, this option is ignored upon remount. Signed-off-by: Baokun Li Reviewed-by: Zhang Yi Reviewed-by: Jan Kara Link: https://patch.msgid.link/20250122110533.4116662-4-libaokun@huaweicloud.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 3dcaf06ada364..d2b58f940aab5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2821,6 +2821,13 @@ static int ext4_check_opt_consistency(struct fs_context *fc, } if (is_remount) { + if (!sbi->s_journal && + ctx_test_mount_opt(ctx, EXT4_MOUNT_DATA_ERR_ABORT)) { + ext4_msg(NULL, KERN_WARNING, + "Remounting fs w/o journal so ignoring data_err option"); + ctx_clear_mount_opt(ctx, EXT4_MOUNT_DATA_ERR_ABORT); + } + if (ctx_test_mount_opt(ctx, EXT4_MOUNT_DAX_ALWAYS) && (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)) { ext4_msg(NULL, KERN_ERR, "can't mount with " @@ -5421,6 +5428,11 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) "data=, fs mounted w/o journal"); goto failed_mount3a; } + if (test_opt(sb, DATA_ERR_ABORT)) { + ext4_msg(sb, KERN_ERR, + "can't mount with data_err=abort, fs mounted w/o journal"); + goto failed_mount3a; + } sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM; clear_opt(sb, JOURNAL_CHECKSUM); clear_opt(sb, DATA_FLAGS); -- 2.39.5