libxfs: replace libxfs_readbuf with libxfs_buf_read

Change all the libxfs_readbuf calls to libxfs_buf_read to match the
kernel interface.  This enables us to hide libxfs_readbuf and simplify
the userspace buffer interface further.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 3e519471605b9a080778b12aeab57f1dc28f10d8..9e9719a0fdeab44e2eb26b6755657c982f10cdca 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -710,7 +710,7 @@ main(int argc, char **argv)
 
        /* We don't yet know the sector size, so read maximal size */
        libxfs_buftarg_init(&mbuf, xargs.ddev, xargs.logdev, xargs.rtdev);
-       sbp = libxfs_readbuf(mbuf.m_ddev_targp, XFS_SB_DADDR,
+       sbp = libxfs_buf_read(mbuf.m_ddev_targp, XFS_SB_DADDR,
                             1 << (XFS_MAX_SECTORSIZE_LOG - BBSHIFT), 0, NULL);
        sb = &mbuf.m_sb;
        libxfs_sb_from_disk(sb, XFS_BUF_TO_SBP(sbp));
@@ -718,7 +718,7 @@ main(int argc, char **argv)
        /* Do it again, now with proper length and verifier */
        libxfs_buf_relse(sbp);
        libxfs_purgebuf(sbp);
-       sbp = libxfs_readbuf(mbuf.m_ddev_targp, XFS_SB_DADDR,
+       sbp = libxfs_buf_read(mbuf.m_ddev_targp, XFS_SB_DADDR,
                             1 << (sb->sb_sectlog - BBSHIFT),
                             0, &xfs_sb_buf_ops);
        libxfs_buf_relse(sbp);

diff --git a/db/init.c b/db/init.c
index 15b4ec0c73ea0df6443d5f4e71e7c530f8f3c8db..8bad7e53d2ff66f9933e606799bfeb4125789091 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -112,7 +112,7 @@ init(
         */
        memset(&xmount, 0, sizeof(struct xfs_mount));
        libxfs_buftarg_init(&xmount, x.ddev, x.logdev, x.rtdev);
-       bp = libxfs_readbuf(xmount.m_ddev_targp, XFS_SB_DADDR,
+       bp = libxfs_buf_read(xmount.m_ddev_targp, XFS_SB_DADDR,
                            1 << (XFS_MAX_SECTORSIZE_LOG - BBSHIFT), 0, NULL);
 
        if (!bp || bp->b_error) {

diff --git a/db/io.c b/db/io.c
index a11b7bb1edea2d4fb6580d4ae56ebb1481b3278a..163ccc89326140cbafa1ff139a37bdff309a41eb 100644 (file)
--- a/db/io.c
+++ b/db/io.c
@@ -545,7 +545,7 @@ set_cur(
                bp = libxfs_readbuf_map(mp->m_ddev_targp, bbmap->b,
                                        bbmap->nmaps, 0, ops);
        } else {
-               bp = libxfs_readbuf(mp->m_ddev_targp, blknum, len, 0, ops);
+               bp = libxfs_buf_read(mp->m_ddev_targp, blknum, len, 0, ops);
                iocur_top->bbmap = NULL;
        }
 

diff --git a/libxfs/init.c b/libxfs/init.c
index a30debe9bc7908c3d16a204ee9843d779f4b0f6e..4697762e9178c5d1a6cb372bc0f26a2d3e8ff43d 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -450,7 +450,7 @@ rtmount_init(
                        (unsigned long long) mp->m_sb.sb_rblocks);
                return -1;
        }
-       bp = libxfs_readbuf(mp->m_rtdev,
+       bp = libxfs_buf_read(mp->m_rtdev,
                        d - XFS_FSB_TO_BB(mp, 1), XFS_FSB_TO_BB(mp, 1), 0, NULL);
        if (bp == NULL) {
                fprintf(stderr, _("%s: realtime size check failed\n"),
@@ -730,7 +730,7 @@ libxfs_mount(
                return mp;
 
        /* device size checks must pass unless we're a debugger. */
-       bp = libxfs_readbuf(mp->m_dev, d - XFS_FSS_TO_BB(mp, 1),
+       bp = libxfs_buf_read(mp->m_dev, d - XFS_FSS_TO_BB(mp, 1),
                        XFS_FSS_TO_BB(mp, 1), 0, NULL);
        if (!bp) {
                fprintf(stderr, _("%s: data size check failed\n"), progname);
@@ -743,7 +743,7 @@ libxfs_mount(
            mp->m_logdev_targp->dev != mp->m_ddev_targp->dev) {
                d = (xfs_daddr_t) XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
                if ( (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) ||
-                    (!(bp = libxfs_readbuf(mp->m_logdev_targp,
+                    (!(bp = libxfs_buf_read(mp->m_logdev_targp,
                                        d - XFS_FSB_TO_BB(mp, 1),
                                        XFS_FSB_TO_BB(mp, 1), 0, NULL)))) {
                        fprintf(stderr, _("%s: log size checks failed\n"),
@@ -770,7 +770,7 @@ libxfs_mount(
         * read the first one and let the user know to check the geometry.
         */
        if (sbp->sb_agcount > 1000000) {
-               bp = libxfs_readbuf(mp->m_dev,
+               bp = libxfs_buf_read(mp->m_dev,
                                XFS_AG_DADDR(mp, sbp->sb_agcount - 1, 0), 1,
                                0, NULL);
                if (bp->b_error) {

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 6d86774f336bcc4f0dbc163e5d2d4d6d969e1a9f..57cf5f8312e675000bb283976b3a601826b3c19c 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -45,6 +45,7 @@
 #define xfs_btree_init_block           libxfs_btree_init_block
 #define xfs_buf_delwri_submit          libxfs_buf_delwri_submit
 #define xfs_buf_get                    libxfs_buf_get
+#define xfs_buf_read                   libxfs_buf_read
 #define xfs_buf_relse                  libxfs_buf_relse
 #define xfs_bunmapi                    libxfs_bunmapi
 #define xfs_calc_dquots_per_chunk      libxfs_calc_dquots_per_chunk

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 50b7cef8a40ccd93af4c410c0182c5afaac0c39d..1b8318af9bfca80084d2c6d343ac7b536b84eabd 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -130,7 +130,7 @@ extern struct cache_operations      libxfs_bcache_operations;
 
 #ifdef XFS_BUF_TRACING
 
-#define libxfs_readbuf(dev, daddr, len, flags, ops) \
+#define libxfs_buf_read(dev, daddr, len, flags, ops) \
        libxfs_trace_readbuf(__FUNCTION__, __FILE__, __LINE__, \
                            (dev), (daddr), (len), (flags), (ops))
 #define libxfs_readbuf_map(dev, map, nmaps, flags, ops) \
@@ -151,9 +151,9 @@ extern struct cache_operations      libxfs_bcache_operations;
 #define libxfs_buf_relse(buf) \
        libxfs_trace_putbuf(__FUNCTION__, __FILE__, __LINE__, (buf))
 
-extern xfs_buf_t *libxfs_trace_readbuf(const char *, const char *, int,
-                       struct xfs_buftarg *, xfs_daddr_t, int, int,
-                       const struct xfs_buf_ops *);
+struct xfs_buf *libxfs_trace_readbuf(const char *func, const char *file,
+                       int line, struct xfs_buftarg *btp, xfs_daddr_t daddr,
+                       size_t len, int flags, const struct xfs_buf_ops *ops);
 extern xfs_buf_t *libxfs_trace_readbuf_map(const char *, const char *, int,
                        struct xfs_buftarg *, struct xfs_buf_map *, int, int,
                        const struct xfs_buf_ops *);
@@ -171,8 +171,6 @@ extern void libxfs_trace_putbuf (const char *, const char *, int,
 
 #else
 
-extern xfs_buf_t *libxfs_readbuf(struct xfs_buftarg *, xfs_daddr_t, int, int,
-                       const struct xfs_buf_ops *);
 extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
                        int, int, const struct xfs_buf_ops *);
 extern int     libxfs_writebuf(xfs_buf_t *, int);
@@ -193,11 +191,24 @@ libxfs_buf_get(
        return libxfs_getbuf_map(target, &map, 1, 0);
 }
 
+static inline struct xfs_buf*
+libxfs_buf_read(
+       struct xfs_buftarg      *target,
+       xfs_daddr_t             blkno,
+       size_t                  numblks,
+       xfs_buf_flags_t         flags,
+       const struct xfs_buf_ops *ops)
+{
+       DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
+
+       return libxfs_readbuf_map(target, &map, 1, flags, ops);
+}
+
 #endif /* XFS_BUF_TRACING */
 
 extern void    libxfs_readbuf_verify(struct xfs_buf *bp,
                        const struct xfs_buf_ops *ops);
-extern xfs_buf_t *libxfs_getsb(struct xfs_mount *);
+struct xfs_buf *libxfs_getsb(struct xfs_mount *mp);
 extern void    libxfs_bcache_purge(void);
 extern void    libxfs_bcache_free(void);
 extern void    libxfs_bcache_flush(void);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 8fc9222e27a0f5021263944b908814d0fc0d5af1..7b91ebf6863e47910923833ad1955a6bb6a24f79 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -44,7 +44,7 @@
  *
  * IOWs, userspace is behaving quite differently to the kernel and as a result
  * it leaks errors from reads, invalidations and writes through
- * libxfs_buf_get/libxfs_readbuf.
+ * libxfs_buf_get/libxfs_buf_read.
  *
  * The result of this is that until the userspace code outside libxfs is cleaned
  * up, functions that release buffers from userspace control (i.e
@@ -388,14 +388,11 @@ libxfs_log_header(
 
 #ifdef XFS_BUF_TRACING
 
-#undef libxfs_readbuf
 #undef libxfs_readbuf_map
 #undef libxfs_writebuf
 #undef libxfs_getbuf_map
 #undef libxfs_getbuf_flags
 
-xfs_buf_t      *libxfs_readbuf(struct xfs_buftarg *, xfs_daddr_t, int, int,
-                               const struct xfs_buf_ops *);
 xfs_buf_t      *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
                                int, int, const struct xfs_buf_ops *);
 int            libxfs_writebuf(xfs_buf_t *, int);
@@ -416,22 +413,21 @@ do {                                              \
        }                                       \
 } while (0)
 
-xfs_buf_t *
-libxfs_trace_readbuf(const char *func, const char *file, int line,
-               struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, int flags,
-               const struct xfs_buf_ops *ops)
+struct xfs_buf *
+libxfs_trace_readbuf(
+       const char              *func,
+       const char              *file,
+       int                     line,
+       struct xfs_buftarg      *btp,
+       xfs_daddr_t             blkno,
+       size_t                  len,
+       int                     flags,
+       const struct xfs_buf_ops *ops)
 {
-       xfs_buf_t       *bp = libxfs_readbuf(btp, blkno, len, flags, ops);
-       __add_trace(bp, func, file, line);
-       return bp;
-}
+       struct xfs_buf          *bp;
+       DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
 
-xfs_buf_t *
-libxfs_trace_readbuf_map(const char *func, const char *file, int line,
-               struct xfs_buftarg *btp, struct xfs_buf_map *map, int nmaps, int flags,
-               const struct xfs_buf_ops *ops)
-{
-       xfs_buf_t       *bp = libxfs_readbuf_map(btp, map, nmaps, flags, ops);
+       bp = libxfs_readbuf_map(btp, &map, 1, flags, ops);
        __add_trace(bp, func, file, line);
        return bp;
 }
@@ -490,11 +486,12 @@ libxfs_trace_putbuf(const char *func, const char *file, int line, xfs_buf_t *bp)
 #endif
 
 
-xfs_buf_t *
-libxfs_getsb(xfs_mount_t *mp)
+struct xfs_buf *
+libxfs_getsb(
+       struct xfs_mount        *mp)
 {
-       return libxfs_readbuf(mp->m_ddev_targp, XFS_SB_DADDR,
-                               XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);
+       return libxfs_buf_read(mp->m_ddev_targp, XFS_SB_DADDR,
+                       XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);
 }
 
 kmem_zone_t                    *xfs_buf_zone;
@@ -959,13 +956,16 @@ libxfs_readbuf_verify(struct xfs_buf *bp, const struct xfs_buf_ops *ops)
        bp->b_flags &= ~LIBXFS_B_UNCHECKED;
 }
 
-
-xfs_buf_t *
-libxfs_readbuf(struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, int flags,
-               const struct xfs_buf_ops *ops)
+static struct xfs_buf *
+libxfs_readbuf(
+       struct xfs_buftarg      *btp,
+       xfs_daddr_t             blkno,
+       size_t                  len,
+       int                     flags,
+       const struct xfs_buf_ops *ops)
 {
-       xfs_buf_t       *bp;
-       int             error;
+       struct xfs_buf          *bp;
+       int                     error;
 
        bp = libxfs_getbuf_flags(btp, blkno, len, 0);
        if (!bp)

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index edbb0ecc1117d7b4ec744f48d5ee8c6ac2f384d5..6d1ba933094ad78709434acd4f472a8ed8107e76 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3529,7 +3529,7 @@ rewrite_secondary_superblocks(
        struct xfs_buf          *buf;
 
        /* rewrite the last superblock */
-       buf = libxfs_readbuf(mp->m_dev,
+       buf = libxfs_buf_read(mp->m_dev,
                        XFS_AGB_TO_DADDR(mp, mp->m_sb.sb_agcount - 1,
                                XFS_SB_DADDR),
                        XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);
@@ -3545,7 +3545,7 @@ rewrite_secondary_superblocks(
        if (mp->m_sb.sb_agcount <= 2)
                return;
 
-       buf = libxfs_readbuf(mp->m_dev,
+       buf = libxfs_buf_read(mp->m_dev,
                        XFS_AGB_TO_DADDR(mp, (mp->m_sb.sb_agcount - 1) / 2,
                                XFS_SB_DADDR),
                        XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index c63721ca3c851169f036e173555173e113bc65ea..7edf54adcdc976bff3bf2b4d7bca5a6e7b220d86 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -405,7 +405,7 @@ rmtval_get(xfs_mount_t *mp, xfs_ino_t ino, blkmap_t *blkmap,
                        clearit = 1;
                        break;
                }
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
                                    XFS_FSB_TO_BB(mp, 1), 0,
                                    &xfs_attr3_rmt_buf_ops);
                if (!bp) {
@@ -763,7 +763,7 @@ process_leaf_attr_level(xfs_mount_t *mp,
                        goto error_out;
                }
 
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, dev_bno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, dev_bno),
                                    XFS_FSB_TO_BB(mp, 1), 0,
                                    &xfs_attr3_leaf_buf_ops);
                if (!bp) {
@@ -1093,7 +1093,7 @@ process_longform_attr(
                return 1;
        }
 
-       bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
+       bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
                                XFS_FSB_TO_BB(mp, 1), 0, &xfs_da3_node_buf_ops);
        if (!bp) {
                do_warn(

diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c
index 863c4531530a03349609a80233e25a0fadff2344..76e9f773fc920d452972276fbe1ffa6fe3d95346 100644 (file)
--- a/repair/dino_chunks.c
+++ b/repair/dino_chunks.c
@@ -39,7 +39,7 @@ check_aginode_block(xfs_mount_t       *mp,
         * tree and we wouldn't be here and we stale the buffers out
         * so no one else will overlap them.
         */
-       bp = libxfs_readbuf(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno),
+       bp = libxfs_buf_read(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, agbno),
                        XFS_FSB_TO_BB(mp, 1), 0, NULL);
        if (!bp) {
                do_warn(_("cannot read agbno (%u/%u), disk block %" PRId64 "\n"),
@@ -656,7 +656,7 @@ process_inode_chunk(
                pftrace("about to read off %llu in AG %d",
                        XFS_AGB_TO_DADDR(mp, agno, agbno), agno);
 
-               bplist[bp_index] = libxfs_readbuf(mp->m_dev,
+               bplist[bp_index] = libxfs_buf_read(mp->m_dev,
                                        XFS_AGB_TO_DADDR(mp, agno, agbno),
                                        XFS_FSB_TO_BB(mp,
                                                M_IGEO(mp)->blocks_per_cluster),

diff --git a/repair/dinode.c b/repair/dinode.c
index 2c6621d590ca3ec76adaa1bb3118fe30e2a58a5e..aa7d479a555cd3b11c32ae4c6f83f5e99f5a4bae 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -748,7 +748,7 @@ get_agino_buf(
                cluster_agino, cluster_daddr, cluster_blks);
 #endif
 
-       bp = libxfs_readbuf(mp->m_dev, cluster_daddr, cluster_blks,
+       bp = libxfs_buf_read(mp->m_dev, cluster_daddr, cluster_blks,
                        0, &xfs_inode_buf_ops);
        if (!bp) {
                do_warn(_("cannot read inode (%u/%u), disk block %" PRIu64 "\n"),
@@ -1179,7 +1179,7 @@ process_quota_inode(
                fsbno = blkmap_get(blkmap, qbno);
                dqid = (xfs_dqid_t)qbno * dqperchunk;
 
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno),
                                    dqchunklen, 0, &xfs_dquot_buf_ops);
                if (!bp) {
                        do_warn(
@@ -1284,7 +1284,7 @@ _("cannot read inode %" PRIu64 ", file block %d, NULL disk block\n"),
 
                byte_cnt = XFS_FSB_TO_B(mp, blk_cnt);
 
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno),
                                    BTOBB(byte_cnt), 0, &xfs_symlink_buf_ops);
                if (!bp) {
                        do_warn(

diff --git a/repair/phase3.c b/repair/phase3.c
index 1c6929acb35c4d436c15f524fbd48e42a9f5dd33..886acd1f0841804d8c331bb4110ef029d6e6a6b8 100644 (file)
--- a/repair/phase3.c
+++ b/repair/phase3.c
@@ -28,7 +28,7 @@ process_agi_unlinked(
        xfs_agnumber_t          i;
        int                     agi_dirty = 0;
 
-       bp = libxfs_readbuf(mp->m_dev,
+       bp = libxfs_buf_read(mp->m_dev,
                        XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
                        mp->m_sb.sb_sectsize/BBSIZE, 0, &xfs_agi_buf_ops);
        if (!bp)

diff --git a/repair/prefetch.c b/repair/prefetch.c
index f7ea9c8f824df913e341c2bb0a56cd499953c6b3..122729322228917403649bbd3215c5760e26dcda 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -271,7 +271,7 @@ pf_scan_lbtree(
        xfs_buf_t               *bp;
        int                     rc;
 
-       bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, dbno),
+       bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, dbno),
                        XFS_FSB_TO_BB(mp, 1), 0, &xfs_bmbt_buf_ops);
        if (!bp)
                return 0;

diff --git a/repair/rt.c b/repair/rt.c
index 3319829ce5574fee326ea14862808a6c2d57e40c..b514998da3f521be2f799bcafa7c1b760734363e 100644 (file)
--- a/repair/rt.c
+++ b/repair/rt.c
@@ -193,7 +193,7 @@ process_rtbitmap(xfs_mount_t        *mp,
                        error = 1;
                        continue;
                }
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
                                XFS_FSB_TO_BB(mp, 1), NULL);
                if (!bp) {
                        do_warn(_("can't read block %d for rtbitmap inode\n"),
@@ -255,7 +255,7 @@ process_rtsummary(xfs_mount_t       *mp,
                        error++;
                        continue;
                }
-               bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
+               bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, bno),
                                XFS_FSB_TO_BB(mp, 1), NULL);
                if (!bp) {
                        do_warn(_("can't read block %d for rtsummary inode\n"),

diff --git a/repair/scan.c b/repair/scan.c
index 1caab676ba5ed1afdf913b24c78a806784dbbfd7..d89a3076650f14100ece6b62bed03dd5d81a36eb 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -68,7 +68,7 @@ scan_sbtree(
 {
        xfs_buf_t       *bp;
 
-       bp = libxfs_readbuf(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, root),
+       bp = libxfs_buf_read(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, root),
                        XFS_FSB_TO_BB(mp, 1), 0, ops);
        if (!bp) {
                do_error(_("can't read btree block %d/%d\n"), agno, root);
@@ -123,7 +123,7 @@ scan_lbtree(
        int             dirty = 0;
        bool            badcrc = false;
 
-       bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, root),
+       bp = libxfs_buf_read(mp->m_dev, XFS_FSB_TO_DADDR(mp, root),
                      XFS_FSB_TO_BB(mp, 1), 0, ops);
        if (!bp)  {
                do_error(_("can't read btree block %d/%d\n"),
@@ -2107,7 +2107,7 @@ scan_freelist(
        if (be32_to_cpu(agf->agf_flcount) == 0)
                return;
 
-       agflbuf = libxfs_readbuf(mp->m_dev,
+       agflbuf = libxfs_buf_read(mp->m_dev,
                                 XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR(mp)),
                                 XFS_FSS_TO_BB(mp, 1), 0, &xfs_agfl_buf_ops);
        if (!agflbuf)  {
@@ -2331,7 +2331,7 @@ scan_ag(
                return;
        }
 
-       sbbuf = libxfs_readbuf(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
+       sbbuf = libxfs_buf_read(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
                                XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);
        if (!sbbuf)  {
                objname = _("root superblock");
@@ -2339,7 +2339,7 @@ scan_ag(
        }
        libxfs_sb_from_disk(sb, XFS_BUF_TO_SBP(sbbuf));
 
-       agfbuf = libxfs_readbuf(mp->m_dev,
+       agfbuf = libxfs_buf_read(mp->m_dev,
                        XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
                        XFS_FSS_TO_BB(mp, 1), 0, &xfs_agf_buf_ops);
        if (!agfbuf)  {
@@ -2348,7 +2348,7 @@ scan_ag(
        }
        agf = XFS_BUF_TO_AGF(agfbuf);
 
-       agibuf = libxfs_readbuf(mp->m_dev,
+       agibuf = libxfs_buf_read(mp->m_dev,
                        XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
                        XFS_FSS_TO_BB(mp, 1), 0, &xfs_agi_buf_ops);
        if (!agibuf)  {