---

yaml --- r: 310065 b: refs/heads/master c: 78f71ef h: refs/heads/master i: 310063: 25f7410 v: v3
git-mirror · Jun 1, 2012 · 9879b84 · 9879b84
1 parent 3ddb2e3
commit 9879b84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90ad1a8ecb9bfd5ff4503ac42cd049a97643ee51
+refs/heads/master: 78f71eff3c274f3907f4aa1bbe3267281ba1c603
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
@@ -747,7 +747,6 @@ static struct file *do_dentry_open(struct dentry *dentry, struct vfsmount *mnt,
 	f->f_path.dentry = NULL;
 	f->f_path.mnt = NULL;
 cleanup_file:
-	put_filp(f);
 	dput(dentry);
 	mntput(mnt);
 	return ERR_PTR(error);
@@ -765,6 +764,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
 			fput(res);
 			res = ERR_PTR(error);
 		}
+	} else {
+		put_filp(f);
 	}
 	return res;
 }