xfs: rearrange xfs_fsmap.c a little bit

The order of the functions in this file has gotten a little confusing
over the years.  Specifically, the two data device implementations
(bnobt and rmapbt) could be adjacent in the source code instead of split
in two by the logdev and rtdev fsmap implementations.  We're about to
add more functionality to this file, so rearrange things now.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_fsmap.c b/fs/xfs/xfs_fsmap.c
index e154466268757a04c0c1ec71c8c9c5b8f1d561d2..615253406fde1a7839d1f5c64d8bcca7e3197658 100644 (file)
--- a/fs/xfs/xfs_fsmap.c
+++ b/fs/xfs/xfs_fsmap.c
@@ -441,140 +441,6 @@ xfs_getfsmap_set_irec_flags(
                irec->rm_flags |= XFS_RMAP_UNWRITTEN;
 }
 
-/* Execute a getfsmap query against the log device. */
-STATIC int
-xfs_getfsmap_logdev(
-       struct xfs_trans                *tp,
-       const struct xfs_fsmap          *keys,
-       struct xfs_getfsmap_info        *info)
-{
-       struct xfs_mount                *mp = tp->t_mountp;
-       struct xfs_rmap_irec            rmap;
-       xfs_daddr_t                     rec_daddr, len_daddr;
-       xfs_fsblock_t                   start_fsb, end_fsb;
-       uint64_t                        eofs;
-
-       eofs = XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
-       if (keys[0].fmr_physical >= eofs)
-               return 0;
-       start_fsb = XFS_BB_TO_FSBT(mp,
-                               keys[0].fmr_physical + keys[0].fmr_length);
-       end_fsb = XFS_BB_TO_FSB(mp, min(eofs - 1, keys[1].fmr_physical));
-
-       /* Adjust the low key if we are continuing from where we left off. */
-       if (keys[0].fmr_length > 0)
-               info->low_daddr = XFS_FSB_TO_BB(mp, start_fsb);
-
-       trace_xfs_fsmap_low_key_linear(mp, info->dev, start_fsb);
-       trace_xfs_fsmap_high_key_linear(mp, info->dev, end_fsb);
-
-       if (start_fsb > 0)
-               return 0;
-
-       /* Fabricate an rmap entry for the external log device. */
-       rmap.rm_startblock = 0;
-       rmap.rm_blockcount = mp->m_sb.sb_logblocks;
-       rmap.rm_owner = XFS_RMAP_OWN_LOG;
-       rmap.rm_offset = 0;
-       rmap.rm_flags = 0;
-
-       rec_daddr = XFS_FSB_TO_BB(mp, rmap.rm_startblock);
-       len_daddr = XFS_FSB_TO_BB(mp, rmap.rm_blockcount);
-       return xfs_getfsmap_helper(tp, info, &rmap, rec_daddr, len_daddr);
-}
-
-#ifdef CONFIG_XFS_RT
-/* Transform a rtbitmap "record" into a fsmap */
-STATIC int
-xfs_getfsmap_rtdev_rtbitmap_helper(
-       struct xfs_mount                *mp,
-       struct xfs_trans                *tp,
-       const struct xfs_rtalloc_rec    *rec,
-       void                            *priv)
-{
-       struct xfs_getfsmap_info        *info = priv;
-       struct xfs_rmap_irec            irec;
-       xfs_rtblock_t                   rtbno;
-       xfs_daddr_t                     rec_daddr, len_daddr;
-
-       rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);
-       rec_daddr = XFS_FSB_TO_BB(mp, rtbno);
-       irec.rm_startblock = rtbno;
-
-       rtbno = xfs_rtx_to_rtb(mp, rec->ar_extcount);
-       len_daddr = XFS_FSB_TO_BB(mp, rtbno);
-       irec.rm_blockcount = rtbno;
-
-       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, len_daddr);
-}
-
-/* Execute a getfsmap query against the realtime device rtbitmap. */
-STATIC int
-xfs_getfsmap_rtdev_rtbitmap(
-       struct xfs_trans                *tp,
-       const struct xfs_fsmap          *keys,
-       struct xfs_getfsmap_info        *info)
-{
-
-       struct xfs_rtalloc_rec          ahigh = { 0 };
-       struct xfs_mount                *mp = tp->t_mountp;
-       xfs_rtblock_t                   start_rtb;
-       xfs_rtblock_t                   end_rtb;
-       xfs_rtxnum_t                    high;
-       uint64_t                        eofs;
-       int                             error;
-
-       eofs = XFS_FSB_TO_BB(mp, xfs_rtx_to_rtb(mp, mp->m_sb.sb_rextents));
-       if (keys[0].fmr_physical >= eofs)
-               return 0;
-       start_rtb = XFS_BB_TO_FSBT(mp,
-                               keys[0].fmr_physical + keys[0].fmr_length);
-       end_rtb = XFS_BB_TO_FSB(mp, min(eofs - 1, keys[1].fmr_physical));
-
-       info->missing_owner = XFS_FMR_OWN_UNKNOWN;
-
-       /* Adjust the low key if we are continuing from where we left off. */
-       if (keys[0].fmr_length > 0) {
-               info->low_daddr = XFS_FSB_TO_BB(mp, start_rtb);
-               if (info->low_daddr >= eofs)
-                       return 0;
-       }
-
-       trace_xfs_fsmap_low_key_linear(mp, info->dev, start_rtb);
-       trace_xfs_fsmap_high_key_linear(mp, info->dev, end_rtb);
-
-       xfs_rtbitmap_lock_shared(mp, XFS_RBMLOCK_BITMAP);
-
-       /*
-        * Set up query parameters to return free rtextents covering the range
-        * we want.
-        */
-       high = xfs_rtb_to_rtxup(mp, end_rtb);
-       error = xfs_rtalloc_query_range(mp, tp, xfs_rtb_to_rtx(mp, start_rtb),
-                       high, xfs_getfsmap_rtdev_rtbitmap_helper, info);
-       if (error)
-               goto err;
-
-       /*
-        * Report any gaps at the end of the rtbitmap by simulating a null
-        * rmap starting at the block after the end of the query range.
-        */
-       info->last = true;
-       ahigh.ar_startext = min(mp->m_sb.sb_rextents, high);
-
-       error = xfs_getfsmap_rtdev_rtbitmap_helper(mp, tp, &ahigh, info);
-       if (error)
-               goto err;
-err:
-       xfs_rtbitmap_unlock_shared(mp, XFS_RBMLOCK_BITMAP);
-       return error;
-}
-#endif /* CONFIG_XFS_RT */
-
 static inline bool
 rmap_not_shareable(struct xfs_mount *mp, const struct xfs_rmap_irec *r)
 {
@@ -799,6 +665,140 @@ xfs_getfsmap_datadev_bnobt(
                        xfs_getfsmap_datadev_bnobt_query, &akeys[0]);
 }
 
