xfs: remove unused flag arguments

Source kernel commit: f5b999c03f4c178d151e79803a95f8482a26521e

There are several functions which take a flag argument that is
only ever passed as "0," so remove these arguments.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
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/libxfs_priv.h b/libxfs/libxfs_priv.h
index c014b28f41cb731d57ee574bc9f30d324918c7d9..8b3de1703b3c42132c98e0cf2173773b2790a37e 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -382,7 +382,7 @@ roundup_64(uint64_t x, uint32_t y)
 #define xfs_buf_get_uncached(t,n,f)     \
        libxfs_getbufr((t), XFS_BUF_DADDR_NULL, (n));
 #define xfs_buf_relse(bp)              libxfs_putbuf(bp)
-#define xfs_buf_get(devp,blkno,len,f)  (libxfs_getbuf((devp), (blkno), (len)))
+#define xfs_buf_get(devp,blkno,len)    (libxfs_getbuf((devp), (blkno), (len)))
 #define xfs_bwrite(bp)                 libxfs_writebuf((bp), 0)
 #define xfs_buf_delwri_queue(bp, bl)   libxfs_writebuf((bp), 0)
 #define xfs_buf_delwri_submit(bl)      (0)

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 084205b8b623515ad949866f3afae9b396f13771..8ee45699f5b8aa5c078facd878c3f04543b85919 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -54,7 +54,7 @@ xfs_btroot_init(
        struct xfs_buf          *bp,
        struct aghdr_init_data  *id)
 {
-       xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno, 0);
+       xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno);
 }
 
 /*
@@ -68,7 +68,7 @@ xfs_bnoroot_init(
 {
        struct xfs_alloc_rec    *arec;
 
-       xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno, 0);
+       xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno);
        arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);
        arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);
        arec->ar_blockcount = cpu_to_be32(id->agsize -
@@ -83,7 +83,7 @@ xfs_cntroot_init(
 {
        struct xfs_alloc_rec    *arec;
 
-       xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno, 0);
+       xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno);
        arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);
        arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);
        arec->ar_blockcount = cpu_to_be32(id->agsize -
@@ -102,7 +102,7 @@ xfs_rmaproot_init(
        struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
        struct xfs_rmap_rec     *rrec;
 
-       xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno, 0);
+       xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno);
 
        /*
         * mark the AG header regions as static metadata The BNO

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index e21c788531a0ed1264b5951d48aa43411fd1f618..2376c7e60227470f9bb21cd0dc776eb0bfbf1247 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -1623,7 +1623,7 @@ xfs_alloc_ag_vextent_small(
                                xfs_buf_t       *bp;
 
                                bp = xfs_btree_get_bufs(args->mp, args->tp,
-                                       args->agno, fbno, 0);
+                                       args->agno, fbno);
                                if (!bp) {
                                        error = -EFSCORRUPTED;
                                        goto error0;
@@ -2091,7 +2091,7 @@ xfs_free_agfl_block(
        if (error)
                return error;
 
-       bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno, 0);
+       bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno);
        if (!bp)
                return -EFSCORRUPTED;
        xfs_trans_binval(tp, bp);

diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 7fe28a000382469d85382107c918c57332a61a5f..e9c8efd6bb1e8eee7334ea743eb6f1bbb6e58e30 100644 (file)
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -530,7 +530,7 @@ xfs_attr_rmtval_set(
                dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),
                dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);
 
-               bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, 0);
+               bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt);
                if (!bp)
                        return -ENOMEM;
                bp->b_ops = &xfs_attr3_rmt_buf_ops;

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 5f4879c091cefb4624716b746c0dc0b6325cdaa4..7dedefe796a3594b2f2c0deb86700a6de47a6861 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -361,7 +361,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, 0, &bp,
+                       error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
                                                XFS_BMAP_BTREE_REF,
                                                &xfs_bmbt_buf_ops);
                        if (error)
@@ -445,7 +445,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, 0, &bp,
+                       error = xfs_btree_read_bufl(mp, NULL, bno, &bp,
                                                XFS_BMAP_BTREE_REF,
                                                &xfs_bmbt_buf_ops);
                        if (error)
@@ -610,7 +610,7 @@ xfs_bmap_btree_to_extents(
        XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,
                        xfs_btree_check_lptr(cur, cbno, 1));
 #endif
-       error = xfs_btree_read_bufl(mp, tp, cbno, 0, &cbp, XFS_BMAP_BTREE_REF,
+       error = xfs_btree_read_bufl(mp, tp, cbno, &cbp, XFS_BMAP_BTREE_REF,
                                &xfs_bmbt_buf_ops);
        if (error)
                return error;
@@ -723,7 +723,7 @@ xfs_bmap_extents_to_btree(
        cur->bc_private.b.allocated++;
        ip->i_d.di_nblocks++;
        xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);
-       abp = xfs_btree_get_bufl(mp, tp, args.fsbno, 0);
+       abp = xfs_btree_get_bufl(mp, tp, args.fsbno);
        if (!abp) {
                error = -EFSCORRUPTED;
                goto out_unreserve_dquot;
@@ -869,7 +869,7 @@ xfs_bmap_local_to_extents(
        ASSERT(args.fsbno != NULLFSBLOCK);
        ASSERT(args.len == 1);
        tp->t_firstblock = args.fsbno;
-       bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);
+       bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno);
 
        /*
         * Initialize the block, copy the data and log the remote buffer.
@@ -1194,7 +1194,7 @@ xfs_iread_extents(
         * pointer (leftmost) at each level.
         */
        while (level-- > 0) {
-               error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp,
+               error = xfs_btree_read_bufl(mp, tp, bno, &bp,
                                XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);
                if (error)
                        goto out;
@@ -1267,7 +1267,7 @@ xfs_iread_extents(
                 */
                if (bno == NULLFSBLOCK)
                        break;
-               error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp,
+               error = xfs_btree_read_bufl(mp, tp, bno, &bp,
                                XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);
                if (error)
                        goto out;

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index eb78a9a204402aa36051d9b2cd447e11c0f7fcd6..9459c717ce756584e5c672e59ddc148c6d4d9b3c 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -687,14 +687,13 @@ xfs_buf_t *                               /* buffer for fsbno */
 xfs_btree_get_bufl(
        xfs_mount_t     *mp,            /* file system mount point */
        xfs_trans_t     *tp,            /* transaction pointer */
-       xfs_fsblock_t   fsbno,          /* file system block number */
-       uint            lock)           /* lock flags for get_buf */
+       xfs_fsblock_t   fsbno)          /* file system block number */
 {
        xfs_daddr_t             d;              /* real disk block address */
 
        ASSERT(fsbno != NULLFSBLOCK);
        d = XFS_FSB_TO_DADDR(mp, fsbno);
-       return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);
+       return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);
 }
 
 /*
@@ -706,15 +705,14 @@ xfs_btree_get_bufs(
        xfs_mount_t     *mp,            /* file system mount point */
        xfs_trans_t     *tp,            /* transaction pointer */
        xfs_agnumber_t  agno,           /* allocation group number */
