xfs: add a xfs_bmap_free_rtblocks helper

Source kernel commit: 9c3cfb9c96eee7f1656ef165e1471e1778510f6f

Split the RT extent freeing logic from xfs_bmap_del_extent_real because
it will become more complicated when adding RT group.

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

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 99d53f9383a49abdf5d812e4ba9f587152a63c45..949546f3eba470fc6b43a17bb5a04020055da416 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -5110,6 +5110,27 @@ xfs_bmap_del_extent_cow(
        ip->i_delayed_blks -= del->br_blockcount;
 }
 
+static int
+xfs_bmap_free_rtblocks(
+       struct xfs_trans        *tp,
+       struct xfs_bmbt_irec    *del)
+{
+       int                     error;
+
+       /*
+        * Ensure the bitmap and summary inodes are locked and joined to the
+        * transaction before modifying them.
+        */
+       if (!(tp->t_flags & XFS_TRANS_RTBITMAP_LOCKED)) {
+               tp->t_flags |= XFS_TRANS_RTBITMAP_LOCKED;
+               xfs_rtbitmap_lock(tp->t_mountp);
+               xfs_rtbitmap_trans_join(tp);
+       }
+
+       error = xfs_rtfree_blocks(tp, del->br_startblock, del->br_blockcount);
+       return error;
+}
+
 /*
  * Called by xfs_bmapi to update file extent records and the btree
  * after removing space.
@@ -5325,17 +5346,7 @@ xfs_bmap_del_extent_real(
                if (xfs_is_reflink_inode(ip) && whichfork == XFS_DATA_FORK) {
                        xfs_refcount_decrease_extent(tp, del);
                } else if (xfs_ifork_is_realtime(ip, whichfork)) {
-                       /*
-                        * Ensure the bitmap and summary inodes are locked
-                        * and joined to the transaction before modifying them.
-                        */
-                       if (!(tp->t_flags & XFS_TRANS_RTBITMAP_LOCKED)) {
-                               tp->t_flags |= XFS_TRANS_RTBITMAP_LOCKED;
-                               xfs_rtbitmap_lock(mp);
-                               xfs_rtbitmap_trans_join(tp);
-                       }
-                       error = xfs_rtfree_blocks(tp, del->br_startblock,
-                                       del->br_blockcount);
+                       error = xfs_bmap_free_rtblocks(tp, del);
                } else {
                        unsigned int    efi_flags = 0;