Hi all, Here are some cleanups I made against the rmap code and the inode geometry code, which came up as part of review comments on the scrub inode fixes posted earlier. It then fixes some problems with the inode btree scrub code, namely that the existing code does not handle the case where a single inode cluster is mapped by multiple inobt records. The first patch creates some global const XFS_RMAP_OINFO_* objects for static fs metadata. This enables us to reduce stack usage here and there, and remove a surprising amount of oinfo setup clutter in the scrub code. The next three patches add some inode <-> block conversion macros and adds precomputed inode cluster size and alignment geometry information in struct xfs_mount instead of calculating it over and over. Comments and questions are, as always, welcome. --D [1] https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=djwong-devel