fixing merge error in fs:namei.c