-       xfs_agblock_t   agbno,          /* allocation group block number */
-       uint            lock)           /* lock flags for get_buf */
+       xfs_agblock_t   agbno)          /* allocation group block number */
 {
        xfs_daddr_t             d;              /* real disk block address */
 
        ASSERT(agno != NULLAGNUMBER);
        ASSERT(agbno != NULLAGBLOCK);
        d = XFS_AGB_TO_DADDR(mp, agno, agbno);
-       return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);
+       return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);
 }
 
 /*
@@ -841,7 +839,6 @@ 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 */
-       uint                    lock,           /* lock flags for read_buf */
        struct xfs_buf          **bpp,          /* buffer for fsbno */
        int                     refval,         /* ref count value for buffer */
        const struct xfs_buf_ops *ops)
@@ -854,7 +851,7 @@ xfs_btree_read_bufl(
                return -EFSCORRUPTED;
        d = XFS_FSB_TO_DADDR(mp, fsbno);
        error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,
-                                  mp->m_bsize, lock, &bp, ops);
+                                  mp->m_bsize, 0, &bp, ops);
        if (error)
                return error;
        if (bp)
@@ -1181,11 +1178,10 @@ xfs_btree_init_block(
        xfs_btnum_t     btnum,
        __u16           level,
        __u16           numrecs,
-       __u64           owner,
-       unsigned int    flags)
+       __u64           owner)
 {
        xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,
-                                btnum, level, numrecs, owner, flags);
+                                btnum, level, numrecs, owner, 0);
 }
 
 STATIC void
@@ -1284,7 +1280,6 @@ STATIC int
 xfs_btree_get_buf_block(
        struct xfs_btree_cur    *cur,
        union xfs_btree_ptr     *ptr,
-       int                     flags,
        struct xfs_btree_block  **block,
        struct xfs_buf          **bpp)
 {
@@ -1292,14 +1287,11 @@ xfs_btree_get_buf_block(
        xfs_daddr_t             d;
        int                     error;
 
-       /* need to sort out how callers deal with failures first */
-       ASSERT(!(flags & XBF_TRYLOCK));
-
        error = xfs_btree_ptr_to_daddr(cur, ptr, &d);
        if (error)
                return error;
        *bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,
-                                mp->m_bsize, flags);
+                                mp->m_bsize, 0);
 
        if (!*bpp)
                return -ENOMEM;
