641dc38337
inlining the rest of the code in reinsert(). (No functional changes.) Also, make sure that we don't print the (bogus) lock values when !DIAGNOSTIC. Partly based on a patch from Mike Pritchard.