Hi Chandan, Please pull this branch with changes for xfs for 6.11-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit ac3a0275165b4f80d9b7b516d6a8f8b308644fff: xfs: don't use the incore struct xfs_sb for offsets into struct xfs_dsb (2024-07-02 11:37:00 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/extfree-intent-cleanups-6.11_2024-07-02 for you to fetch changes up to 84a3c1576c5aade32170fae6c61d51bd2d16010f: xfs: move xfs_extent_free_defer_add to xfs_extfree_item.c (2024-07-02 11:37:03 -0700) ---------------------------------------------------------------- xfs: extent free log intent cleanups [v3.0 2/4] This series cleans up some warts in the extent freeing log intent code. We start by acknowledging that this mechanism does not have anything to do with the bmap code by moving it to xfs_alloc.c and giving the function a more descriptive name. Then we clean up the tracepoints and the _finish_one call paths to pass the intent structure around. This reduces the overhead when the tracepoints are disabled and will make things much cleaner when we start adding realtime support in the next patch. I also incorporated a bunch of cleanups from Christoph Hellwig. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Christoph Hellwig (6): xfs: pass the fsbno to xfs_perag_intent_get xfs: add a xefi_entry helper xfs: reuse xfs_extent_free_cancel_item xfs: factor out a xfs_efd_add_extent helper xfs: remove duplicate asserts in xfs_defer_extent_free xfs: remove xfs_defer_agfl_block Darrick J. Wong (3): xfs: clean up extent free log intent item tracepoint callsites xfs: convert "skip_discard" to a proper flags bitset xfs: move xfs_extent_free_defer_add to xfs_extfree_item.c fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 93 ++++++++---------------------- fs/xfs/libxfs/xfs_alloc.h | 12 ++-- fs/xfs/libxfs/xfs_bmap.c | 12 ++-- fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 5 +- fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- fs/xfs/libxfs/xfs_refcount.c | 6 +- fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- fs/xfs/scrub/newbt.c | 5 +- fs/xfs/scrub/reap.c | 7 ++- fs/xfs/xfs_bmap_item.c | 6 +- fs/xfs/xfs_drain.c | 8 +-- fs/xfs/xfs_drain.h | 5 +- fs/xfs/xfs_extfree_item.c | 115 +++++++++++++++++-------------------- fs/xfs/xfs_extfree_item.h | 6 ++ fs/xfs/xfs_refcount_item.c | 5 +- fs/xfs/xfs_reflink.c | 2 +- fs/xfs/xfs_rmap_item.c | 5 +- fs/xfs/xfs_trace.h | 33 +++++------ 20 files changed, 141 insertions(+), 192 deletions(-)
