]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
Cleanup old XFS_BTREE_* traces
authorCarlos Maiolino <cmaiolino@redhat.com>
Wed, 18 Apr 2018 19:46:06 +0000 (14:46 -0500)
committerEric Sandeen <sandeen@redhat.com>
Wed, 18 Apr 2018 19:46:06 +0000 (14:46 -0500)
Source kernel commit: e157ebdcb3acd16221f1e5f84c6e371e15d37b6e

Remove unused legacy btree traces from IRIX era.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
libxfs/xfs_alloc_btree.c
libxfs/xfs_bmap_btree.c
libxfs/xfs_btree.c
libxfs/xfs_btree.h
libxfs/xfs_ialloc_btree.c
libxfs/xfs_refcount_btree.c
libxfs/xfs_rmap_btree.c

index d1b47a27d18097b8d4b6bf9db8d6deff4c6618e3..15950cdc38a882cee7119ced6295278e569af6ef 100644 (file)
@@ -72,18 +72,13 @@ xfs_allocbt_alloc_block(
        int                     error;
        xfs_agblock_t           bno;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        /* Allocate the new block from the freelist. If we can't, give up.  */
        error = xfs_alloc_get_freelist(cur->bc_tp, cur->bc_private.a.agbp,
                                       &bno, 1);
-       if (error) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+       if (error)
                return error;
-       }
 
        if (bno == NULLAGBLOCK) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -93,7 +88,6 @@ xfs_allocbt_alloc_block(
        xfs_trans_agbtree_delta(cur->bc_tp, 1);
        new->s = cpu_to_be32(bno);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 }
index e2a1fec249fa07ae7f7e979f82f4c10052c45b7f..5735f9655812a9d69c2a71f481084f50440dbaea 100644 (file)
@@ -269,10 +269,10 @@ xfs_bmbt_alloc_block(
                cur->bc_private.b.dfops->dop_low = true;
        }
        if (WARN_ON_ONCE(args.fsbno == NULLFSBLOCK)) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
+
        ASSERT(args.len == 1);
        cur->bc_private.b.firstblock = args.fsbno;
        cur->bc_private.b.allocated++;
