Hi Chandan, Please pull this branch with changes for xfs for 6.7-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 c2988eb5cff75c02bc57e02c323154aa08f55b78: xfs: rt stubs should return negative errnos when rt disabled (2023-10-17 16:22:40 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/clean-up-realtime-units-6.7_2023-10-19 for you to fetch changes up to 2d5f216b77e33f9b503bd42998271da35d4b7055: xfs: convert rt extent numbers to xfs_rtxnum_t (2023-10-17 16:24:22 -0700) ---------------------------------------------------------------- xfs: clean up realtime type usage [v1.1] The realtime code uses xfs_rtblock_t and xfs_fsblock_t in a lot of places, and it's very confusing. Clean up all the type usage so that an xfs_rtblock_t is always a block within the realtime volume, an xfs_fileoff_t is always a file offset within a realtime metadata file, and an xfs_rtxnumber_t is always a rt extent within the realtime volume. v1.1: various cleanups suggested by hch With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> ---------------------------------------------------------------- Darrick J. Wong (8): xfs: fix units conversion error in xfs_bmap_del_extent_delay xfs: make sure maxlen is still congruent with prod when rounding down xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h xfs: convert xfs_extlen_t to xfs_rtxlen_t in the rt allocator xfs: convert rt bitmap/summary block numbers to xfs_fileoff_t xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t xfs: rename xfs_verify_rtext to xfs_verify_rtbext xfs: convert rt extent numbers to xfs_rtxnum_t fs/xfs/libxfs/xfs_bmap.c | 8 +- fs/xfs/libxfs/xfs_format.h | 2 +- fs/xfs/libxfs/xfs_rtbitmap.c | 121 ++++++++++----------- fs/xfs/libxfs/xfs_rtbitmap.h | 79 ++++++++++++++ fs/xfs/libxfs/xfs_types.c | 4 +- fs/xfs/libxfs/xfs_types.h | 8 +- fs/xfs/scrub/bmap.c | 2 +- fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/scrub/rtbitmap.c | 12 +-- fs/xfs/scrub/rtsummary.c | 4 +- fs/xfs/scrub/trace.h | 7 +- fs/xfs/xfs_bmap_util.c | 18 ++-- fs/xfs/xfs_fsmap.c | 2 +- fs/xfs/xfs_rtalloc.c | 248 +++++++++++++++++++++++-------------------- fs/xfs/xfs_rtalloc.h | 89 ++-------------- 15 files changed, 319 insertions(+), 287 deletions(-) create mode 100644 fs/xfs/libxfs/xfs_rtbitmap.h
