On Tue, Aug 29, 2017 at 07:48:34PM +0200, Christoph Hellwig wrote:
> This avoids poking into the internals of the extent list. Also return
> the number of extents as the return value instead of an additional
> by reference argument, and make it available to callers outside of
> xfs_bmap_util.c
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/xfs_bmap_util.c | 21 ++++++++++-----------
> fs/xfs/xfs_bmap_util.h | 1 +
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 93e955262d07..ea737ebafc53 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -222,22 +222,21 @@ xfs_bmap_eof(
> * Count leaf blocks given a range of extent records. Delayed allocation
> * extents are not counted towards the totals.
> */
> -STATIC void
> +xfs_extnum_t
> xfs_bmap_count_leaves(
> struct xfs_ifork *ifp,
> - xfs_extnum_t *numrecs,
> xfs_filblks_t *count)
> {
> - xfs_extnum_t i;
> - xfs_extnum_t nr_exts = xfs_iext_count(ifp);
> -
> - for (i = 0; i < nr_exts; i++) {
> - xfs_bmbt_rec_host_t *frp = xfs_iext_get_ext(ifp, i);
> - if (!isnullstartblock(xfs_bmbt_get_startblock(frp))) {
> - (*numrecs)++;
> - *count += xfs_bmbt_get_blockcount(frp);
> + struct xfs_bmbt_irec got;
> + xfs_extnum_t numrecs = 0, i = 0;
> +
> + while (xfs_iext_get_extent(ifp, i++, &got)) {
> + if (!isnullstartblock(got.br_startblock)) {
> + *count += got.br_blockcount;
> + numrecs++;
> }
> }
> + return numrecs;
> }
>
> /*
> @@ -370,7 +369,7 @@ xfs_bmap_count_blocks(
>
> switch (XFS_IFORK_FORMAT(ip, whichfork)) {
> case XFS_DINODE_FMT_EXTENTS:
> - xfs_bmap_count_leaves(ifp, nextents, count);
> + *nextents = xfs_bmap_count_leaves(ifp, count);
> return 0;
> case XFS_DINODE_FMT_BTREE:
> if (!(ifp->if_flags & XFS_IFEXTENTS)) {
> diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
> index 0cede1043571..0eaa81dc49be 100644
> --- a/fs/xfs/xfs_bmap_util.h
> +++ b/fs/xfs/xfs_bmap_util.h
> @@ -70,6 +70,7 @@ int xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
>
> xfs_daddr_t xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb);
>
> +xfs_extnum_t xfs_bmap_count_leaves(struct xfs_ifork *ifp, xfs_filblks_t *count);
> int xfs_bmap_count_blocks(struct xfs_trans *tp, struct xfs_inode *ip,
> int whichfork, xfs_extnum_t *nextents,
> xfs_filblks_t *count);
> --
> 2.11.0
>
> --
> 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
