vserver 2.0 rc7

[linux-2.6.git] / fs / xfs / xfs_btree.c

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 099e26a..9dd22dd 100644 (file)
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -208,10 +208,10 @@ xfs_btree_check_lblock(
                INT_GET(block->bb_level, ARCH_CONVERT) == level &&
                INT_GET(block->bb_numrecs, ARCH_CONVERT) <=
                        xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) &&
-               !INT_ISZERO(block->bb_leftsib, ARCH_CONVERT) &&
+               block->bb_leftsib &&
                (INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLDFSBNO ||
                 XFS_FSB_SANITY_CHECK(mp, INT_GET(block->bb_leftsib, ARCH_CONVERT))) &&
-               !INT_ISZERO(block->bb_rightsib, ARCH_CONVERT) &&
+               block->bb_rightsib &&
                (INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLDFSBNO ||
                 XFS_FSB_SANITY_CHECK(mp, INT_GET(block->bb_rightsib, ARCH_CONVERT)));
        if (unlikely(XFS_TEST_ERROR(!lblock_ok, mp, XFS_ERRTAG_BTREE_CHECK_LBLOCK,
@@ -329,10 +329,10 @@ xfs_btree_check_sblock(
                        xfs_btree_maxrecs(cur, (xfs_btree_block_t *)block) &&
                (INT_GET(block->bb_leftsib, ARCH_CONVERT) == NULLAGBLOCK ||
                 INT_GET(block->bb_leftsib, ARCH_CONVERT) < agflen) &&
-               !INT_ISZERO(block->bb_leftsib, ARCH_CONVERT) &&
+               block->bb_leftsib &&
                (INT_GET(block->bb_rightsib, ARCH_CONVERT) == NULLAGBLOCK ||
                 INT_GET(block->bb_rightsib, ARCH_CONVERT) < agflen) &&
-               !INT_ISZERO(block->bb_rightsib, ARCH_CONVERT);
+               block->bb_rightsib;
        if (unlikely(XFS_TEST_ERROR(!sblock_ok, cur->bc_mp,
                        XFS_ERRTAG_BTREE_CHECK_SBLOCK,
                        XFS_RANDOM_BTREE_CHECK_SBLOCK))) {
@@ -484,7 +484,7 @@ xfs_btree_firstrec(
        /*
         * It's empty, there is no such record.
         */
-       if (INT_ISZERO(block->bb_h.bb_numrecs, ARCH_CONVERT))
+       if (!block->bb_h.bb_numrecs)
                return 0;
        /*
         * Set the ptr value to 1, that's the first record/key.
@@ -698,7 +698,7 @@ xfs_btree_lastrec(
        /*
         * It's empty, there is no such record.
         */
-       if (INT_ISZERO(block->bb_h.bb_numrecs, ARCH_CONVERT))
+       if (!block->bb_h.bb_numrecs)
                return 0;
        /*
         * Set the ptr value to numrecs, that's the last record/key.