> +#define RMAP_NEXT(r) ((r)->rm_startblock + (r)->rm_blockcount) Maybe kill this just like we did in the kernel? Otherwise this looks fine. Note that it looks very similar but not the same as the kernel code. I guess sharing more code was considered but didn't work out for some reason? Mabye document that in the commit log? Otherwise looks good: Reviewed-by: Christoph Hellwig <hch@xxxxxx>