I'm testing a revised version of the patch now and should be able to commit it in a little bit. Basically the same thing (you may have gotten that token lock/unlock that broke the direct patch wrong when you manually patched it), except I adjusted the b_refs check in getnewbuf() as well to prevent an invalidation race. -Matt