Skip to content

Commit 9e24cfd

Browse files
djwongdjwong
committed
xfs: remove unneeded parameter from XFS_TEST_ERROR
Since we moved the injected error frequency controls to the mountpoint, we can get rid of the last argument to XFS_TEST_ERROR. Signed-off-by: Darrick J. Wong <[email protected]> Reviewed-by: Brian Foster <[email protected]> Reviewed-by: Carlos Maiolino <[email protected]>
1 parent c684010 commit 9e24cfd

File tree

13 files changed

+26
-40
lines changed

13 files changed

+26
-40
lines changed

‎fs/xfs/libxfs/xfs_ag_resv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ xfs_ag_resv_critical(
111111

112112
/* Critically low if less than 10% or max btree height remains. */
113113
return XFS_TEST_ERROR(avail < orig / 10 || avail < XFS_BTREE_MAXLEVELS,
114-
pag->pag_mount, XFS_ERRTAG_AG_RESV_CRITICAL,
115-
XFS_RANDOM_AG_RESV_CRITICAL);
114+
pag->pag_mount, XFS_ERRTAG_AG_RESV_CRITICAL);
116115
}
117116

118117
/*

‎fs/xfs/libxfs/xfs_alloc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,8 +2454,7 @@ xfs_agf_read_verify(
24542454
!xfs_buf_verify_cksum(bp, XFS_AGF_CRC_OFF))
24552455
xfs_buf_ioerror(bp, -EFSBADCRC);
24562456
else if (XFS_TEST_ERROR(!xfs_agf_verify(mp, bp), mp,
2457-
XFS_ERRTAG_ALLOC_READ_AGF,
2458-
XFS_RANDOM_ALLOC_READ_AGF))
2457+
XFS_ERRTAG_ALLOC_READ_AGF))
24592458
xfs_buf_ioerror(bp, -EFSCORRUPTED);
24602459

24612460
if (bp->b_error)
@@ -2842,8 +2841,7 @@ xfs_free_extent(
28422841
ASSERT(type != XFS_AG_RESV_AGFL);
28432842

28442843
if (XFS_TEST_ERROR(false, mp,
2845-
XFS_ERRTAG_FREE_EXTENT,
2846-
XFS_RANDOM_FREE_EXTENT))
2844+
XFS_ERRTAG_FREE_EXTENT))
28472845
return -EIO;
28482846

28492847
error = xfs_free_extent_fix_freelist(tp, agno, &agbp);

‎fs/xfs/libxfs/xfs_bmap.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3992,7 +3992,7 @@ xfs_bmapi_read(
39923992
if (unlikely(XFS_TEST_ERROR(
39933993
(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
39943994
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
3995-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
3995+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
39963996
XFS_ERROR_REPORT("xfs_bmapi_read", XFS_ERRLEVEL_LOW, mp);
39973997
return -EFSCORRUPTED;
39983998
}
@@ -4473,7 +4473,7 @@ xfs_bmapi_write(
44734473
if (unlikely(XFS_TEST_ERROR(
44744474
(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
44754475
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
4476-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
4476+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
44774477
XFS_ERROR_REPORT("xfs_bmapi_write", XFS_ERRLEVEL_LOW, mp);
44784478
return -EFSCORRUPTED;
44794479
}
@@ -4694,7 +4694,7 @@ xfs_bmapi_remap(
46944694
if (unlikely(XFS_TEST_ERROR(
46954695
(XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
46964696
XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_BTREE),
4697-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
4697+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
46984698
XFS_ERROR_REPORT("xfs_bmapi_remap", XFS_ERRLEVEL_LOW, mp);
46994699
return -EFSCORRUPTED;
47004700
}
@@ -6098,7 +6098,7 @@ xfs_bmap_shift_extents(
60986098
if (unlikely(XFS_TEST_ERROR(
60996099
(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
61006100
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
6101-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
6101+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
61026102
XFS_ERROR_REPORT("xfs_bmap_shift_extents",
61036103
XFS_ERRLEVEL_LOW, mp);
61046104
return -EFSCORRUPTED;
@@ -6250,7 +6250,7 @@ xfs_bmap_split_extent_at(
62506250
if (unlikely(XFS_TEST_ERROR(
62516251
(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
62526252
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
6253-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
6253+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
62546254
XFS_ERROR_REPORT("xfs_bmap_split_extent_at",
62556255
XFS_ERRLEVEL_LOW, mp);
62566256
return -EFSCORRUPTED;
@@ -6508,8 +6508,7 @@ xfs_bmap_finish_one(
65086508
return -EFSCORRUPTED;
65096509

65106510
if (XFS_TEST_ERROR(false, tp->t_mountp,
6511-
XFS_ERRTAG_BMAP_FINISH_ONE,
6512-
XFS_RANDOM_BMAP_FINISH_ONE))
6511+
XFS_ERRTAG_BMAP_FINISH_ONE))
65136512
return -EIO;
65146513

65156514
switch (type) {

‎fs/xfs/libxfs/xfs_btree.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ xfs_btree_check_lblock(
101101
be64_to_cpu(block->bb_u.l.bb_rightsib)));
102102

103103
if (unlikely(XFS_TEST_ERROR(!lblock_ok, mp,
104-
XFS_ERRTAG_BTREE_CHECK_LBLOCK,
105-
XFS_RANDOM_BTREE_CHECK_LBLOCK))) {
104+
XFS_ERRTAG_BTREE_CHECK_LBLOCK))) {
106105
if (bp)
107106
trace_xfs_btree_corrupt(bp, _RET_IP_);
108107
XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
@@ -153,8 +152,7 @@ xfs_btree_check_sblock(
153152
block->bb_u.s.bb_rightsib;
154153

155154
if (unlikely(XFS_TEST_ERROR(!sblock_ok, mp,
156-
XFS_ERRTAG_BTREE_CHECK_SBLOCK,
157-
XFS_RANDOM_BTREE_CHECK_SBLOCK))) {
155+
XFS_ERRTAG_BTREE_CHECK_SBLOCK))) {
158156
if (bp)
159157
trace_xfs_btree_corrupt(bp, _RET_IP_);
160158
XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);

‎fs/xfs/libxfs/xfs_dir2.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,7 @@ xfs_dir_ino_validate(
218218
agblkno != 0 &&
219219
ioff < (1 << mp->m_sb.sb_inopblog) &&
220220
XFS_AGINO_TO_INO(mp, agno, agino) == ino;
221-
if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE,
222-
XFS_RANDOM_DIR_INO_VALIDATE))) {
221+
if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE))) {
223222
xfs_warn(mp, "Invalid inode number 0x%Lx",
224223
(unsigned long long) ino);
225224
XFS_ERROR_REPORT("xfs_dir_ino_validate", XFS_ERRLEVEL_LOW, mp);

‎fs/xfs/libxfs/xfs_ialloc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,8 +2552,7 @@ xfs_agi_read_verify(
25522552
!xfs_buf_verify_cksum(bp, XFS_AGI_CRC_OFF))
25532553
xfs_buf_ioerror(bp, -EFSBADCRC);
25542554
else if (XFS_TEST_ERROR(!xfs_agi_verify(bp), mp,
2555-
XFS_ERRTAG_IALLOC_READ_AGI,
2556-
XFS_RANDOM_IALLOC_READ_AGI))
2555+
XFS_ERRTAG_IALLOC_READ_AGI))
25572556
xfs_buf_ioerror(bp, -EFSCORRUPTED);
25582557

25592558
if (bp->b_error)

‎fs/xfs/libxfs/xfs_inode_buf.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ xfs_inode_buf_verify(
105105
di_ok = dip->di_magic == cpu_to_be16(XFS_DINODE_MAGIC) &&
106106
xfs_dinode_good_version(mp, dip->di_version);
107107
if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
108-
XFS_ERRTAG_ITOBP_INOTOBP,
109-
XFS_RANDOM_ITOBP_INOTOBP))) {
108+
XFS_ERRTAG_ITOBP_INOTOBP))) {
110109
if (readahead) {
111110
bp->b_flags &= ~XBF_DONE;
112111
xfs_buf_ioerror(bp, -EIO);

‎fs/xfs/libxfs/xfs_refcount.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,7 @@ xfs_refcount_still_have_space(
805805
*/
806806
if (cur->bc_private.a.priv.refc.nr_ops > 2 &&
807807
XFS_TEST_ERROR(false, cur->bc_mp,
808-
XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE,
809-
XFS_RANDOM_REFCOUNT_CONTINUE_UPDATE))
808+
XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE))
810809
return false;
811810

