On Fri, Feb 17, 2017 at 05:17:30PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Plumb in the pieces (init_high_key, diff_two_keys) necessary to call
> query_range on the free space btrees. Remove the debugging asserts
> so that we can make queries starting from block 0.
>
> While we're at it, merge the redundant "if (btnum ==" hunks.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_alloc_btree.c | 162 +++++++++++++++++++++++++++++----------
> 1 file changed, 119 insertions(+), 43 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
> index efb467b..ba3ec9c 100644
> --- a/fs/xfs/libxfs/xfs_alloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_alloc_btree.c
...
> @@ -346,44 +388,78 @@ const struct xfs_buf_ops xfs_allocbt_buf_ops = {
...
> -static const struct xfs_btree_ops xfs_allocbt_ops = {
> +static const struct xfs_btree_ops xfs_cntbt_ops = {
> .rec_len = sizeof(xfs_alloc_rec_t),
> .key_len = sizeof(xfs_alloc_key_t),
>
> @@ -397,11 +473,12 @@ static const struct xfs_btree_ops xfs_allocbt_ops = {
> .init_key_from_rec = xfs_allocbt_init_key_from_rec,
> .init_rec_from_cur = xfs_allocbt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_allocbt_init_ptr_from_cur,
> - .key_diff = xfs_allocbt_key_diff,
> + .key_diff = xfs_cntbt_key_diff,
> .buf_ops = &xfs_allocbt_buf_ops,
> + .diff_two_keys = xfs_cntbt_diff_two_keys,
Any reason we add diff_two_keys() but not init_high_key_from_rec() for
the cntbt? If so.. could you note the different requirements in the
commit log?
Brian
> #if defined(DEBUG) || defined(XFS_WARN)
> - .keys_inorder = xfs_allocbt_keys_inorder,
> - .recs_inorder = xfs_allocbt_recs_inorder,
> + .keys_inorder = xfs_cntbt_keys_inorder,
> + .recs_inorder = xfs_cntbt_recs_inorder,
> #endif
> };
>
> @@ -427,16 +504,15 @@ xfs_allocbt_init_cursor(
> cur->bc_mp = mp;
> cur->bc_btnum = btnum;
> cur->bc_blocklog = mp->m_sb.sb_blocklog;
> - cur->bc_ops = &xfs_allocbt_ops;
> - if (btnum == XFS_BTNUM_BNO)
> - cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtb_2);
> - else
> - cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtc_2);
>
> if (btnum == XFS_BTNUM_CNT) {
> + cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtc_2);
> + cur->bc_ops = &xfs_cntbt_ops;
> cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]);
> cur->bc_flags = XFS_BTREE_LASTREC_UPDATE;
> } else {
> + cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_abtb_2);
> + cur->bc_ops = &xfs_bnobt_ops;
> cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]);
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
