don't modify od->filp at all

make put_filp() conditional on flag set by finish_open()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --cc fs/namei.c
Simple merge

diff --cc fs/open.c
Simple merge