812811
if (cur->bc_private.a.priv.refc.nr_ops == 0)
@@ -1068,8 +1067,7 @@ xfs_refcount_finish_one(
10681067
blockcount);
10691068

10701069
if (XFS_TEST_ERROR(false, mp,
1071-
XFS_ERRTAG_REFCOUNT_FINISH_ONE,
1072-
XFS_RANDOM_REFCOUNT_FINISH_ONE))
1070+
XFS_ERRTAG_REFCOUNT_FINISH_ONE))
10731071
return -EIO;
10741072

10751073
/*

‎fs/xfs/libxfs/xfs_rmap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,8 +2087,7 @@ xfs_rmap_finish_one(
20872087
startoff, blockcount, state);
20882088

20892089
if (XFS_TEST_ERROR(false, mp,
2090-
XFS_ERRTAG_RMAP_FINISH_ONE,
2091-
XFS_RANDOM_RMAP_FINISH_ONE))
2090+
XFS_ERRTAG_RMAP_FINISH_ONE))
20922091
return -EIO;
20932092

20942093
/*

‎fs/xfs/xfs_error.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ extern int xfs_errortag_init(struct xfs_mount *mp);
135135
extern void xfs_errortag_del(struct xfs_mount *mp);
136136
extern bool xfs_errortag_test(struct xfs_mount *mp, const char *expression,
137137
const char *file, int line, unsigned int error_tag);
138-
#define XFS_TEST_ERROR(expr, mp, tag, rf) \
138+
#define XFS_TEST_ERROR(expr, mp, tag) \
139139
((expr) || xfs_errortag_test((mp), #expr, __FILE__, __LINE__, (tag)))
140140

141141
extern int xfs_errortag_get(struct xfs_mount *mp, unsigned int error_tag);
@@ -146,7 +146,7 @@ extern int xfs_errortag_clearall(struct xfs_mount *mp);
146146
#else
147147
#define xfs_errortag_init(mp) (0)
148148
#define xfs_errortag_del(mp)
149-
#define XFS_TEST_ERROR(expr, mp, tag, rf) (expr)
149+
#define XFS_TEST_ERROR(expr, mp, tag) (expr)
150150
#define xfs_errortag_set(mp, tag, val) (ENOSYS)
151151
#define xfs_errortag_add(mp, tag) (ENOSYS)
152152
#define xfs_errortag_clearall(mp) (ENOSYS)

‎fs/xfs/xfs_inode.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3489,7 +3489,7 @@ xfs_iflush_int(
34893489
dip = xfs_buf_offset(bp, ip->i_imap.im_boffset);
34903490

34913491
if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC),
3492-
mp, XFS_ERRTAG_IFLUSH_1, XFS_RANDOM_IFLUSH_1)) {
3492+
mp, XFS_ERRTAG_IFLUSH_1)) {
34933493
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
34943494
"%s: Bad inode %Lu magic number 0x%x, ptr 0x%p",
34953495
__func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip);
@@ -3499,7 +3499,7 @@ xfs_iflush_int(
34993499
if (XFS_TEST_ERROR(
35003500
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
35013501
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE),
3502-
mp, XFS_ERRTAG_IFLUSH_3, XFS_RANDOM_IFLUSH_3)) {
3502+
mp, XFS_ERRTAG_IFLUSH_3)) {
35033503
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
35043504
"%s: Bad regular inode %Lu, ptr 0x%p",
35053505
__func__, ip->i_ino, ip);
@@ -3510,16 +3510,15 @@ xfs_iflush_int(
35103510
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
35113511
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE) &&
35123512
(ip->i_d.di_format != XFS_DINODE_FMT_LOCAL),
3513-
mp, XFS_ERRTAG_IFLUSH_4, XFS_RANDOM_IFLUSH_4)) {
3513+
mp, XFS_ERRTAG_IFLUSH_4)) {
35143514
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
35153515
"%s: Bad directory inode %Lu, ptr 0x%p",
35163516
__func__, ip->i_ino, ip);
35173517
goto corrupt_out;
35183518
}
35193519
}
35203520
if (XFS_TEST_ERROR(ip->i_d.di_nextents + ip->i_d.di_anextents >
3521-
ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5,
3522-
XFS_RANDOM_IFLUSH_5)) {
3521+
ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5)) {
35233522
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
35243523
"%s: detected corrupt incore inode %Lu, "
35253524
"total extents = %d, nblocks = %Ld, ptr 0x%p",
@@ -3529,7 +3528,7 @@ xfs_iflush_int(
35293528
goto corrupt_out;
35303529
}
35313530
if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,
3532-
mp, XFS_ERRTAG_IFLUSH_6, XFS_RANDOM_IFLUSH_6)) {
3531+
mp, XFS_ERRTAG_IFLUSH_6)) {
35333532
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
35343533
"%s: bad inode %Lu, forkoff 0x%x, ptr 0x%p",
35353534
__func__, ip->i_ino, ip->i_d.di_forkoff, ip);

‎fs/xfs/xfs_iomap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ xfs_file_iomap_begin_delay(
543543
if (unlikely(XFS_TEST_ERROR(
544544
(XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
545545
XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_BTREE),
546-
mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
546+
mp, XFS_ERRTAG_BMAPIFORMAT))) {
547547
XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
548548
error = -EFSCORRUPTED;
549549
goto out_unlock;

‎fs/xfs/xfs_log.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,7 @@ xlog_iodone(xfs_buf_t *bp)
11891189
* IOABORT state. The IOABORT state is only set in DEBUG mode to inject
11901190
* CRC errors into log recovery.
11911191
*/
1192-
if (XFS_TEST_ERROR(bp->b_error, l->l_mp, XFS_ERRTAG_IODONE_IOERR,
1193-
XFS_RANDOM_IODONE_IOERR) ||
1192+
if (XFS_TEST_ERROR(bp->b_error, l->l_mp, XFS_ERRTAG_IODONE_IOERR) ||
11941193
iclog->ic_state & XLOG_STATE_IOABORT) {
11951194
if (iclog->ic_state & XLOG_STATE_IOABORT)
11961195
iclog->ic_state &= ~XLOG_STATE_IOABORT;

0 commit comments

Comments
 (0)