xfs: remove xfs_btree_cur.bc_blocklog

Source kernel commit: cc411740472d958b718b9c6a7791ba00d88f7cef

This field isn't used by anyone, so get rid of it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 03ebefc33885896f1f42d8fddc3ea90412084a3a..46d0f22918342324ca3085873a71552ce27f6230 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -480,7 +480,6 @@ xfs_allocbt_init_common(
        cur->bc_tp = tp;
        cur->bc_mp = mp;
        cur->bc_btnum = btnum;
-       cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_ag.abt.active = false;
 
        if (btnum == XFS_BTNUM_CNT) {

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index aea9b5a85c66a73d94adbab5d0eb59f1ba6015fa..565e8af7f14d4a4f0d066698c545b64ad27a1552 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -556,7 +556,6 @@ xfs_bmbt_init_cursor(
        cur->bc_mp = mp;
        cur->bc_nlevels = be16_to_cpu(ifp->if_broot->bb_level) + 1;
        cur->bc_btnum = XFS_BTNUM_BMAP;
-       cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_bmbt_2);
 
        cur->bc_ops = &xfs_bmbt_ops;

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 513ade4a89f84ae71a3bad87d37605a7a7f2aae5..49ecc496238fb8f9bf43ad4a3e753c361ad73837 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -229,7 +229,6 @@ struct xfs_btree_cur
 #define        XFS_BTCUR_LEFTRA        1       /* left sibling has been read-ahead */
 #define        XFS_BTCUR_RIGHTRA       2       /* right sibling has been read-ahead */
        uint8_t         bc_nlevels;     /* number of levels in the tree */
-       uint8_t         bc_blocklog;    /* log2(blocksize) of btree blocks */
        xfs_btnum_t     bc_btnum;       /* identifies which btree type */
        int             bc_statoff;     /* offset of btre stats array */
 

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index 1a5289cee7e5dbd9779c31ede1227a9a8373b5e4..f1e03cfd2cb34ada659a23f67ff00309c50d27a8 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -443,8 +443,6 @@ xfs_inobt_init_common(
                cur->bc_ops = &xfs_finobt_ops;
        }
 
-       cur->bc_blocklog = mp->m_sb.sb_blocklog;
-
        if (xfs_has_crc(mp))
                cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;
 

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index 62ef048ce0cdb640d01fd195baad8699ee3b0966..f7f99cbd35dd02e364de8be5e29cb331c4848848 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -325,7 +325,6 @@ xfs_refcountbt_init_common(
        cur->bc_tp = tp;
        cur->bc_mp = mp;
        cur->bc_btnum = XFS_BTNUM_REFC;
-       cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_refcbt_2);
 
        cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index ca72324be2b30f4724a91f38e474fa4b803a6451..bba29eeab2e6b1d1aa06f962effc1947aedd9e18 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -455,7 +455,6 @@ xfs_rmapbt_init_common(
        /* Overlapping btree; 2 keys per pointer. */
        cur->bc_btnum = XFS_BTNUM_RMAP;
        cur->bc_flags = XFS_BTREE_CRC_BLOCKS | XFS_BTREE_OVERLAPPING;
-       cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_rmap_2);
        cur->bc_ops = &xfs_rmapbt_ops;