On Fri, Oct 13, 2017 at 02:05:40PM +0200, Arnd Bergmann wrote:
> The last cleanup introduced two harmless warnings:
>
> fs/xfs/xfs_fsmap.c:480:1: warning: '__xfs_getfsmap_rtdev' defined but not used
> fs/xfs/xfs_fsmap.c:372:1: warning: 'xfs_getfsmap_rtdev_rtbitmap_helper'
> defined but not used
>
> This moves those two functions as well.
>
> Fixes: bb9c2e543325 ("xfs: move more RT specific code under CONFIG_XFS_RT")
> Signed-off-by: Arnd Bergmann <[email protected]>
Looks ok,
Reviewed-by: Darrick J. Wong <[email protected]>
> ---
> fs/xfs/xfs_fsmap.c | 48 ++++++++++++++++++++++++------------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/fs/xfs/xfs_fsmap.c b/fs/xfs/xfs_fsmap.c
> index 560e0b40ac1b..43cfc07996a4 100644
> --- a/fs/xfs/xfs_fsmap.c
> +++ b/fs/xfs/xfs_fsmap.c
> @@ -367,29 +367,6 @@ xfs_getfsmap_datadev_helper(
> return xfs_getfsmap_helper(cur->bc_tp, info, rec, rec_daddr);
> }
>
> -/* Transform a rtbitmap "record" into a fsmap */
> -STATIC int
> -xfs_getfsmap_rtdev_rtbitmap_helper(
> - struct xfs_trans *tp,
> - struct xfs_rtalloc_rec *rec,
> - void *priv)
> -{
> - struct xfs_mount *mp = tp->t_mountp;
> - struct xfs_getfsmap_info *info = priv;
> - struct xfs_rmap_irec irec;
> - xfs_daddr_t rec_daddr;
> -
> - rec_daddr = XFS_FSB_TO_BB(mp, rec->ar_startblock);
> -
> - irec.rm_startblock = rec->ar_startblock;
> - irec.rm_blockcount = rec->ar_blockcount;
> - irec.rm_owner = XFS_RMAP_OWN_NULL; /* "free" */
> - irec.rm_offset = 0;
> - irec.rm_flags = 0;
> -
> - return xfs_getfsmap_helper(tp, info, &irec, rec_daddr);
> -}
> -
> /* Transform a bnobt irec into a fsmap */
> STATIC int
> xfs_getfsmap_datadev_bnobt_helper(
> @@ -475,6 +452,30 @@ xfs_getfsmap_logdev(
> return xfs_getfsmap_helper(tp, info, &rmap, 0);
> }
>
> +#ifdef CONFIG_XFS_RT
> +/* Transform a rtbitmap "record" into a fsmap */
> +STATIC int
> +xfs_getfsmap_rtdev_rtbitmap_helper(
> + struct xfs_trans *tp,
> + struct xfs_rtalloc_rec *rec,
> + void *priv)
> +{
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_getfsmap_info *info = priv;
> + struct xfs_rmap_irec irec;
> + xfs_daddr_t rec_daddr;
> +
> + rec_daddr = XFS_FSB_TO_BB(mp, rec->ar_startblock);
> +
> + irec.rm_startblock = rec->ar_startblock;
> + irec.rm_blockcount = rec->ar_blockcount;
> + irec.rm_owner = XFS_RMAP_OWN_NULL; /* "free" */
> + irec.rm_offset = 0;
> + irec.rm_flags = 0;
> +
> + return xfs_getfsmap_helper(tp, info, &irec, rec_daddr);
> +}
> +
> /* Execute a getfsmap query against the realtime device. */
> STATIC int
> __xfs_getfsmap_rtdev(
> @@ -521,7 +522,6 @@ __xfs_getfsmap_rtdev(
> return query_fn(tp, info);
> }
>
> -#ifdef CONFIG_XFS_RT
> /* Actually query the realtime bitmap. */
> STATIC int
> xfs_getfsmap_rtdev_rtbitmap_query(
> --
> 2.9.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
