diff options
author | Darrick J. Wong <djwong@kernel.org> | 2021-09-01 11:15:58 -0700 |
---|---|---|
committer | Darrick J. Wong <djwong@kernel.org> | 2021-10-22 16:40:58 -0700 |
commit | 5337eb2d71d9de2191aa238afd69cc6141a7062d (patch) | |
tree | 785a6502080d542f178b1a216706df31fcc3c9d2 | |
parent | 9168e9bfe459112ffcf3f7431a0573bf07e059c5 (diff) |
xfs: convert "skip_discard" to a proper flags bitsetextfree-intent-cleanups_2021-10-22
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 <djwong@kernel.org>
-rw-r--r-- | fs/xfs/libxfs/xfs_ag.c | 3 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_alloc.c | 5 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_alloc.h | 7 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 12 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap_btree.c | 2 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 4 | ||||
-rw-r--r-- | fs/xfs/libxfs/xfs_refcount.c | 7 | ||||
-rw-r--r-- | fs/xfs/scrub/alloc_repair.c | 3 | ||||
-rw-r--r-- | fs/xfs/scrub/repair.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_reflink.c | 2 |
10 files changed, 30 insertions, 19 deletions
diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c index b1c87d6ad34c..d0035e156a25 100644 --- a/fs/xfs/libxfs/xfs_ag.c +++ b/fs/xfs/libxfs/xfs_ag.c @@ -848,7 +848,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 3663484dc576..177a753f7fc1 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2547,7 +2547,7 @@ xfs_free_extent_later( 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 @@ -2565,6 +2565,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_extent_free_item_zone != NULL); @@ -2576,7 +2577,7 @@ xfs_free_extent_later( new->xefi_oinfo = *oinfo; else new->xefi_oinfo = XFS_RMAP_OINFO_SKIP_UPDATE; - new->xefi_skip_discard = skip_discard; + new->xefi_skip_discard = !!(flags & XFS_FREE_EXTENT_SKIP_DISCARD); trace_xfs_extent_free_defer(tp->t_mountp, XFS_FREE_EXTENT_REGULAR, new); diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h index 40abbc9995fb..58f2862e8c79 100644 --- a/fs/xfs/libxfs/xfs_alloc.h +++ b/fs/xfs/libxfs/xfs_alloc.h @@ -186,9 +186,14 @@ xfs_free_extent( return __xfs_free_extent(tp, bno, len, oinfo, type, false); } +/* 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) + 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); /* * List of extents to be free "later". diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 4e4b0fdd5c1f..c95a30c0bb9b 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -583,7 +583,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, false); + 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); @@ -5290,10 +5290,14 @@ xfs_bmap_del_extent_real( if (xfs_is_reflink_inode(ip) && whichfork == XFS_DATA_FORK) { xfs_refcount_decrease_extent(tp, del); } else { + 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, - (bflags & XFS_BMAPI_NODISCARD) || - del->br_state == XFS_EXT_UNWRITTEN); + del->br_blockcount, NULL, flags); } } diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 22e0a09c9bb2..4c5b22cc6575 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c @@ -287,7 +287,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, false); + 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 549507650688..12d347658d96 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -1886,7 +1886,7 @@ xfs_difree_inode_chunk( /* 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, false); + &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, false); + 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 25a5feced57b..aecaaf8790d7 100644 --- a/fs/xfs/libxfs/xfs_refcount.c +++ b/fs/xfs/libxfs/xfs_refcount.c @@ -1002,8 +1002,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, oinfo, - false); + tmp.rc_blockcount, oinfo, 0); } (*agbno) += tmp.rc_blockcount; @@ -1048,7 +1047,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, oinfo, false); + ext.rc_blockcount, oinfo, 0); } skip: @@ -1782,7 +1781,7 @@ xfs_refcount_recover_cow_leftovers( /* Free the block. */ xfs_free_extent_later(tp, fsb, rr->rr_rrec.rc_blockcount, NULL, - false); + 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 9e63920ed02d..3906f8e3c2da 100644 --- a/fs/xfs/scrub/alloc_repair.c +++ b/fs/xfs/scrub/alloc_repair.c @@ -462,7 +462,8 @@ xrep_abt_dispose_reservations( */ if (resv->used < resv->len) xfs_free_extent_later(sc->tp, resv->fsbno + resv->used, - resv->len - resv->used, NULL, true); + 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 88e12e9228d9..b2ba91e030f4 100644 --- a/fs/xfs/scrub/repair.c +++ b/fs/xfs/scrub/repair.c @@ -665,7 +665,7 @@ xrep_newbt_destroy_reservation( resv->len, xnr->oinfo.oi_owner); xfs_free_extent_later(sc->tp, resv->fsbno, resv->len, &xnr->oinfo, - true); + XFS_FREE_EXTENT_SKIP_DISCARD); return 0; } @@ -1069,7 +1069,7 @@ xrep_reap_ag_extent( * every 100 or so EFIs so that we don't exceed the log * reservation. */ - xfs_free_extent_later(sc->tp, fsbno, aglen, rs->oinfo, false); + xfs_free_extent_later(sc->tp, fsbno, aglen, rs->oinfo, 0); rs->deferred++; need_roll = rs->deferred > 100; } diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 6ef5cc10051a..378a03f50faa 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, false); + del.br_blockcount, NULL, 0); /* Roll the transaction */ error = xfs_defer_finish(tpp); |