diff mbox series

[v2,2/2] xfs: Skip repetitive warnings about mount options

Message ID 20210224214323.394286-4-preichl@redhat.com (mailing list archive)
State Superseded, archived
Headers show
Series xfs: Skip repetitive warnings about mount options | expand

Commit Message

Pavel Reichl Feb. 24, 2021, 9:43 p.m. UTC 
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>
---
 fs/xfs/xfs_super.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

Comments

Darrick J. Wong Feb. 25, 2021, 2:41 a.m. UTC | #1 
On Wed, Feb 24, 2021 at 10:43:23PM +0100, Pavel Reichl wrote:
> 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>

Looks good to me,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_super.c | 24 ++++++++++++++++++++----
>  1 file changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 7e281d1139dc..ba113a28b631 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -1155,6 +1155,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.
>   *
> @@ -1294,19 +1310,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;
> -- 
> 2.29.2
>
Carlos Maiolino March 9, 2021, 11:44 a.m. UTC | #2 
On Wed, Feb 24, 2021 at 10:43:23PM +0100, Pavel Reichl wrote:
> 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>
> ---
>  fs/xfs/xfs_super.c | 24 ++++++++++++++++++++----
>  1 file changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 7e281d1139dc..ba113a28b631 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -1155,6 +1155,22 @@ suffix_kstrtoint(
>  	return ret;
>  }
>  

Looks good indeed.

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

> +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.
>   *
> @@ -1294,19 +1310,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;
> -- 
> 2.29.2
>
diff mbox series

Patch

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 7e281d1139dc..ba113a28b631 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1155,6 +1155,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.
  *
@@ -1294,19 +1310,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;