commit 3d8a00d2099ebc6d5a6e95fadaf861709d9919a8
author Al Viro <viro@zeniv.linux.org.uk> Sun Jun 10 05:04:43 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sat Jul 14 16:33:33 2012 +0400
tree 317bfb9d71e3ef35746685c6da2397545917d81e
parent 47237687d73cbeae1dd7a133c3fc3d7239094568

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>

fs/open.c

diff --git a/fs/open.c b/fs/open.c
index 89589bd..c87f982 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -786,15 +786,14 @@
 			 int *opened)
 {
 	struct file *res;
+	BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
 
 	mntget(od->mnt);
 	dget(dentry);
 
 	res = do_dentry_open(dentry, od->mnt, od->filp, open, current_cred());
-	if (!IS_ERR(res)) {
+	if (!IS_ERR(res))
 		*opened |= FILE_OPENED;
-		od->filp = NULL;
-	}
 
 	return res;
 }