Pulled this into the testing branch and then got https://evilpiepirate.org/~testdashboard/c/de4ea1e2a9ceec5d55fffbc1acab89f0dc8f90b6/xfstests.generic.459/log.br
So I'll likely kick this patch back out for now, let me know when you have a fixed version :)
