xfs: move and rename xfs_btree_read_bufl

Despite its name, xfs_btree_read_bufl doesn't contain any btree-related
functionaliy and isn't used by the btree code.  Move it to xfs_bmap.c,
hard code the refval and ops arguments and rename it to
xfs_bmap_read_buf.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 5a39fdb5178b59aa279e6055bc91bc75d7d7092d..2e0546eb80102e4ca91b14b75189fc42cc536bc9 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -226,6 +226,28 @@ xfs_bmap_forkoff_reset(
        }
 }
 
+static int
+xfs_bmap_read_buf(
+       struct xfs_mount        *mp,            /* file system mount point */
+       struct xfs_trans        *tp,            /* transaction pointer */
+       xfs_fsblock_t           fsbno,          /* file system block number */
+       struct xfs_buf          **bpp)          /* buffer for fsbno */
+{
+       struct xfs_buf          *bp;            /* return value */
+       int                     error;
+
+       if (!xfs_verify_fsbno(mp, fsbno))
+               return -EFSCORRUPTED;
+       error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
+                       XFS_FSB_TO_DADDR(mp, fsbno), mp->m_bsize, 0, &bp,
+                       &xfs_bmbt_buf_ops);
+       if (!error) {
+               xfs_buf_set_ref(bp, XFS_BMAP_BTREE_REF);
+               *bpp = bp;
+       }
+       return error;
+}
+
 #ifdef DEBUG
 STATIC struct xfs_buf *
 xfs_bmap_get_bp(
@@ -365,9 +387,7 @@ xfs_bmap_check_leaf_extents(
                bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));
                if (!bp) {
                        bp_release = 1;
-                       error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
-                                               XFS_BMAP_BTREE_REF,
-                                               &xfs_bmbt_buf_ops);
+                       error = xfs_bmap_read_buf(mp, NULL, bno, &bp);
                        if (xfs_metadata_is_sick(error))
                                xfs_btree_mark_sick(cur);
                        if (error)
@@ -454,9 +474,7 @@ xfs_bmap_check_leaf_extents(
                bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));
                if (!bp) {
                        bp_release = 1;
-                       error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
-                                               XFS_BMAP_BTREE_REF,
-                                               &xfs_bmbt_buf_ops);
+                       error = xfs_bmap_read_buf(mp, NULL, bno, &bp);
                        if (xfs_metadata_is_sick(error))
                                xfs_btree_mark_sick(cur);
                        if (error)
@@ -573,8 +591,7 @@ xfs_bmap_btree_to_extents(
                return -EFSCORRUPTED;
        }
 #endif
-       error = xfs_btree_read_bufl(mp, tp, cbno, &cbp, XFS_BMAP_BTREE_REF,
-                               &xfs_bmbt_buf_ops);
+       error = xfs_bmap_read_buf(mp, tp, cbno, &cbp);
        if (xfs_metadata_is_sick(error))
                xfs_btree_mark_sick(cur);
        if (error)

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 0f06ee026d9aa3d6c7c060d994b638508a532058..ecdd5ea27a0386f546a90c5072f86491a070a851 100644 (file)
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -859,36 +859,6 @@ xfs_btree_offsets(
        }
 }
 
-/*
- * Get a buffer for the block, return it read in.
- * Long-form addressing.
- */
-int
-xfs_btree_read_bufl(
-       struct xfs_mount        *mp,            /* file system mount point */
-       struct xfs_trans        *tp,            /* transaction pointer */
-       xfs_fsblock_t           fsbno,          /* file system block number */
-       struct xfs_buf          **bpp,          /* buffer for fsbno */
-       int                     refval,         /* ref count value for buffer */
-       const struct xfs_buf_ops *ops)
-{
-       struct xfs_buf          *bp;            /* return value */
-       xfs_daddr_t             d;              /* real disk block address */
-       int                     error;
-
-       if (!xfs_verify_fsbno(mp, fsbno))
-               return -EFSCORRUPTED;
-       d = XFS_FSB_TO_DADDR(mp, fsbno);
-       error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,
-                                  mp->m_bsize, 0, &bp, ops);
-       if (error)
-               return error;
-       if (bp)
-               xfs_buf_set_ref(bp, refval);
-       *bpp = bp;
-       return 0;
-}
-
 STATIC int
 xfs_btree_readahead_fsblock(
        struct xfs_btree_cur    *cur,

diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
index c48b4fdebafa67ca911e4b7417d2ca63dfaba576..bacd67cc8cedbc4c9d7a4a823af619f172bd0572 100644 (file)
--- a/fs/xfs/libxfs/xfs_btree.h
+++ b/fs/xfs/libxfs/xfs_btree.h
@@ -378,19 +378,6 @@ xfs_btree_offsets(
        int                     *first, /* output: first byte offset */
        int                     *last); /* output: last byte offset */
 
-/*
- * Get a buffer for the block, return it read in.
- * Long-form addressing.
- */
-int                                    /* error */
-xfs_btree_read_bufl(
-       struct xfs_mount        *mp,    /* file system mount point */
-       struct xfs_trans        *tp,    /* transaction pointer */
-       xfs_fsblock_t           fsbno,  /* file system block number */
-       struct xfs_buf          **bpp,  /* buffer for fsbno */
-       int                     refval, /* ref count value for buffer */
-       const struct xfs_buf_ops *ops);
-
 /*
  * Initialise a new btree block header
  */