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 4394C302772 for ; Mon, 27 Oct 2025 13:49:59 +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=1761573000; cv=none; b=LTel6SDia406WjAjNOVwWK7NJjzSsjVQP7MaGcQ/gboRyq1uwrjLG/hU2iIFtQRoRVErCBmdZzI6gcS4RTcPlOECg4FEh7zVkvib9VSr9bP8TGDKy3DnUfjhw1RbkOrod0oUA4cLXofO56YTtzG5NzHHdmqO/N5qS0GLv5Ksy10= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761573000; c=relaxed/simple; bh=97uz3w/i814jVF7KYF920rZTGlEWx5A+xICbHxLQjjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I4MGDTu5Tvo3xxjsynXF6unW7EFVavopfBlVAJcPmiDkk0CR+3GqqX5/1u84JWJ6+6aoWleH63ay7w5en6erud7CzSjZbohGXwWIjJMWvppVlNQbSBkouy0J5D80I4pZRbx4Lq0y0Qm103ALV+8geOLjWNUgCIAGiU9aUDwSh60= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D/2LvJT3; 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="D/2LvJT3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21144C4CEF1; Mon, 27 Oct 2025 13:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761572999; bh=97uz3w/i814jVF7KYF920rZTGlEWx5A+xICbHxLQjjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/2LvJT3sNzHvWWTP8HeTghcYDCG8RA8NPu1ncqzbE23S3tvH2sohy4h+WYzWsZFM OxUzR0XFZYX6anLjWNVrT9wxKSBirWzvvV9N10FEFAUTbDk3LiJzhMrpL8cRr+Ig3F d3G1rV69nGo0B5ZxITs7H67PdD/in3KowH1jElLD/08MNWL9k3yt/rcHi+P+3dYm9a qiKnlVzfWdPQhrbuJMIGA2k6kYNR3mDoo3n6tIay3sRtrAsXboocRDqTKFVR7/8IXU 5NrPiWCiiN28iKsctTABP5QppnsgzeqA8w23bHFQ50W4yIePPGEg20g6WoUcjc1XBE jAeUAwIull/wA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Darrick J. Wong" , Christoph Hellwig , Carlos Maiolino , Carlos Maiolino , Sasha Levin Subject: [PATCH 5.10.y] xfs: always warn about deprecated mount options Date: Mon, 27 Oct 2025 09:49:57 -0400 Message-ID: <20251027134957.492843-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025102617-untrimmed-ideally-b80b@gregkh> References: <2025102617-untrimmed-ideally-b80b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Darrick J. Wong" [ Upstream commit 630785bfbe12c3ee3ebccd8b530a98d632b7e39d ] The deprecation of the 'attr2' mount option in 6.18 wasn't entirely successful because nobody noticed that the kernel never printed a warning about attr2 being set in fstab if the only xfs filesystem is the root fs; the initramfs mounts the root fs with no mount options; and the init scripts only conveyed the fstab options by remounting the root fs. Fix this by making it complain all the time. Cc: stable@vger.kernel.org # v5.13 Fixes: 92cf7d36384b99 ("xfs: Skip repetitive warnings about mount options") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Carlos Maiolino Signed-off-by: Carlos Maiolino [ adapted m_features field reference to m_flags ] Signed-off-by: Sasha Levin --- fs/xfs/xfs_super.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 434c87cc9fbf5..2e5e9b33866c2 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1162,16 +1162,25 @@ suffix_kstrtoint( static inline void xfs_fs_warn_deprecated( struct fs_context *fc, - struct fs_parameter *param, - uint64_t flag, - bool value) + struct fs_parameter *param) { - /* Don't print the warning if reconfiguring and current mount point - * already had the flag set + /* + * Always warn about someone passing in a deprecated mount option. + * Previously we wouldn't print the warning if we were reconfiguring + * and current mount point already had the flag set, but that was not + * the right thing to do. + * + * Many distributions mount the root filesystem with no options in the + * initramfs and rely on mount -a to remount the root fs with the + * options in fstab. However, the old behavior meant that there would + * never be a warning about deprecated mount options for the root fs in + * /etc/fstab. On a single-fs system, that means no warning at all. + * + * Compounding this problem are distribution scripts that copy + * /proc/mounts to fstab, which means that we can't remove mount + * options unless we're 100% sure they have only ever been advertised + * in /proc/mounts in response to explicitly provided mount options. */ - if ((fc->purpose & FS_CONTEXT_FOR_RECONFIGURE) && - !!(XFS_M(fc->root->d_sb)->m_flags & flag) == value) - return; xfs_warn(fc->s_fs_info, "%s mount option is deprecated.", param->key); } @@ -1314,19 +1323,19 @@ xfs_fc_parse_param( #endif /* Following mount options will be removed in September 2025 */ case Opt_ikeep: - xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_IKEEP, true); + xfs_fs_warn_deprecated(fc, param); parsing_mp->m_flags |= XFS_MOUNT_IKEEP; return 0; case Opt_noikeep: - xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_IKEEP, false); + xfs_fs_warn_deprecated(fc, param); parsing_mp->m_flags &= ~XFS_MOUNT_IKEEP; return 0; case Opt_attr2: - xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_ATTR2, true); + xfs_fs_warn_deprecated(fc, param); parsing_mp->m_flags |= XFS_MOUNT_ATTR2; return 0; case Opt_noattr2: - xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_NOATTR2, true); + xfs_fs_warn_deprecated(fc, param); parsing_mp->m_flags &= ~XFS_MOUNT_ATTR2; parsing_mp->m_flags |= XFS_MOUNT_NOATTR2; return 0; -- 2.51.0