xfs: remove the expr argument to XFS_TEST_ERROR

Source kernel commit: 807df3227d7674d7957c576551d552acf15bb96f

Don't pass expr to XFS_TEST_ERROR.  Most calls pass a constant false,
and the places that do pass an expression become cleaner by moving it
out.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
[aalbersh: remove argument from a macro and fix call in defer_item.c]
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>

diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
index 4530583ddabae1566376b81b53f006e80be20695..3dc938d514e65eb7571f414ad8aa301581cae235 100644 (file)
--- a/libxfs/defer_item.c
+++ b/libxfs/defer_item.c
@@ -754,7 +754,7 @@ xfs_attr_finish_item(
         */
        args->trans = tp;
 
-       if (XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_LARP)) {
+       if (XFS_TEST_ERROR(args->dp->i_mount, XFS_ERRTAG_LARP)) {
                error = -EIO;
                goto out;
        }

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 48a84a1089ee47dd763b6003fe545791203633d6..5474865a673e9a0a28c5fc2f2d423015953bd0ad 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -185,7 +185,7 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #define XFS_STATS_INC(mp, count)       do { (mp) = (mp); } while (0)
 #define XFS_STATS_DEC(mp, count, x)    do { (mp) = (mp); } while (0)
 #define XFS_STATS_ADD(mp, count, x)    do { (mp) = (mp); } while (0)
-#define XFS_TEST_ERROR(expr,a,b)       ( expr )
+#define XFS_TEST_ERROR(a,b)            (false)
 
 #define __section(section)     __attribute__((__section__(section)))
 

diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
index 83cac20331fd349ae3a0313d3624c29e2a1171c3..842e797b2f9c68744b265c5611a47a6be4e009e6 100644 (file)
--- a/libxfs/xfs_ag_resv.c
+++ b/libxfs/xfs_ag_resv.c
@@ -91,9 +91,8 @@ xfs_ag_resv_critical(
        trace_xfs_ag_resv_critical(pag, type, avail);
 
        /* Critically low if less than 10% or max btree height remains. */
-       return XFS_TEST_ERROR(avail < orig / 10 ||
-                             avail < mp->m_agbtree_maxlevels,
-                       mp, XFS_ERRTAG_AG_RESV_CRITICAL);
+       return avail < orig / 10 || avail < mp->m_agbtree_maxlevels ||
+               XFS_TEST_ERROR(mp, XFS_ERRTAG_AG_RESV_CRITICAL);
 }
 
 /*
@@ -202,7 +201,7 @@ __xfs_ag_resv_init(
                return -EINVAL;
        }
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_AG_RESV_FAIL))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_AG_RESV_FAIL))
                error = -ENOSPC;
        else
                error = xfs_dec_fdblocks(mp, hidden_space, true);

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index a9fb29ea9978c4e7ffa1c0184ea3a1b4a1995e2c..311f5342d6e982302c91ca7b31fa3a5cfcd63a72 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -3317,7 +3317,7 @@ xfs_agf_read_verify(
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_agf_verify(bp);
-               if (XFS_TEST_ERROR(fa, mp, XFS_ERRTAG_ALLOC_READ_AGF))
+               if (fa || XFS_TEST_ERROR(mp, XFS_ERRTAG_ALLOC_READ_AGF))
                        xfs_verifier_error(bp, -EFSCORRUPTED, fa);
        }
 }
@@ -4015,8 +4015,7 @@ __xfs_free_extent(
        ASSERT(len != 0);
        ASSERT(type != XFS_AG_RESV_AGFL);
 
-       if (XFS_TEST_ERROR(false, mp,
-                       XFS_ERRTAG_FREE_EXTENT))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_FREE_EXTENT))
                return -EIO;
 
        error = xfs_free_extent_fix_freelist(tp, pag, &agbp);

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index cfb8d40e51a987770ce444952ee835c0852afefb..29e9a419d07c8bd977669fd0cef2ac5f30a5d5f1 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -1209,7 +1209,7 @@ xfs_attr3_leaf_to_node(
 
        trace_xfs_attr_leaf_to_node(args);
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_ATTR_LEAF_TO_NODE)) {
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_ATTR_LEAF_TO_NODE)) {
                error = -EIO;
                goto out;
        }

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index e6a1922abb2924ebc983d5084317d76d7211d0c0..f2f616e521759e80cda9d19b8880c8617b1564f3 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3648,8 +3648,7 @@ xfs_bmap_btalloc(
        /* Trim the allocation back to the maximum an AG can fit. */
        args.maxlen = min(ap->length, mp->m_ag_max_usable);
 
-       if (unlikely(XFS_TEST_ERROR(false, mp,
-                       XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT)))
+       if (unlikely(XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT)))
                error = xfs_bmap_exact_minlen_extent_alloc(ap, &args);
        else if ((ap->datatype & XFS_ALLOC_USERDATA) &&
                        xfs_inode_is_filestream(ap->ip))
