From 361f5659cc86fc6b4ec733ae0148cc8d1be407d7 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 1 Sep 2021 11:15:58 -0700 Subject: xfs: convert "skip_discard" to a proper flags bitset Convert the boolean to skip discard on free into a proper flags field so that we can add more flags in the next patch. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_ag.c | 3 ++- fs/xfs/libxfs/xfs_alloc.c | 7 ++++--- fs/xfs/libxfs/xfs_alloc.h | 19 +++++++------------ fs/xfs/libxfs/xfs_bmap.c | 14 +++++++++----- fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 6 +++--- fs/xfs/libxfs/xfs_refcount.c | 7 ++++--- fs/xfs/scrub/alloc_repair.c | 6 +++--- fs/xfs/scrub/repair.c | 11 ++++++----- fs/xfs/xfs_reflink.c | 2 +- 10 files changed, 40 insertions(+), 37 deletions(-) diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c index 78053aff0b15..538d84371a6b 100644 --- a/fs/xfs/libxfs/xfs_ag.c +++ b/fs/xfs/libxfs/xfs_ag.c @@ -850,7 +850,8 @@ xfs_ag_shrink_space( if (err2 != -ENOSPC) goto resv_err; - __xfs_free_extent_later(*tpp, args.fsbno, delta, NULL, true); + xfs_free_extent_later(*tpp, args.fsbno, delta, NULL, + XFS_FREE_EXTENT_SKIP_DISCARD); /* * Roll the transaction before trying to re-init the per-ag diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 9a5c4a34e74d..9c95c4d1d55a 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2541,12 +2541,12 @@ xfs_defer_agfl_block( * The list is maintained sorted (by block number). */ void -__xfs_free_extent_later( +xfs_free_extent_later( struct xfs_trans *tp, xfs_fsblock_t bno, xfs_filblks_t len, const struct xfs_owner_info *oinfo, - bool skip_discard) + unsigned int flags) { struct xfs_extent_free_item *new; /* new element */ #ifdef DEBUG @@ -2564,6 +2564,7 @@ __xfs_free_extent_later( ASSERT(agbno < mp->m_sb.sb_agblocks); ASSERT(len < mp->m_sb.sb_agblocks); ASSERT(agbno + len <= mp->m_sb.sb_agblocks); + ASSERT(!(flags & ~XFS_FREE_EXTENT_ALL_FLAGS)); #endif ASSERT(xfs_extfree_item_cache != NULL); @@ -2571,7 +2572,7 @@ __xfs_free_extent_later( GFP_KERNEL | __GFP_NOFAIL); new->xefi_startblock = bno; new->xefi_blockcount = (xfs_extlen_t)len; - if (skip_discard) + if (flags & XFS_FREE_EXTENT_SKIP_DISCARD) new->xefi_flags |= XFS_EFI_SKIP_DISCARD; if (oinfo) { ASSERT(oinfo->oi_offset == 0); diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h index b5e53791b59e..d8523f7bbd45 100644 --- a/fs/xfs/libxfs/xfs_alloc.h +++ b/fs/xfs/libxfs/xfs_alloc.h @@ -248,9 +248,14 @@ xfs_buf_to_agfl_bno( return bp->b_addr; } -void __xfs_free_extent_later(struct xfs_trans *tp, xfs_fsblock_t bno, +void xfs_free_extent_later(struct xfs_trans *tp, xfs_fsblock_t bno, xfs_filblks_t len, const struct xfs_owner_info *oinfo, - bool skip_discard); + unsigned int flags); + +/* Don't issue a discard for the blocks freed. */ +#define XFS_FREE_EXTENT_SKIP_DISCARD (1U << 0) + +#define XFS_FREE_EXTENT_ALL_FLAGS (XFS_FREE_EXTENT_SKIP_DISCARD) /* * List of extents to be free "later". @@ -268,16 +273,6 @@ struct xfs_extent_free_item { #define XFS_EFI_ATTR_FORK (1U << 1) /* freeing attr fork block */ #define XFS_EFI_BMBT_BLOCK (1U << 2) /* freeing bmap btree block */ -static inline void -xfs_free_extent_later( - struct xfs_trans *tp, - xfs_fsblock_t bno, - xfs_filblks_t len, - const struct xfs_owner_info *oinfo) -{ - __xfs_free_extent_later(tp, bno, len, oinfo, false); -} - extern struct kmem_cache *xfs_extfree_item_cache; int __init xfs_extfree_intent_init_cache(void); diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 054abdefab3f..8949f23d75bb 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -586,7 +586,7 @@ xfs_bmap_btree_to_extents( if ((error = xfs_btree_check_block(cur, cblock, 0, cbp))) return error; xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, whichfork); - xfs_free_extent_later(cur->bc_tp, cbno, 1, &oinfo); + xfs_free_extent_later(cur->bc_tp, cbno, 1, &oinfo, 0); ip->i_nblocks--; xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L); xfs_trans_binval(tp, cbp); @@ -5293,10 +5293,14 @@ xfs_bmap_del_extent_real( if (xfs_is_reflink_inode(ip) && whichfork == XFS_DATA_FORK) { xfs_refcount_decrease_extent(tp, del); } else { - __xfs_free_extent_later(tp, del->br_startblock, - del->br_blockcount, NULL, - (bflags & XFS_BMAPI_NODISCARD) || - del->br_state == XFS_EXT_UNWRITTEN); + unsigned int flags = 0; + + if ((bflags & XFS_BMAPI_NODISCARD) || + del->br_state == XFS_EXT_UNWRITTEN) + flags |= XFS_FREE_EXTENT_SKIP_DISCARD; + + xfs_free_extent_later(tp, del->br_startblock, + del->br_blockcount, NULL, flags); } } diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 2499807ab295..53fb51c1526c 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c @@ -289,7 +289,7 @@ xfs_bmbt_free_block( struct xfs_owner_info oinfo; xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, cur->bc_ino.whichfork); - xfs_free_extent_later(cur->bc_tp, fsbno, 1, &oinfo); + xfs_free_extent_later(cur->bc_tp, fsbno, 1, &oinfo, 0); ip->i_nblocks--; xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 2f85de3aa2a6..4f8b0ae839ae 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1885,8 +1885,8 @@ xfs_difree_inode_chunk( if (!xfs_inobt_issparse(rec->ir_holemask)) { /* not sparse, calculate extent info directly */ xfs_free_extent_later(tp, XFS_AGB_TO_FSB(mp, agno, sagbno), - M_IGEO(mp)->ialloc_blks, - &XFS_RMAP_OINFO_INODES); + M_IGEO(mp)->ialloc_blks, + &XFS_RMAP_OINFO_INODES, 0); return; } @@ -1930,7 +1930,7 @@ xfs_difree_inode_chunk( ASSERT(agbno % mp->m_sb.sb_spino_align == 0); ASSERT(contigblk % mp->m_sb.sb_spino_align == 0); xfs_free_extent_later(tp, XFS_AGB_TO_FSB(mp, agno, agbno), - contigblk, &XFS_RMAP_OINFO_INODES); + contigblk, &XFS_RMAP_OINFO_INODES, 0); /* reset range to current bit and carry on... */ startidx = endidx = nextbit; diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c index 3f104719ef70..855a1bfa80a2 100644 --- a/fs/xfs/libxfs/xfs_refcount.c +++ b/fs/xfs/libxfs/xfs_refcount.c @@ -1003,7 +1003,7 @@ xfs_refcount_adjust_extents( cur->bc_ag.pag->pag_agno, tmp.rc_startblock); xfs_free_extent_later(cur->bc_tp, fsbno, - tmp.rc_blockcount, NULL); + tmp.rc_blockcount, NULL, 0); } (*agbno) += tmp.rc_blockcount; @@ -1048,7 +1048,7 @@ xfs_refcount_adjust_extents( cur->bc_ag.pag->pag_agno, ext.rc_startblock); xfs_free_extent_later(cur->bc_tp, fsbno, - ext.rc_blockcount, NULL); + ext.rc_blockcount, NULL, 0); } skip: @@ -1779,7 +1779,8 @@ xfs_refcount_recover_cow_leftovers( rr->rr_rrec.rc_blockcount); /* Free the block. */ - xfs_free_extent_later(tp, fsb, rr->rr_rrec.rc_blockcount, NULL); + xfs_free_extent_later(tp, fsb, rr->rr_rrec.rc_blockcount, NULL, + 0); error = xfs_trans_commit(tp); if (error) diff --git a/fs/xfs/scrub/alloc_repair.c b/fs/xfs/scrub/alloc_repair.c index eb1349146106..a46678b9c9ed 100644 --- a/fs/xfs/scrub/alloc_repair.c +++ b/fs/xfs/scrub/alloc_repair.c @@ -487,9 +487,9 @@ xrep_abt_dispose_reservations( * online. */ if (resv->used < resv->len) - __xfs_free_extent_later(sc->tp, - resv->fsbno + resv->used, - resv->len - resv->used, NULL, true); + xfs_free_extent_later(sc->tp, resv->fsbno + resv->used, + resv->len - resv->used, NULL, + XFS_FREE_EXTENT_SKIP_DISCARD); } junkit: diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c index c5cb9e84df16..94245da9c63a 100644 --- a/fs/xfs/scrub/repair.c +++ b/fs/xfs/scrub/repair.c @@ -674,8 +674,8 @@ xrep_newbt_destroy_reservation( XFS_FSB_TO_AGBNO(sc->mp, resv->fsbno), resv->len, xnr->oinfo.oi_owner); - __xfs_free_extent_later(sc->tp, resv->fsbno, resv->len, &xnr->oinfo, - true); + xfs_free_extent_later(sc->tp, resv->fsbno, resv->len, &xnr->oinfo, + XFS_FREE_EXTENT_SKIP_DISCARD); return 0; } @@ -1092,7 +1092,8 @@ xrep_agextent_reap( * Roll the transaction every 100 or so EFIs so that we don't * exceed the log reservation. */ - __xfs_free_extent_later(sc->tp, fsbno, aglen, rs->oinfo, true); + xfs_free_extent_later(sc->tp, fsbno, aglen, rs->oinfo, + XFS_FREE_EXTENT_SKIP_DISCARD); rs->deferred++; *want_roll = rs->deferred > 100; break; @@ -1568,8 +1569,8 @@ xrep_bmapi_reap_extent( if (error) goto out_agf; - __xfs_free_extent_later(sc->tp, imap->br_startblock, len, NULL, - true); + xfs_free_extent_later(sc->tp, imap->br_startblock, len, NULL, + XFS_FREE_EXTENT_SKIP_DISCARD); } /* Update the mapping to reflect the work not yet done and exit. */ diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 981619896e00..253726dfb8c3 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -485,7 +485,7 @@ xfs_reflink_cancel_cow_blocks( del.br_blockcount); xfs_free_extent_later(*tpp, del.br_startblock, - del.br_blockcount, NULL); + del.br_blockcount, NULL, 0); /* Roll the transaction */ error = xfs_defer_finish(tpp); -- cgit v1.2.3