@@ -283,12 +283,10 @@ xfs_bmbt_alloc_block(
 
        new->l = cpu_to_be64(args.fsbno);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
  error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
index 1ec9ce13d0e340b210a4a0bed75bb6f39ac61efd..fcd244b4a323d423102393fe540f2512ae2f4d62 100644 (file)
@@ -1434,8 +1434,6 @@ xfs_btree_log_keys(
        int                     first,
        int                     last)
 {
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGBII(cur, bp, first, last);
 
        if (bp) {
                xfs_trans_buf_set_type(cur->bc_tp, bp, XFS_BLFT_BTREE_BUF);
@@ -1446,8 +1444,6 @@ xfs_btree_log_keys(
                xfs_trans_log_inode(cur->bc_tp, cur->bc_private.b.ip,
                                xfs_ilog_fbroot(cur->bc_private.b.whichfork));
        }
-
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
 }
 
 /*
@@ -1460,15 +1456,12 @@ xfs_btree_log_recs(
        int                     first,
        int                     last)
 {
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGBII(cur, bp, first, last);
 
        xfs_trans_buf_set_type(cur->bc_tp, bp, XFS_BLFT_BTREE_BUF);
        xfs_trans_log_buf(cur->bc_tp, bp,
                          xfs_btree_rec_offset(cur, first),
                          xfs_btree_rec_offset(cur, last + 1) - 1);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
 }
 
 /*
@@ -1481,8 +1474,6 @@ xfs_btree_log_ptrs(
        int                     first,  /* index of first pointer to log */
        int                     last)   /* index of last pointer to log */
 {
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGBII(cur, bp, first, last);
 
        if (bp) {
                struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
@@ -1497,7 +1488,6 @@ xfs_btree_log_ptrs(
                        xfs_ilog_fbroot(cur->bc_private.b.whichfork));
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
 }
 
 /*
@@ -1539,9 +1529,6 @@ xfs_btree_log_block(
                XFS_BTREE_LBLOCK_CRC_LEN
        };
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGBI(cur, bp, fields);
-
        if (bp) {
                int nbits;
 
@@ -1569,8 +1556,6 @@ xfs_btree_log_block(
                xfs_trans_log_inode(cur->bc_tp, cur->bc_private.b.ip,
                        xfs_ilog_fbroot(cur->bc_private.b.whichfork));
        }
-
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
 }
 
 /*
@@ -1589,9 +1574,6 @@ xfs_btree_increment(
        int                     error;          /* error return value */
        int                     lev;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, level);
-
        ASSERT(level < cur->bc_nlevels);
 
        /* Read-ahead to the right at this level. */
@@ -1667,17 +1649,14 @@ xfs_btree_increment(
                cur->bc_ptrs[lev] = 1;
        }
 out1:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -1697,9 +1676,6 @@ xfs_btree_decrement(
        int                     lev;
        union xfs_btree_ptr     ptr;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, level);
-
        ASSERT(level < cur->bc_nlevels);
 
        /* Read-ahead to the left at this level. */
@@ -1765,17 +1741,14 @@ xfs_btree_decrement(
                cur->bc_ptrs[lev] = xfs_btree_get_numrecs(block);
        }
 out1:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -1877,9 +1850,6 @@ xfs_btree_lookup(
        union xfs_btree_ptr     *pp;    /* ptr to btree block */
        union xfs_btree_ptr     ptr;    /* ptr to btree block */
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, dir);
-
        XFS_BTREE_STATS_INC(cur, lookup);
 
        /* No such thing as a zero-level tree. */
@@ -1925,7 +1895,6 @@ xfs_btree_lookup(
                                ASSERT(level == 0 && cur->bc_nlevels == 1);
 
                                cur->bc_ptrs[0] = dir != XFS_LOOKUP_LE;
-                               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                                *stat = 0;
                                return 0;
                        }
@@ -2000,7 +1969,6 @@ xfs_btree_lookup(
                        if (error)
                                goto error0;
                        XFS_WANT_CORRUPTED_RETURN(cur->bc_mp, i == 1);
-                       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                        *stat = 1;
                        return 0;
                }
@@ -2015,11 +1983,9 @@ xfs_btree_lookup(
                *stat = 1;
        else
                *stat = 0;
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -2165,10 +2131,8 @@ __xfs_btree_updkeys(
                trace_xfs_btree_updkeys(cur, level, bp);
 #ifdef DEBUG
                error = xfs_btree_check_block(cur, block, level, bp);
-               if (error) {
-                       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+               if (error)
                        return error;
-               }
 #endif
                ptr = cur->bc_ptrs[level];
                nlkey = xfs_btree_key_addr(cur, ptr, block);
@@ -2220,9 +2184,6 @@ xfs_btree_update_keys(
        if (cur->bc_flags & XFS_BTREE_OVERLAPPING)
                return __xfs_btree_updkeys(cur, level, block, bp, false);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGIK(cur, level, keyp);
-
        /*
         * Go up the tree from this level toward the root.
         * At each level, update the key value to the value input.
@@ -2237,10 +2198,8 @@ xfs_btree_update_keys(
                block = xfs_btree_get_block(cur, level, &bp);
 #ifdef DEBUG
                error = xfs_btree_check_block(cur, block, level, bp);
-               if (error) {
-                       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+               if (error)
                        return error;
-               }
 #endif
                ptr = cur->bc_ptrs[level];
                kp = xfs_btree_key_addr(cur, ptr, block);
@@ -2248,7 +2207,6 @@ xfs_btree_update_keys(
                xfs_btree_log_keys(cur, bp, ptr, ptr);
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 }
 
@@ -2268,9 +2226,6 @@ xfs_btree_update(
        int                     ptr;
        union xfs_btree_rec     *rp;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGR(cur, rec);
-
        /* Pick up the current block. */
        block = xfs_btree_get_block(cur, 0, &bp);
 
@@ -2303,11 +2258,9 @@ xfs_btree_update(
                        goto error0;
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -2335,9 +2288,6 @@ xfs_btree_lshift(
        int                     error;          /* error return value */
        int                     i;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, level);
-
        if ((cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) &&
            level == cur->bc_nlevels - 1)
                goto out0;
@@ -2496,21 +2446,17 @@ xfs_btree_lshift(
        /* Slide the cursor value left one. */
        cur->bc_ptrs[level]--;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 
 error1:
-       XFS_BTREE_TRACE_CURSOR(tcur, XBT_ERROR);
        xfs_btree_del_cursor(tcur, XFS_BTREE_ERROR);
        return error;
 }
@@ -2537,9 +2483,6 @@ xfs_btree_rshift(
        int                     error;          /* error return value */
        int                     i;              /* loop counter */
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, level);
-
        if ((cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) &&
            (level == cur->bc_nlevels - 1))
                goto out0;
@@ -2672,21 +2615,17 @@ xfs_btree_rshift(
 
        xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 
 error1:
-       XFS_BTREE_TRACE_CURSOR(tcur, XBT_ERROR);
        xfs_btree_del_cursor(tcur, XFS_BTREE_ERROR);
        return error;
 }
@@ -2722,9 +2661,6 @@ __xfs_btree_split(
        int                     i;
 #endif
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGIPK(cur, level, *ptrp, key);
-
        XFS_BTREE_STATS_INC(cur, split);
 
        /* Set up left block (current one). */
@@ -2874,16 +2810,13 @@ __xfs_btree_split(
                (*curp)->bc_ptrs[level + 1]++;
        }
        *ptrp = rptr;
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -2994,7 +2927,6 @@ xfs_btree_new_iroot(
        int                     i;              /* loop counter */
 #endif
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
        XFS_BTREE_STATS_INC(cur, newroot);
 
        ASSERT(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE);
@@ -3008,10 +2940,9 @@ xfs_btree_new_iroot(
        error = cur->bc_ops->alloc_block(cur, pp, &nptr, stat);
        if (error)
                goto error0;
-       if (*stat == 0) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
+       if (*stat == 0)
                return 0;
-       }
+
        XFS_BTREE_STATS_INC(cur, alloc);
 
        /* Copy the root into a real block. */
@@ -3074,10 +3005,8 @@ xfs_btree_new_iroot(
        *logflags |=
                XFS_ILOG_CORE | xfs_ilog_fbroot(cur->bc_private.b.whichfork);
        *stat = 1;
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -3102,7 +3031,6 @@ xfs_btree_new_root(
        union xfs_btree_ptr     rptr;
        union xfs_btree_ptr     lptr;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
        XFS_BTREE_STATS_INC(cur, newroot);
 
        /* initialise our start point from the cursor */
@@ -3202,14 +3130,11 @@ xfs_btree_new_root(
        xfs_btree_setbuf(cur, cur->bc_nlevels, nbp);
        cur->bc_ptrs[cur->bc_nlevels] = nptr;
        cur->bc_nlevels++;
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 0;
        return 0;
 }
@@ -3230,7 +3155,7 @@ xfs_btree_make_block_unfull(
 
        if ((cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) &&
            level == cur->bc_nlevels - 1) {
-               struct xfs_inode *ip = cur->bc_private.b.ip;
+               struct xfs_inode *ip = cur->bc_private.b.ip;
 
                if (numrecs < cur->bc_ops->get_dmaxrecs(cur, level)) {
                        /* A root block that can be made bigger. */
@@ -3309,9 +3234,6 @@ xfs_btree_insrec(
 #endif
        xfs_daddr_t             old_bn;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGIPR(cur, level, *ptrp, &rec);
-
        ncur = NULL;
        lkey = &nkey;
 
@@ -3324,14 +3246,12 @@ xfs_btree_insrec(
                error = xfs_btree_new_root(cur, stat);
                xfs_btree_set_ptr_null(cur, ptrp);
 
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                return error;
        }
 
        /* If we're off the left edge, return failure. */
        ptr = cur->bc_ptrs[level];
        if (ptr == 0) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -3489,12 +3409,10 @@ xfs_btree_insrec(
                *curp = ncur;
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -3572,11 +3490,9 @@ xfs_btree_insert(
                }
        } while (!xfs_btree_ptr_is_null(cur, &nptr));
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = i;
        return 0;
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
@@ -3611,8 +3527,6 @@ xfs_btree_kill_iroot(
        int                     i;
 #endif
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        ASSERT(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE);
        ASSERT(cur->bc_nlevels > 1);
 
@@ -3670,19 +3584,15 @@ xfs_btree_kill_iroot(
 #ifdef DEBUG
        for (i = 0; i < numrecs; i++) {
                error = xfs_btree_check_ptr(cur, cpp, i, level - 1);
-               if (error) {
-                       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+               if (error)
                        return error;
-               }
        }
 #endif
        xfs_btree_copy_ptrs(cur, pp, cpp, numrecs);
 
        error = xfs_btree_free_block(cur, cbp);
-       if (error) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+       if (error)
                return error;
-       }
 
        cur->bc_bufs[level - 1] = NULL;
        be16_add_cpu(&block->bb_level, -1);
@@ -3690,7 +3600,6 @@ xfs_btree_kill_iroot(
                XFS_ILOG_CORE | xfs_ilog_fbroot(cur->bc_private.b.whichfork));
        cur->bc_nlevels--;
 out0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 }
 
@@ -3706,7 +3615,6 @@ xfs_btree_kill_root(
 {
        int                     error;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
        XFS_BTREE_STATS_INC(cur, killroot);
 
        /*
@@ -3716,16 +3624,13 @@ xfs_btree_kill_root(
        cur->bc_ops->set_root(cur, newroot, -1);
 
        error = xfs_btree_free_block(cur, bp);
-       if (error) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+       if (error)
                return error;
-       }
 
        cur->bc_bufs[level] = NULL;
        cur->bc_ra[level] = 0;
        cur->bc_nlevels--;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        return 0;
 }
 
@@ -3744,7 +3649,6 @@ xfs_btree_dec_cursor(
                        return error;
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 }
@@ -3780,15 +3684,11 @@ xfs_btree_delrec(
        struct xfs_btree_cur    *tcur;          /* temporary btree cursor */
        int                     numrecs;        /* temporary numrec count */
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-       XFS_BTREE_TRACE_ARGI(cur, level);
-
        tcur = NULL;
 
        /* Get the index of the entry being deleted, check for nothing there. */
        ptr = cur->bc_ptrs[level];
        if (ptr == 0) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -3805,7 +3705,6 @@ xfs_btree_delrec(
 
        /* Fail if we're off the end of the block. */
        if (ptr > numrecs) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -4080,7 +3979,7 @@ xfs_btree_delrec(
                                tcur = NULL;
                                if (level == 0)
                                        cur->bc_ptrs[0]++;
-                               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
+
                                *stat = 1;
                                return 0;
                        }
@@ -4250,13 +4149,11 @@ xfs_btree_delrec(
         * call updkeys directly.
         */
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        /* Return value means the next level up has something to do. */
        *stat = 2;
        return 0;
 
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        if (tcur)
                xfs_btree_del_cursor(tcur, XFS_BTREE_ERROR);
        return error;
@@ -4277,8 +4174,6 @@ xfs_btree_delete(
        int                     i;
        bool                    joined = false;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        /*
         * Go up the tree, starting at leaf level.
         *
@@ -4314,11 +4209,9 @@ xfs_btree_delete(
                }
        }
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = i;
        return 0;
 error0:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
index 867e6c14e8ea90694d4efe418bd3ae05d5b6a279..c2c8b6cf9430c39e5c73e94efac95e1653b98be5 100644 (file)
@@ -473,25 +473,6 @@ static inline int xfs_btree_get_level(struct xfs_btree_block *block)
 #define        XFS_FILBLKS_MIN(a,b)    min_t(xfs_filblks_t, (a), (b))
 #define        XFS_FILBLKS_MAX(a,b)    max_t(xfs_filblks_t, (a), (b))
 
-/*
- * Trace hooks.  Currently not implemented as they need to be ported
- * over to the generic tracing functionality, which is some effort.
- *
- * i,j = integer (32 bit)
- * b = btree block buffer (xfs_buf_t)
- * p = btree ptr
- * r = btree record
- * k = btree key
- */
-#define        XFS_BTREE_TRACE_ARGBI(c, b, i)
-#define        XFS_BTREE_TRACE_ARGBII(c, b, i, j)
-#define        XFS_BTREE_TRACE_ARGI(c, i)
-#define        XFS_BTREE_TRACE_ARGIPK(c, i, p, s)
-#define        XFS_BTREE_TRACE_ARGIPR(c, i, p, r)
-#define        XFS_BTREE_TRACE_ARGIK(c, i, k)
-#define XFS_BTREE_TRACE_ARGR(c, r)
-#define        XFS_BTREE_TRACE_CURSOR(c, t)
-
 xfs_failaddr_t xfs_btree_sblock_v5hdr_verify(struct xfs_buf *bp);
 xfs_failaddr_t xfs_btree_sblock_verify(struct xfs_buf *bp,
                unsigned int max_recs);
index aeb80bf1f00dba5eeb209f1013bdd9802a8720cd..3bbb6ebe5778fa8116bd038b3b77d44328f42d64 100644 (file)
@@ -92,8 +92,6 @@ __xfs_inobt_alloc_block(
        int                     error;          /* error return value */
        xfs_agblock_t           sbno = be32_to_cpu(start->s);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        memset(&args, 0, sizeof(args));
        args.tp = cur->bc_tp;
        args.mp = cur->bc_mp;
@@ -106,17 +104,14 @@ __xfs_inobt_alloc_block(
        args.resv = resv;
 
        error = xfs_alloc_vextent(&args);
-       if (error) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+       if (error)
                return error;
-       }
+
        if (args.fsbno == NULLFSBLOCK) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
        ASSERT(args.len == 1);
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
 
        new->s = cpu_to_be32(XFS_FSB_TO_AGBNO(args.mp, args.fsbno));
        *stat = 1;
index 72994b5a1faca5b062418bba07e0d072af1f7c91..b111b1f4f80ec6b86b5f513f08b0f99bfbf9ad8c 100644 (file)
@@ -78,8 +78,6 @@ xfs_refcountbt_alloc_block(
        struct xfs_alloc_arg    args;           /* block allocation args */
        int                     error;          /* error return value */
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        memset(&args, 0, sizeof(args));
        args.tp = cur->bc_tp;
        args.mp = cur->bc_mp;
@@ -97,7 +95,6 @@ xfs_refcountbt_alloc_block(
        trace_xfs_refcountbt_alloc_block(cur->bc_mp, cur->bc_private.a.agno,
                        args.agbno, 1);
        if (args.fsbno == NULLFSBLOCK) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -108,12 +105,10 @@ xfs_refcountbt_alloc_block(
        be32_add_cpu(&agf->agf_refcount_blocks, 1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_REFCOUNT_BLOCKS);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 
 out_error:
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
        return error;
 }
 
index 2676aab3870b740bf66da8688898254908a8c76a..5b52804d563d234cac7c58ed789099e813d5848f 100644 (file)
@@ -102,20 +102,15 @@ xfs_rmapbt_alloc_block(
        int                     error;
        xfs_agblock_t           bno;
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-
        /* Allocate the new block from the freelist. If we can't, give up.  */
        error = xfs_alloc_get_freelist(cur->bc_tp, cur->bc_private.a.agbp,
                                       &bno, 1);
-       if (error) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
+       if (error)
                return error;
-       }
 
        trace_xfs_rmapbt_alloc_block(cur->bc_mp, cur->bc_private.a.agno,
                        bno, 1);
        if (bno == NULLAGBLOCK) {
-               XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
                *stat = 0;
                return 0;
        }
@@ -128,7 +123,6 @@ xfs_rmapbt_alloc_block(
        be32_add_cpu(&agf->agf_rmap_blocks, 1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
 
-       XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
        *stat = 1;
        return 0;
 }