ufs: kill more lock_ufs() calls