Skip to content

Commit 991dcad

Browse files
Christoph Hellwigcmaiolino
authored andcommitted
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>
1 parent d5409eb commit 991dcad

2 files changed

Lines changed: 6 additions & 26 deletions

File tree

fs/xfs/xfs_error.c

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,18 @@ xfs_errortag_attr_store(
9393
size_t count)
9494
{
9595
struct xfs_mount *mp = to_mp(kobject);
96-
struct xfs_errortag_attr *xfs_attr = to_attr(attr);
96+
unsigned int error_tag = to_attr(attr)->tag;
9797
int ret;
98-
unsigned int val;
9998

10099
if (strcmp(buf, "default") == 0) {
101-
val = xfs_errortag_random_default[xfs_attr->tag];
100+
mp->m_errortag[error_tag] =
101+
xfs_errortag_random_default[error_tag];
102102
} else {
103-
ret = kstrtouint(buf, 0, &val);
103+
ret = kstrtouint(buf, 0, &mp->m_errortag[error_tag]);
104104
if (ret)
105105
return ret;
106106
}
107107

108-
ret = xfs_errortag_set(mp, xfs_attr->tag, val);
109-
if (ret)
110-
return ret;
111108
return count;
112109
}
113110

@@ -325,19 +322,6 @@ xfs_errortag_test(
325322
return true;
326323
}
327324

328-
int
329-
xfs_errortag_set(
330-
struct xfs_mount *mp,
331-
unsigned int error_tag,
332-
unsigned int tag_value)
333-
{
334-
if (!xfs_errortag_valid(error_tag))
335-
return -EINVAL;
336-
337-
mp->m_errortag[error_tag] = tag_value;
338-
return 0;
339-
}
340-
341325
int
342326
xfs_errortag_add(
343327
struct xfs_mount *mp,
@@ -347,9 +331,8 @@ xfs_errortag_add(
347331

348332
if (!xfs_errortag_valid(error_tag))
349333
return -EINVAL;
350-
351-
return xfs_errortag_set(mp, error_tag,
352-
xfs_errortag_random_default[error_tag]);
334+
mp->m_errortag[error_tag] = xfs_errortag_random_default[error_tag];
335+
return 0;
353336
}
354337

355338
int

fs/xfs/xfs_error.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,13 @@ bool xfs_errortag_enabled(struct xfs_mount *mp, unsigned int tag);
5858
mdelay((mp)->m_errortag[(tag)]); \
5959
} while (0)
6060

61-
extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag,
62-
unsigned int tag_value);
6361
extern int xfs_errortag_add(struct xfs_mount *mp, unsigned int error_tag);
6462
extern int xfs_errortag_clearall(struct xfs_mount *mp);
6563
#else
6664
#define xfs_errortag_init(mp) (0)
6765
#define xfs_errortag_del(mp)
6866
#define XFS_TEST_ERROR(expr, mp, tag) (expr)
6967
#define XFS_ERRORTAG_DELAY(mp, tag) ((void)0)
70-
#define xfs_errortag_set(mp, tag, val) (ENOSYS)
7168
#define xfs_errortag_add(mp, tag) (ENOSYS)
7269
#define xfs_errortag_clearall(mp) (ENOSYS)
7370
#endif /* DEBUG */

0 commit comments

Comments
 (0)