xfs: remove the mappedbno argument to xfs_attr3_leaf_read

Source kernel commit: dfb8759408a9dd8a31a222ed0987bad3e83b50a0

This argument is always hard coded to -1, so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
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@sandeen.net>

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index ada1b5f40ba3523e8490ecf0008080daa90cd0b6..f360b688fd56223b678f03c495721d41e11f1953 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -588,7 +588,7 @@ xfs_attr_leaf_addname(
         */
        dp = args->dp;
        args->blkno = 0;
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);
        if (error)
                return error;
 
@@ -714,7 +714,7 @@ xfs_attr_leaf_addname(
                 * remove the "old" attr from that block (neat, huh!)
                 */
                error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,
-                                          -1, &bp);
+                                          &bp);
                if (error)
                        return error;
 
@@ -768,7 +768,7 @@ xfs_attr_leaf_removename(
         */
        dp = args->dp;
        args->blkno = 0;
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);
        if (error)
                return error;
 
@@ -812,7 +812,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args)
        trace_xfs_attr_leaf_get(args);
 
        args->blkno = 0;
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);
        if (error)
                return error;
 
@@ -1172,7 +1172,7 @@ xfs_attr_node_removename(
                ASSERT(state->path.blk[0].bp);
                state->path.blk[0].bp = NULL;
 
-               error = xfs_attr3_leaf_read(args->trans, args->dp, 0, -1, &bp);
+               error = xfs_attr3_leaf_read(args->trans, args->dp, 0, &bp);
                if (error)
                        goto out;
 

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 9e989189ce7d14c756a87745af7fcb8001d6ce33..61b8b7c808ad5e87838d397524ff92e5b8437aee 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -426,13 +426,12 @@ xfs_attr3_leaf_read(
        struct xfs_trans        *tp,
        struct xfs_inode        *dp,
        xfs_dablk_t             bno,
-       xfs_daddr_t             mappedbno,
        struct xfs_buf          **bpp)
 {
        int                     err;
 
-       err = xfs_da_read_buf(tp, dp, bno, mappedbno, bpp,
-                               XFS_ATTR_FORK, &xfs_attr3_leaf_buf_ops);
+       err = xfs_da_read_buf(tp, dp, bno, -1, bpp, XFS_ATTR_FORK,
+                       &xfs_attr3_leaf_buf_ops);
        if (!err && tp && *bpp)
                xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_ATTR_LEAF_BUF);
        return err;
@@ -1155,7 +1154,7 @@ xfs_attr3_leaf_to_node(
        error = xfs_da_grow_inode(args, &blkno);
        if (error)
                goto out;
-       error = xfs_attr3_leaf_read(args->trans, dp, 0, -1, &bp1);
+       error = xfs_attr3_leaf_read(args->trans, dp, 0, &bp1);
        if (error)
                goto out;
 
@@ -1992,7 +1991,7 @@ xfs_attr3_leaf_toosmall(
                if (blkno == 0)
                        continue;
                error = xfs_attr3_leaf_read(state->args->trans, state->args->dp,
-                                       blkno, -1, &bp);
+                                       blkno, &bp);
                if (error)
                        return error;
 
@@ -2728,7 +2727,7 @@ xfs_attr3_leaf_clearflag(
        /*
         * Set up the operation.
         */
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);
        if (error)
                return error;
 
@@ -2795,7 +2794,7 @@ xfs_attr3_leaf_setflag(
        /*
         * Set up the operation.
         */
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);
        if (error)
                return error;
 
@@ -2857,7 +2856,7 @@ xfs_attr3_leaf_flipflags(
        /*
         * Read the block containing the "old" attr
         */
-       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp1);
+       error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp1);
        if (error)
                return error;
 
@@ -2866,7 +2865,7 @@ xfs_attr3_leaf_flipflags(
         */
        if (args->blkno2 != args->blkno) {
                error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno2,
-                                          -1, &bp2);
+                                          &bp2);
                if (error)
                        return error;
        } else {

diff --git a/libxfs/xfs_attr_leaf.h b/libxfs/xfs_attr_leaf.h
index 16208a7743dfac4856199df44498118727efc0ab..f4a188e28b7b692dce5c3cc46af0c962a290ad61 100644 (file)
--- a/libxfs/xfs_attr_leaf.h
+++ b/libxfs/xfs_attr_leaf.h
@@ -108,8 +108,7 @@ int xfs_attr_leaf_order(struct xfs_buf *leaf1_bp,
                                   struct xfs_buf *leaf2_bp);
 int    xfs_attr_leaf_newentsize(struct xfs_da_args *args, int *local);
 int    xfs_attr3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,
-                       xfs_dablk_t bno, xfs_daddr_t mappedbno,
-                       struct xfs_buf **bpp);
+                       xfs_dablk_t bno, struct xfs_buf **bpp);
 void   xfs_attr3_leaf_hdr_from_disk(struct xfs_da_geometry *geo,
                                     struct xfs_attr3_icleaf_hdr *to,
                                     struct xfs_attr_leafblock *from);