xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: Skip repetitive warnings about mount options

Browse Source 
commit 92cf7d36384b99d5a57bf4422904a3c16dc4527a upstream.

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: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Pavel Reichl <preichl@redhat.com>

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pavel Reichl
2022-07-03 08:04:52 +03:00
committed by Greg Kroah-Hartman
parent 6b7dab812c
commit da61388f9a
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fs/xfs/xfs_super.c
View File

@@ -1155,6 +1155,22 @@ suffix_kstrtoint(
return ret; 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. * Set mount state from a mount option.
* *
@@ -1294,19 +1310,19 @@ xfs_fc_parse_param(
#endif #endif
/* Following mount options will be removed in September 2025 */ /* Following mount options will be removed in September 2025 */
case Opt_ikeep: 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; parsing_mp->m_flags |= XFS_MOUNT_IKEEP;
return 0; return 0;
case Opt_noikeep: 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; parsing_mp->m_flags &= ~XFS_MOUNT_IKEEP;
return 0; return 0;
case Opt_attr2: 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; parsing_mp->m_flags |= XFS_MOUNT_ATTR2;
return 0; return 0;
case Opt_noattr2: 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_ATTR2;
parsing_mp->m_flags |= XFS_MOUNT_NOATTR2; parsing_mp->m_flags |= XFS_MOUNT_NOATTR2;
return 0; return 0;