Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: remove xfs_errortag_set 

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>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-09-18 07:34:34 -07:00 committed by Carlos Maiolino
parent d5409ebf46
commit 991dcadadd
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/xfs/xfs_error.c
View File

@ -93,21 +93,18 @@ xfs_errortag_attr_store(
size_t count) size_t count)
{ {
struct xfs_mount *mp = to_mp(kobject); 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; int ret;
unsigned int val;
if (strcmp(buf, "default") == 0) { 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 { } else {
ret = kstrtouint(buf, 0, &val); ret = kstrtouint(buf, 0, &mp->m_errortag[error_tag]);
if (ret) if (ret)
return ret; return ret;
} }
ret = xfs_errortag_set(mp, xfs_attr->tag, val);
if (ret)
return ret;
return count; return count;
} }
@ -325,19 +322,6 @@ xfs_errortag_test(
return true; 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 int
xfs_errortag_add( xfs_errortag_add(
struct xfs_mount *mp, struct xfs_mount *mp,
@ -347,9 +331,8 @@ xfs_errortag_add(
if (!xfs_errortag_valid(error_tag)) if (!xfs_errortag_valid(error_tag))
return -EINVAL; return -EINVAL;
mp->m_errortag[error_tag] = xfs_errortag_random_default[error_tag];
return xfs_errortag_set(mp, error_tag, return 0;
xfs_errortag_random_default[error_tag]);
} }
int int

3
fs/xfs/xfs_error.h
View File

@ -58,8 +58,6 @@ bool xfs_errortag_enabled(struct xfs_mount *mp, unsigned int tag);
mdelay((mp)->m_errortag[(tag)]); \ mdelay((mp)->m_errortag[(tag)]); \
} while (0) } 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_add(struct xfs_mount *mp, unsigned int error_tag);
extern int xfs_errortag_clearall(struct xfs_mount *mp); extern int xfs_errortag_clearall(struct xfs_mount *mp);
#else #else
@ -67,7 +65,6 @@ extern int xfs_errortag_clearall(struct xfs_mount *mp);
#define xfs_errortag_del(mp) #define xfs_errortag_del(mp)
#define XFS_TEST_ERROR(expr, mp, tag) (expr) #define XFS_TEST_ERROR(expr, mp, tag) (expr)
#define XFS_ERRORTAG_DELAY(mp, tag) ((void)0) #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_add(mp, tag) (ENOSYS)
#define xfs_errortag_clearall(mp) (ENOSYS) #define xfs_errortag_clearall(mp) (ENOSYS)
#endif /* DEBUG */ #endif /* DEBUG */