diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-07-14 11:15:26 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2022-10-14 14:17:12 -0700 |
| commit | 0bd217fd35635b40137742a2183cb66b72648ba1 (patch) | |
| tree | d3fbe25e415044cfd1f331cb7bfd5e0ded8c2836 /fs/xfs/scrub | |
| parent | 14b661224091388757e0e337a70356d42bbf94b3 (diff) | |
xfs: convert "skip_discard" to a proper flags bitsetextfree-intent-cleanups_2022-10-14
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>
Diffstat (limited to 'fs/xfs/scrub')
| -rw-r--r-- | fs/xfs/scrub/alloc_repair.c | 6 | ||||
| -rw-r--r-- | fs/xfs/scrub/newbt.c | 8 | ||||
| -rw-r--r-- | fs/xfs/scrub/reap.c | 11 |
3 files changed, 14 insertions, 11 deletions
diff --git a/fs/xfs/scrub/alloc_repair.c b/fs/xfs/scrub/alloc_repair.c index 21b28a8f051f..51778293534d 100644 --- a/fs/xfs/scrub/alloc_repair.c +++ b/fs/xfs/scrub/alloc_repair.c @@ -500,9 +500,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/newbt.c b/fs/xfs/scrub/newbt.c index 3739b420e0af..c024afb14f77 100644 --- a/fs/xfs/scrub/newbt.c +++ b/fs/xfs/scrub/newbt.c @@ -414,8 +414,8 @@ xrep_newbt_cancel_resv( 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); /* Drop the intent drain after we commit the new item. */ xfs_fs_drop_intents(sc->mp, false, resv->fsbno); @@ -506,8 +506,8 @@ xrep_newbt_destroy_resv( 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); } /* diff --git a/fs/xfs/scrub/reap.c b/fs/xfs/scrub/reap.c index e3f2f9331899..b434aed47eb8 100644 --- a/fs/xfs/scrub/reap.c +++ b/fs/xfs/scrub/reap.c @@ -382,7 +382,8 @@ xreap_agextent( rs->force_roll = true; xfs_refcount_free_cow_extent(sc->tp, fsbno, *aglenp); - __xfs_free_extent_later(sc->tp, fsbno, *aglenp, NULL, true); + xfs_free_extent_later(sc->tp, fsbno, *aglenp, NULL, + XFS_FREE_EXTENT_SKIP_DISCARD); return 0; } @@ -412,7 +413,8 @@ xreap_agextent( * to minimize the window in which we could crash and lose the * old blocks. */ - __xfs_free_extent_later(sc->tp, fsbno, *aglenp, rs->oinfo, true); + xfs_free_extent_later(sc->tp, fsbno, *aglenp, rs->oinfo, + XFS_FREE_EXTENT_SKIP_DISCARD); rs->deferred++; break; } @@ -959,8 +961,9 @@ xreap_ifork_extent( xfs_bmap_unmap_extent(sc->tp, ip, whichfork, imap); xfs_trans_mod_dquot_byino(sc->tp, ip, XFS_TRANS_DQ_BCOUNT, -(int64_t)imap->br_blockcount); - __xfs_free_extent_later(sc->tp, imap->br_startblock, - imap->br_blockcount, NULL, true); + xfs_free_extent_later(sc->tp, imap->br_startblock, + imap->br_blockcount, NULL, + XFS_FREE_EXTENT_SKIP_DISCARD); } out_agf: |