And this I really don't like. I much prefer the full version I've done here, which has evolved a bit from the work I've been posting to the list for months now: http://git.infradead.org/users/hch/xfs.git/shortlog/refs/heads/xfs-mapping-validation.2 Which also fixes up some layering issues we have in that code path.