From: Darrick J. Wong <djwong@xxxxxxxxxx>
In preparation for the next patch, hoist the code that walks the cntbt
looking for space to trim into a separate function.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/xfs_discard.c | 49 +++++++++++++++++++++++++++++++++----------------
1 file changed, 33 insertions(+), 16 deletions(-)
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index e2272da46afd..ce77451b00ef 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -20,9 +20,11 @@
#include "xfs_ag.h"
#include "xfs_health.h"
-STATIC int
-xfs_trim_ag_extents(
+/* Trim the free space in this AG by length. */
+static inline int
+xfs_trim_ag_bylen(
struct xfs_perag *pag,
+ struct xfs_buf *agbp,
xfs_daddr_t start,
xfs_daddr_t end,
xfs_daddr_t minlen,
@@ -31,23 +33,10 @@ xfs_trim_ag_extents(
struct xfs_mount *mp = pag->pag_mount;
struct block_device *bdev = xfs_buftarg_bdev(mp->m_ddev_targp);
struct xfs_btree_cur *cur;
- struct xfs_buf *agbp;
- struct xfs_agf *agf;
+ struct xfs_agf *agf = agbp->b_addr;
int error;
int i;
- /*
- * Force out the log. This means any transactions that might have freed
- * space before we take the AGF buffer lock are now on disk, and the
- * volatile disk cache is flushed.
- */
- xfs_log_force(mp, XFS_LOG_SYNC);
-
- error = xfs_alloc_read_agf(pag, NULL, 0, &agbp);
- if (error)
- return error;
- agf = agbp->b_addr;
-
cur = xfs_allocbt_init_cursor(mp, NULL, agbp, pag, XFS_BTNUM_CNT);
/*
@@ -131,6 +120,34 @@ xfs_trim_ag_extents(
out_del_cursor:
xfs_btree_del_cursor(cur, error);
+ return error;
+}
+
+STATIC int
+xfs_trim_ag_extents(
+ struct xfs_perag *pag,
+ xfs_daddr_t start,
+ xfs_daddr_t end,
+ xfs_daddr_t minlen,
+ uint64_t *blocks_trimmed)
+{
+ struct xfs_mount *mp = pag->pag_mount;
+ struct xfs_buf *agbp;
+ int error;
+
+ /*
+ * Force out the log. This means any transactions that might have freed
+ * space before we take the AGF buffer lock are now on disk, and the
+ * volatile disk cache is flushed.
+ */
+ xfs_log_force(mp, XFS_LOG_SYNC);
+
+ error = xfs_alloc_read_agf(pag, NULL, 0, &agbp);
+ if (error)
+ return error;
+
+ error = xfs_trim_ag_bylen(pag, agbp, start, end, minlen,
+ blocks_trimmed);
xfs_buf_relse(agbp);
return error;
}
