-O3 compilation fixups

Conflicts:

	fs/namei.c