xfs_repair: Remove BUF_PTR from attr_repair.c

The BUF_PTR macro was removed from kernelspace a while ago
(6292604 xfs: Remove the macro XFS_BUF_PTR) but it lives
on in some parts of xfsprogs.  dir2.c doesn't use it,
but similar code in attr_repair.c does.  remove it from
attr_repair.c to converge the code.

Remove a related but unnecessary cast from a *void b_addr
in dir2.c while we're at it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index fe81df45b010606f5f2b04414ac47633cf0df827..5ae2356d5cbde0885fba10658d85abfc7b55f7c5 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -188,7 +188,7 @@ traverse_int_dablock(xfs_mount_t    *mp,
                        goto error_out;
                }
 
-               node = (xfs_da_intnode_t *)XFS_BUF_PTR(bp);
+               node = bp->b_addr;
                btree = M_DIROPS(mp)->node_tree_p(node);
                M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node);
 
@@ -335,7 +335,7 @@ verify_final_da_path(xfs_mount_t    *mp,
         * in the block which should be the final (rightmost) entry
         */
        entry = cursor->level[this_level].index;
-       node = (xfs_da_intnode_t *)XFS_BUF_PTR(cursor->level[this_level].bp);
+       node = cursor->level[this_level].bp->b_addr;
        btree = M_DIROPS(mp)->node_tree_p(node);
        M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node);
 
@@ -513,7 +513,7 @@ verify_da_path(xfs_mount_t  *mp,
         * should be processed now in this level.
         */
        entry = cursor->level[this_level].index;
-       node = (xfs_da_intnode_t *)XFS_BUF_PTR(cursor->level[this_level].bp);
+       node = cursor->level[this_level].bp->b_addr;
        btree = M_DIROPS(mp)->node_tree_p(node);
        M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node);
 
@@ -571,7 +571,7 @@ _("can't get map info for block %u of directory inode %" PRIu64 "\n"),
                        return(1);
                }
 
-               newnode = (xfs_da_intnode_t *)XFS_BUF_PTR(bp);
+               newnode = bp->b_addr;
                btree = M_DIROPS(mp)->node_tree_p(newnode);
                M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, newnode);
 
@@ -1040,7 +1040,7 @@ rmtval_get(xfs_mount_t *mp, xfs_ino_t ino, blkmap_t *blkmap,
                ASSERT(mp->m_sb.sb_blocksize == XFS_BUF_COUNT(bp));
 
                length = MIN(XFS_BUF_COUNT(bp) - hdrsize, valuelen - amountdone);
-               memmove(value, XFS_BUF_PTR(bp) + hdrsize, length);
+               memmove(value, bp->b_addr + hdrsize, length);
                amountdone += length;
                value += length;
                i++;
@@ -1620,7 +1620,7 @@ process_longform_attr(
        }
 
        /* verify leaf block */
-       leaf = (xfs_attr_leafblock_t *)XFS_BUF_PTR(bp);
+       leaf = bp->b_addr;
        xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
 
        /* check sibling pointers in leaf block or root block 0 before

diff --git a/repair/dir2.c b/repair/dir2.c
index d9bd5fc7807899b0b4a7868dfbbcfb4cab026a63..9398df55c6a75589d53f74de88776710a8a1be3e 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -347,7 +347,7 @@ verify_final_dir2_path(xfs_mount_t  *mp,
         * in the block which should be the final (rightmost) entry
         */
        entry = cursor->level[this_level].index;
-       node = (xfs_da_intnode_t *)(cursor->level[this_level].bp->b_addr);
+       node = cursor->level[this_level].bp->b_addr;
        btree = M_DIROPS(mp)->node_tree_p(node);
        M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node);