---

yaml --- r: 185918 b: refs/heads/master c: 27bff34 h: refs/heads/master v: v3
git-mirror · Mar 5, 2010 · 39a4525 · 39a4525
1 parent 483cb29
commit 39a4525
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3343eb8209cc69f0d2059f8c484ad7a3e1834c0b
+refs/heads/master: 27bff34300482632caf52ff589a4e7d755b32539
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -1845,8 +1845,6 @@ struct file *do_filp_open(int dfd, const char *pathname,
 	mutex_lock(&dir->d_inode->i_mutex);
 	path.dentry = lookup_hash(&nd);
 	path.mnt = nd.path.mnt;
-
-do_last:
 	filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
 		       pathname, dir, &is_link);
 	if (is_link)
@@ -1926,7 +1924,13 @@ struct file *do_filp_open(int dfd, const char *pathname,
 	path.dentry = lookup_hash(&nd);
 	path.mnt = nd.path.mnt;
 	__putname(nd.last.name);
-	goto do_last;
+	filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
+		       pathname, dir, &is_link);
+	if (is_link)
+		goto do_link;
+	if (nd.root.mnt)
+		path_put(&nd.root);
+	return filp;
 }
 
 /**