Whitespace
Lock once for both cases
comm
call entry_reset() for one more failure case
Generalize entry_reset() recovery
warn_hash_key