rev 1.21 has left namei.9 by itself, resulting in wrong pairs