@@ -2702,7 +2694,7 @@ __xfs_btree_split(
        XFS_BTREE_STATS_INC(cur, alloc);
 
        /* Set up the new block as "right". */
-       error = xfs_btree_get_buf_block(cur, &rptr, 0, &right, &rbp);
+       error = xfs_btree_get_buf_block(cur, &rptr, &right, &rbp);
        if (error)
                goto error0;
 
@@ -2961,7 +2953,7 @@ xfs_btree_new_iroot(
        XFS_BTREE_STATS_INC(cur, alloc);
 
        /* Copy the root into a real block. */
-       error = xfs_btree_get_buf_block(cur, &nptr, 0, &cblock, &cbp);
+       error = xfs_btree_get_buf_block(cur, &nptr, &cblock, &cbp);
        if (error)
                goto error0;
 
@@ -3058,7 +3050,7 @@ xfs_btree_new_root(
        XFS_BTREE_STATS_INC(cur, alloc);
 
        /* Set up the new block. */
-       error = xfs_btree_get_buf_block(cur, &lptr, 0, &new, &nbp);
+       error = xfs_btree_get_buf_block(cur, &lptr, &new, &nbp);
        if (error)
                goto error0;
 

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index aab9a29d7613463450b69d8126dc6fcf724e1b79..fcceb7c2ac527bc501683f2052feec6eb47c87bc 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -301,8 +301,7 @@ struct xfs_buf *                            /* buffer for fsbno */
 xfs_btree_get_bufl(
        struct xfs_mount        *mp,    /* file system mount point */
        struct xfs_trans        *tp,    /* transaction pointer */
-       xfs_fsblock_t           fsbno,  /* file system block number */
-       uint                    lock);  /* lock flags for get_buf */
+       xfs_fsblock_t           fsbno); /* file system block number */
 
 /*
  * Get a buffer for the block, return it with no data read.
@@ -313,8 +312,7 @@ xfs_btree_get_bufs(
        struct xfs_mount        *mp,    /* file system mount point */
        struct xfs_trans        *tp,    /* transaction pointer */
        xfs_agnumber_t          agno,   /* allocation group number */
-       xfs_agblock_t           agbno,  /* allocation group block number */
-       uint                    lock);  /* lock flags for get_buf */
+       xfs_agblock_t           agbno); /* allocation group block number */
 
 /*
  * Check for the cursor referring to the last block at the given level.
@@ -345,7 +343,6 @@ 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 */
-       uint                    lock,   /* lock flags for read_buf */
        struct xfs_buf          **bpp,  /* buffer for fsbno */
        int                     refval, /* ref count value for buffer */
        const struct xfs_buf_ops *ops);