@@ -3835,7 +3834,7 @@ xfs_bmapi_read(
        }
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -4186,7 +4185,7 @@ xfs_bmapi_write(
                        (XFS_BMAPI_PREALLOC | XFS_BMAPI_ZERO));
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -4531,7 +4530,7 @@ xfs_bmapi_remap(
                        (XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC));
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -5665,7 +5664,7 @@ xfs_bmap_collapse_extents(
        int                     logflags = 0;
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -5781,7 +5780,7 @@ xfs_bmap_insert_extents(
        int                     logflags = 0;
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -5886,7 +5885,7 @@ xfs_bmap_split_extent(
        int                             i = 0;
 
        if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {
                xfs_bmap_mark_sick(ip, whichfork);
                return -EFSCORRUPTED;
        }
@@ -6051,7 +6050,7 @@ xfs_bmap_finish_one(
 
        trace_xfs_bmap_deferred(bi);
 
-       if (XFS_TEST_ERROR(false, tp->t_mountp, XFS_ERRTAG_BMAP_FINISH_ONE))
+       if (XFS_TEST_ERROR(tp->t_mountp, XFS_ERRTAG_BMAP_FINISH_ONE))
                return -EIO;
 
        switch (bi->bi_type) {

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 8576611994f4267c269fb707d2e285d3c0adc1ca..1404d86fb963940228b1aca3c001dde466806222 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -303,7 +303,7 @@ xfs_btree_check_block(
 
        fa = __xfs_btree_check_block(cur, block, level, bp);
        if (XFS_IS_CORRUPT(mp, fa != NULL) ||
-           XFS_TEST_ERROR(false, mp, xfs_btree_block_errtag(cur))) {
+           XFS_TEST_ERROR(mp, xfs_btree_block_errtag(cur))) {
                if (bp)
                        trace_xfs_btree_corrupt(bp, _RET_IP_);
                xfs_btree_mark_sick(cur);

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index af3fcdf5e4da492eb98073357bf5bdc276564123..37be99bd54c77291c1398583d7e8d9ac3269a8a9 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -561,7 +561,7 @@ xfs_da3_split(
 
        trace_xfs_da_split(state->args);
 
-       if (XFS_TEST_ERROR(false, state->mp, XFS_ERRTAG_DA_LEAF_SPLIT))
+       if (XFS_TEST_ERROR(state->mp, XFS_ERRTAG_DA_LEAF_SPLIT))
                return -EIO;
 
        /*

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 1285019b674423ace568718f2c35640fb5287d43..d5f2e516e5bfeac5fdccc4ec1a30e39b723c7c3f 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -222,7 +222,7 @@ xfs_dir_ino_validate(
        bool            ino_ok = xfs_verify_dir_ino(mp, ino);
 
        if (XFS_IS_CORRUPT(mp, !ino_ok) ||
-           XFS_TEST_ERROR(false, mp, XFS_ERRTAG_DIR_INO_VALIDATE)) {
+           XFS_TEST_ERROR(mp, XFS_ERRTAG_DIR_INO_VALIDATE)) {
                xfs_warn(mp, "Invalid inode number 0x%Lx",
                                (unsigned long long) ino);
                return -EFSCORRUPTED;

diff --git a/libxfs/xfs_exchmaps.c b/libxfs/xfs_exchmaps.c
index 2d7513549429b4a2bd238cd956af9d323d446327..8e39324d42ca25f8ad0fc6bcacd167393a0f79a6 100644 (file)
--- a/libxfs/xfs_exchmaps.c
+++ b/libxfs/xfs_exchmaps.c
@@ -613,7 +613,7 @@ xfs_exchmaps_finish_one(
                        return error;
        }
 
-       if (XFS_TEST_ERROR(false, tp->t_mountp, XFS_ERRTAG_EXCHMAPS_FINISH_ONE))
+       if (XFS_TEST_ERROR(tp->t_mountp, XFS_ERRTAG_EXCHMAPS_FINISH_ONE))
                return -EIO;
 
        /* If we still have work to do, ask for a new transaction. */
@@ -879,7 +879,7 @@ xmi_ensure_delta_nextents(
                                &new_nextents))
                return -EFBIG;
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REDUCE_MAX_IEXTENTS) &&
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_REDUCE_MAX_IEXTENTS) &&
            new_nextents > 10)
                return -EFBIG;
 

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 0efad4cfdae89e763511641b90cd84b9b30a2e9d..9f4ec7bbc0253194d15ac77aaacf68cd69a39798 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -2701,7 +2701,7 @@ xfs_agi_read_verify(
                xfs_verifier_error(bp, -EFSBADCRC, __this_address);
        else {
                fa = xfs_agi_verify(bp);
-               if (XFS_TEST_ERROR(fa, mp, XFS_ERRTAG_IALLOC_READ_AGI))
+               if (fa || XFS_TEST_ERROR(mp, XFS_ERRTAG_IALLOC_READ_AGI))
                        xfs_verifier_error(bp, -EFSCORRUPTED, fa);
        }
 }

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index 4eca3d6dd6a71a3113e80cbea4895345480a64d4..e2c87ca03cc39b73c1b544744e1085eccfcb60ef 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -58,8 +58,8 @@ xfs_inode_buf_verify(
                di_ok = xfs_verify_magic16(bp, dip->di_magic) &&
                        xfs_dinode_good_version(mp, dip->di_version) &&
                        xfs_verify_agino_or_null(bp->b_pag, unlinked_ino);
-               if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
-                                               XFS_ERRTAG_ITOBP_INOTOBP))) {
+               if (unlikely(!di_ok ||
+                               XFS_TEST_ERROR(mp, XFS_ERRTAG_ITOBP_INOTOBP))) {
                        if (readahead) {
                                bp->b_flags &= ~XBF_DONE;
                                xfs_buf_ioerror(bp, -EIO);

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 52740e8e88342448684380f8d721c2803cbf2378..329d52cc524a169d5c5d26e826a2f33683e1c6c1 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -754,8 +754,7 @@ xfs_iext_count_extend(
        if (nr_exts < ifp->if_nextents)
                return -EFBIG;
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REDUCE_MAX_IEXTENTS) &&
-           nr_exts > 10)
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_REDUCE_MAX_IEXTENTS) && nr_exts > 10)
                return -EFBIG;
 
        if (nr_exts > xfs_iext_max_nextents(has_large, whichfork)) {

diff --git a/libxfs/xfs_metafile.c b/libxfs/xfs_metafile.c
index 6ded87d09ab755b692faf116e3bc5f01d1e3a64c..9c3751f58161e09e4adbe8c5afe1be3a3b5395ea 100644 (file)
--- a/libxfs/xfs_metafile.c
+++ b/libxfs/xfs_metafile.c
@@ -119,7 +119,7 @@ xfs_metafile_resv_critical(
                        div_u64(mp->m_metafile_resv_target, 10)))
                return true;
 
-       return XFS_TEST_ERROR(false, mp, XFS_ERRTAG_METAFILE_RESV_CRITICAL);
+       return XFS_TEST_ERROR(mp, XFS_ERRTAG_METAFILE_RESV_CRITICAL);
 }
 
 /* Allocate a block from the metadata file's reservation. */

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 4d31c3379df7d61147c92664a88cc530828428fd..f9714acd9a5a1bae6fa17011a9695e413093ab98 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -1111,8 +1111,7 @@ xfs_refcount_still_have_space(
         * refcount continue update "error" has been injected.
         */
        if (cur->bc_refc.nr_ops > 2 &&
-           XFS_TEST_ERROR(false, cur->bc_mp,
-                       XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE))
+           XFS_TEST_ERROR(cur->bc_mp, XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE))
                return false;
 
        if (cur->bc_refc.nr_ops == 0)
@@ -1396,7 +1395,7 @@ xfs_refcount_finish_one(
 
        trace_xfs_refcount_deferred(mp, ri);
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
                return -EIO;
 
        /*
@@ -1509,7 +1508,7 @@ xfs_rtrefcount_finish_one(
 
        trace_xfs_refcount_deferred(mp, ri);
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
                return -EIO;
 
        /*

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 8c0c22a3491df4c2580876f3e44eb7bc81c4fde7..33e856875db419954ed99cec69f1507ef5c5ab3f 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -2689,7 +2689,7 @@ xfs_rmap_finish_one(
 
        trace_xfs_rmap_deferred(mp, ri);
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_RMAP_FINISH_ONE))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_RMAP_FINISH_ONE))
                return -EIO;
 
        /*

diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
index 34425a933650389e983d1ca96f93d0cf38498d29..354ebb8d066e09d77954196e71cdd936f04da611 100644 (file)
--- a/libxfs/xfs_rtbitmap.c
+++ b/libxfs/xfs_rtbitmap.c
@@ -1062,7 +1062,7 @@ xfs_rtfree_extent(
        ASSERT(rbmip->i_itemp != NULL);
        xfs_assert_ilocked(rbmip, XFS_ILOCK_EXCL);
 
-       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_FREE_EXTENT))
+       if (XFS_TEST_ERROR(mp, XFS_ERRTAG_FREE_EXTENT))
                return -EIO;
 
        error = xfs_rtcheck_alloc_range(&args, start, len);