+/* Execute a getfsmap query against the log device. */
+STATIC int
+xfs_getfsmap_logdev(
+       struct xfs_trans                *tp,
+       const struct xfs_fsmap          *keys,
+       struct xfs_getfsmap_info        *info)
+{
+       struct xfs_mount                *mp = tp->t_mountp;
+       struct xfs_rmap_irec            rmap;
+       xfs_daddr_t                     rec_daddr, len_daddr;
+       xfs_fsblock_t                   start_fsb, end_fsb;
+       uint64_t                        eofs;
+
+       eofs = XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
+       if (keys[0].fmr_physical >= eofs)
+               return 0;
+       start_fsb = XFS_BB_TO_FSBT(mp,
+                               keys[0].fmr_physical + keys[0].fmr_length);
+       end_fsb = XFS_BB_TO_FSB(mp, min(eofs - 1, keys[1].fmr_physical));
+
+       /* Adjust the low key if we are continuing from where we left off. */
+       if (keys[0].fmr_length > 0)
+               info->low_daddr = XFS_FSB_TO_BB(mp, start_fsb);
+
+       trace_xfs_fsmap_low_key_linear(mp, info->dev, start_fsb);
+       trace_xfs_fsmap_high_key_linear(mp, info->dev, end_fsb);
+
+       if (start_fsb > 0)
+               return 0;
+
+       /* Fabricate an rmap entry for the external log device. */
+       rmap.rm_startblock = 0;
+       rmap.rm_blockcount = mp->m_sb.sb_logblocks;
+       rmap.rm_owner = XFS_RMAP_OWN_LOG;
+       rmap.rm_offset = 0;
+       rmap.rm_flags = 0;
+
+       rec_daddr = XFS_FSB_TO_BB(mp, rmap.rm_startblock);
+       len_daddr = XFS_FSB_TO_BB(mp, rmap.rm_blockcount);
+       return xfs_getfsmap_helper(tp, info, &rmap, rec_daddr, len_daddr);
+}
+
+#ifdef CONFIG_XFS_RT
+/* Transform a rtbitmap "record" into a fsmap */
+STATIC int
+xfs_getfsmap_rtdev_rtbitmap_helper(
+       struct xfs_mount                *mp,
+       struct xfs_trans                *tp,
+       const struct xfs_rtalloc_rec    *rec,
+       void                            *priv)
+{
+       struct xfs_getfsmap_info        *info = priv;
+       struct xfs_rmap_irec            irec;
+       xfs_rtblock_t                   rtbno;
+       xfs_daddr_t                     rec_daddr, len_daddr;
+
+       rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);
+       rec_daddr = XFS_FSB_TO_BB(mp, rtbno);
+       irec.rm_startblock = rtbno;
+
+       rtbno = xfs_rtx_to_rtb(mp, rec->ar_extcount);
+       len_daddr = XFS_FSB_TO_BB(mp, rtbno);
+       irec.rm_blockcount = rtbno;
+
+       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, len_daddr);
+}
+
+/* Execute a getfsmap query against the realtime device rtbitmap. */
+STATIC int
+xfs_getfsmap_rtdev_rtbitmap(
+       struct xfs_trans                *tp,
+       const struct xfs_fsmap          *keys,
+       struct xfs_getfsmap_info        *info)
+{
+
+       struct xfs_rtalloc_rec          ahigh = { 0 };
+       struct xfs_mount                *mp = tp->t_mountp;
+       xfs_rtblock_t                   start_rtb;
+       xfs_rtblock_t                   end_rtb;
+       xfs_rtxnum_t                    high;
+       uint64_t                        eofs;
+       int                             error;
+
+       eofs = XFS_FSB_TO_BB(mp, xfs_rtx_to_rtb(mp, mp->m_sb.sb_rextents));
+       if (keys[0].fmr_physical >= eofs)
+               return 0;
+       start_rtb = XFS_BB_TO_FSBT(mp,
+                               keys[0].fmr_physical + keys[0].fmr_length);
+       end_rtb = XFS_BB_TO_FSB(mp, min(eofs - 1, keys[1].fmr_physical));
+
+       info->missing_owner = XFS_FMR_OWN_UNKNOWN;
+
+       /* Adjust the low key if we are continuing from where we left off. */
+       if (keys[0].fmr_length > 0) {
+               info->low_daddr = XFS_FSB_TO_BB(mp, start_rtb);
+               if (info->low_daddr >= eofs)
+                       return 0;
+       }
+
+       trace_xfs_fsmap_low_key_linear(mp, info->dev, start_rtb);
+       trace_xfs_fsmap_high_key_linear(mp, info->dev, end_rtb);
+
+       xfs_rtbitmap_lock_shared(mp, XFS_RBMLOCK_BITMAP);
+
+       /*
+        * Set up query parameters to return free rtextents covering the range
+        * we want.
+        */
+       high = xfs_rtb_to_rtxup(mp, end_rtb);
+       error = xfs_rtalloc_query_range(mp, tp, xfs_rtb_to_rtx(mp, start_rtb),
+                       high, xfs_getfsmap_rtdev_rtbitmap_helper, info);
+       if (error)
+               goto err;
+
+       /*
+        * Report any gaps at the end of the rtbitmap by simulating a null
+        * rmap starting at the block after the end of the query range.
+        */
+       info->last = true;
+       ahigh.ar_startext = min(mp->m_sb.sb_rextents, high);
+
+       error = xfs_getfsmap_rtdev_rtbitmap_helper(mp, tp, &ahigh, info);
+       if (error)
+               goto err;
+err:
+       xfs_rtbitmap_unlock_shared(mp, XFS_RBMLOCK_BITMAP);
+       return error;
+}
+#endif /* CONFIG_XFS_RT */
+
 /* Do we recognize the device? */
 STATIC bool
 xfs_getfsmap_is_valid_device(