Commit 92cf7d36 authored by Pavel Reichl's avatar Pavel Reichl Committed by Darrick J. Wong
Browse files

xfs: Skip repetitive warnings about mount options 

Skip the warnings about mount option being deprecated if we are
remounting and deprecated option state is not changing.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211605


Fix-suggested-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarPavel Reichl <preichl@redhat.com>

Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 0f98b4ec

fs/xfs/xfs_super.c

+20 −4
Original line number Diff line number Diff line
@@ -1126,6 +1126,22 @@ suffix_kstrtoint( 
	return ret;

}



static inline void

xfs_fs_warn_deprecated(

	struct fs_context	*fc,

	struct fs_parameter	*param,

	uint64_t		flag,

	bool			value)

{

	/* Don't print the warning if reconfiguring and current mount point

	 * already had the flag set

	 */

	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);

}



/*

 * Set mount state from a mount option.

 *
@@ -1265,19 +1281,19 @@ xfs_fs_parse_param( 
#endif

	/* Following mount options will be removed in September 2025 */

	case Opt_ikeep:

		xfs_warn(parsing_mp, "%s mount option is deprecated.", param->key);

		xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_IKEEP, true);

		parsing_mp->m_flags |= XFS_MOUNT_IKEEP;

		return 0;

	case Opt_noikeep:

		xfs_warn(parsing_mp, "%s mount option is deprecated.", param->key);

		xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_IKEEP, false);

		parsing_mp->m_flags &= ~XFS_MOUNT_IKEEP;

		return 0;

	case Opt_attr2:

		xfs_warn(parsing_mp, "%s mount option is deprecated.", param->key);

		xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_ATTR2, true);

		parsing_mp->m_flags |= XFS_MOUNT_ATTR2;

		return 0;

	case Opt_noattr2:

		xfs_warn(parsing_mp, "%s mount option is deprecated.", param->key);

		xfs_fs_warn_deprecated(fc, param, XFS_MOUNT_NOATTR2, true);

		parsing_mp->m_flags &= ~XFS_MOUNT_ATTR2;

		parsing_mp->m_flags |= XFS_MOUNT_NOATTR2;

		return 0;