---

yaml --- r: 234248 b: refs/heads/master c: f1afe9e h: refs/heads/master v: v3
git-mirror · Mar 14, 2011 · ffbee29 · ffbee29
1 parent 13ad09f
commit ffbee29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f3b4f69070fee7c647bab5dc4408990bb3606c
+refs/heads/master: f1afe9efc84476ca42fbb7301a441021063eead7
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -2426,15 +2426,12 @@ struct file *do_filp_open(int dfd, const char *pathname,
 		nd.flags |= LOOKUP_PARENT;
 		error = __do_follow_link(&link, &nd, &cookie);
 		if (unlikely(error)) {
-			if (!IS_ERR(cookie) && linki->i_op->put_link)
-				linki->i_op->put_link(link.dentry, &nd, cookie);
-			/* nd.path had been dropped */
-			nd.path = link;
-			goto out_path;
+			filp = ERR_PTR(error);
+		} else {
+			nd.flags &= ~LOOKUP_PARENT;
+			filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
 		}
-		nd.flags &= ~LOOKUP_PARENT;
-		filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
-		if (linki->i_op->put_link)
+		if (!IS_ERR(cookie) && linki->i_op->put_link)
 			linki->i_op->put_link(link.dentry, &nd, cookie);
 		path_put(&link);
 	}