@@ -383,8 +380,7 @@ xfs_btree_init_block(
        xfs_btnum_t     btnum,
        __u16           level,
        __u16           numrecs,
-       __u64           owner,
-       unsigned int    flags);
+       __u64           owner);
 
 void
 xfs_btree_init_block_int(

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index 6a375ec39bedc82520731a1683688d72d501da3c..c256be3361e78106a07369c98b93c255e53dc172 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -970,7 +970,7 @@ xfs_update_secondary_sbs(
 
                bp = xfs_buf_get(mp->m_ddev_targp,
                                 XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
-                                XFS_FSS_TO_BB(mp, 1), 0);
+                                XFS_FSS_TO_BB(mp, 1));
                /*
                 * If we get an error reading or writing alternate superblocks,
                 * continue.  xfs_repair chooses the "best" superblock based

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 76010fd16aa2af5cc8fdabe3afbe1e614b544451..0bdf6ec3b1bb32388d51537e6d5013a556edc6d5 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3571,7 +3571,7 @@ initialise_ag_headers(
        buf->b_ops = &xfs_bnobt_buf_ops;
        block = XFS_BUF_TO_BLOCK(buf);
        memset(block, 0, cfg->blocksize);
-       libxfs_btree_init_block(mp, buf, XFS_BTNUM_BNO, 0, 1, agno, 0);
+       libxfs_btree_init_block(mp, buf, XFS_BTNUM_BNO, 0, 1, agno);
 
        arec = XFS_ALLOC_REC_ADDR(mp, block, 1);
        arec->ar_startblock = cpu_to_be32(libxfs_prealloc_blocks(mp));
@@ -3623,7 +3623,7 @@ initialise_ag_headers(
        buf->b_ops = &xfs_cntbt_buf_ops;
        block = XFS_BUF_TO_BLOCK(buf);
        memset(block, 0, cfg->blocksize);
-       libxfs_btree_init_block(mp, buf, XFS_BTNUM_CNT, 0, 1, agno, 0);
+       libxfs_btree_init_block(mp, buf, XFS_BTNUM_CNT, 0, 1, agno);
 
        arec = XFS_ALLOC_REC_ADDR(mp, block, 1);
        arec->ar_startblock = cpu_to_be32(libxfs_prealloc_blocks(mp));
@@ -3667,7 +3667,7 @@ initialise_ag_headers(
 
                block = XFS_BUF_TO_BLOCK(buf);
                memset(block, 0, cfg->blocksize);
-               libxfs_btree_init_block(mp, buf, XFS_BTNUM_REFC, 0, 0, agno, 0);
+               libxfs_btree_init_block(mp, buf, XFS_BTNUM_REFC, 0, 0, agno);
                libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
        }
 
@@ -3680,7 +3680,7 @@ initialise_ag_headers(
        buf->b_ops = &xfs_inobt_buf_ops;
        block = XFS_BUF_TO_BLOCK(buf);
        memset(block, 0, cfg->blocksize);
-       libxfs_btree_init_block(mp, buf, XFS_BTNUM_INO, 0, 0, agno, 0);
+       libxfs_btree_init_block(mp, buf, XFS_BTNUM_INO, 0, 0, agno);
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
        /*
@@ -3693,7 +3693,7 @@ initialise_ag_headers(
                buf->b_ops = &xfs_finobt_buf_ops;
                block = XFS_BUF_TO_BLOCK(buf);
                memset(block, 0, cfg->blocksize);
-               libxfs_btree_init_block(mp, buf, XFS_BTNUM_FINO, 0, 0, agno, 0);
+               libxfs_btree_init_block(mp, buf, XFS_BTNUM_FINO, 0, 0, agno);
                libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
        }
 
@@ -3708,7 +3708,7 @@ initialise_ag_headers(
                block = XFS_BUF_TO_BLOCK(buf);
                memset(block, 0, cfg->blocksize);
 
-               libxfs_btree_init_block(mp, buf, XFS_BTNUM_RMAP, 0, 0, agno, 0);
+               libxfs_btree_init_block(mp, buf, XFS_BTNUM_RMAP, 0, 0, agno);
 
                /*
                 * mark the AG header regions as static metadata

diff --git a/repair/phase5.c b/repair/phase5.c
index 780592b04849751069fa4a05d41d8f78b1d1abd6..2e18cc6947708818a79f2bac625d49f398e6e91c 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -704,7 +704,7 @@ prop_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, btnum, level,
-                                       0, agno, 0);
+                                       0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
 
@@ -783,7 +783,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno,
                lptr->buf_p->b_ops = ops;
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
-               libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno, 0);
+               libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno);
        }
        /*
         * run along leaf, setting up records.  as we have to switch
@@ -810,7 +810,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno,
                lptr->buf_p->b_ops = ops;
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
-               libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno, 0);
+               libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
                bt_hdr->bb_numrecs = cpu_to_be16(lptr->num_recs_pb +
@@ -1069,7 +1069,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs,
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, btnum,
-                                       level, 0, agno, 0);
+                                       level, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
 
@@ -1191,7 +1191,7 @@ build_ino_tree(xfs_mount_t *mp, xfs_agnumber_t agno,
                lptr->buf_p->b_ops = ops;
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
-               libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno, 0);
+               libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno);
        }
 
        /*
@@ -1219,7 +1219,7 @@ build_ino_tree(xfs_mount_t *mp, xfs_agnumber_t agno,
                lptr->buf_p->b_ops = ops;
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
-               libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno, 0);
+               libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
                bt_hdr->bb_numrecs = cpu_to_be16(lptr->num_recs_pb +
@@ -1474,7 +1474,7 @@ prop_rmap_cursor(
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
-                                       level, 0, agno, 0);
+                                       level, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
 
@@ -1587,7 +1587,7 @@ build_rmap_tree(
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
-                                       i, 0, agno, 0);
+                                       i, 0, agno);
        }
 
        /*
@@ -1614,7 +1614,7 @@ _("Insufficient memory to construct reverse-map cursor."));
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
-                                       0, 0, agno, 0);
+                                       0, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
                bt_hdr->bb_numrecs = cpu_to_be16(numrecs);
@@ -1824,7 +1824,7 @@ prop_refc_cursor(
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
-                                       level, 0, agno, 0);
+                                       level, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
 
@@ -1892,7 +1892,7 @@ build_refcount_tree(
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
-                                       i, 0, agno, 0);
+                                       i, 0, agno);
        }
 
        /*
@@ -1919,7 +1919,7 @@ _("Insufficient memory to construct refcount cursor."));
                bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
                memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
                libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
-                                       0, 0, agno, 0);
+                                       0, 0, agno);
 
                bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
                bt_hdr->bb_numrecs = cpu_to_be16(numrecs);