Let's make use of our new hash_ops! (cherry picked from commit 548f6937) [zj: all non-journal parts of this patch were dropped.] (cherry picked from commit 7cd5d5cc)