Re: [PATCH 2/6] xfs: remove xfs_errortag_set

["Darrick J. Wong" <djwong@kernel.org>]

On Mon, Sep 15, 2025 at 06:30:38AM -0700, Christoph Hellwig wrote:
> xfs_errortag_set is only called by xfs_errortag_attr_store, , which does
> not need to validate the error tag, because it can only be called on
> valid error tags that had a sysfs attribute registered.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Makes sense too
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_error.c | 29 ++++++-----------------------
>  fs/xfs/xfs_error.h |  3 ---
>  2 files changed, 6 insertions(+), 26 deletions(-)
> 
> diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
> index 45a43e47ce92..fac35ff3da65 100644
> --- a/fs/xfs/xfs_error.c
> +++ b/fs/xfs/xfs_error.c
> @@ -93,21 +93,18 @@ xfs_errortag_attr_store(
>  	size_t			count)
>  {
>  	struct xfs_mount	*mp = to_mp(kobject);
> -	struct xfs_errortag_attr *xfs_attr = to_attr(attr);
> +	unsigned int		error_tag = to_attr(attr)->tag;
>  	int			ret;
> -	unsigned int		val;
>  
>  	if (strcmp(buf, "default") == 0) {
> -		val = xfs_errortag_random_default[xfs_attr->tag];
> +		mp->m_errortag[error_tag] =
> +			xfs_errortag_random_default[error_tag];
>  	} else {
> -		ret = kstrtouint(buf, 0, &val);
> +		ret = kstrtouint(buf, 0, &mp->m_errortag[error_tag]);
>  		if (ret)
>  			return ret;
>  	}
>  
> -	ret = xfs_errortag_set(mp, xfs_attr->tag, val);
> -	if (ret)
> -		return ret;
>  	return count;
>  }
>  
> @@ -325,19 +322,6 @@ xfs_errortag_test(
>  	return true;
>  }
>  
> -int
> -xfs_errortag_set(
> -	struct xfs_mount	*mp,
> -	unsigned int		error_tag,
> -	unsigned int		tag_value)
> -{
> -	if (!xfs_errortag_valid(error_tag))
> -		return -EINVAL;
> -
> -	mp->m_errortag[error_tag] = tag_value;
> -	return 0;
> -}
> -
>  int
>  xfs_errortag_add(
>  	struct xfs_mount	*mp,
> @@ -347,9 +331,8 @@ xfs_errortag_add(
>  
>  	if (!xfs_errortag_valid(error_tag))
>  		return -EINVAL;
> -
> -	return xfs_errortag_set(mp, error_tag,
> -			xfs_errortag_random_default[error_tag]);
> +	mp->m_errortag[error_tag] = xfs_errortag_random_default[error_tag];
> +	return 0;
>  }
>  
>  int
> diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
> index 3aeb03001acf..fd60a008f9d2 100644
> --- a/fs/xfs/xfs_error.h
> +++ b/fs/xfs/xfs_error.h
> @@ -58,8 +58,6 @@ bool xfs_errortag_enabled(struct xfs_mount *mp, unsigned int tag);
>  		mdelay((mp)->m_errortag[(tag)]); \
>  	} while (0)
>  
> -extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag,
> -		unsigned int tag_value);
>  extern int xfs_errortag_add(struct xfs_mount *mp, unsigned int error_tag);
>  extern int xfs_errortag_clearall(struct xfs_mount *mp);
>  #else
> @@ -67,7 +65,6 @@ extern int xfs_errortag_clearall(struct xfs_mount *mp);
>  #define xfs_errortag_del(mp)
>  #define XFS_TEST_ERROR(expr, mp, tag)		(expr)
>  #define XFS_ERRORTAG_DELAY(mp, tag)		((void)0)
> -#define xfs_errortag_set(mp, tag, val)		(ENOSYS)
>  #define xfs_errortag_add(mp, tag)		(ENOSYS)
>  #define xfs_errortag_clearall(mp)		(ENOSYS)
>  #endif /* DEBUG */
> -- 
> 2.47.2
> 
>