From 9aed925f071464df08794dc9536bf1ad4ba01b1f Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 5 Jun 2012 15:10:16 +0200
Subject: [PATCH] --- yaml --- r: 312887 b: refs/heads/master c:
 54ef487241e863a6046536ac5b1fcd5d7cde86e5 h: refs/heads/master i:   312885:
 9d06a69f7038e1267c69817fc20bb8da164f088e   312883:
 aa7a0c0a26c28449c7c0b9d2a6d36940a074ea15   312879:
 b8be360c3fc96e294e6e21c8052ceb744e8b1289 v: v3

---
 [refs]           |  2 +-
 trunk/fs/namei.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f53cd59b3be..cd3f7b8d8331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58ffd35c1e595df2cf8ac4803f178c8be95ca7a
+refs/heads/master: 54ef487241e863a6046536ac5b1fcd5d7cde86e5
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index fad7117dbb28..ccb0eb17f528 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2209,14 +2209,24 @@ static struct file *lookup_open(struct nameidata *nd, struct path *path,
 				int *want_write, bool *created)
 {
 	struct dentry *dir = nd->path.dentry;
+	struct inode *dir_inode = dir->d_inode;
 	struct dentry *dentry;
 	int error;
+	bool need_lookup;
 
 	*created = false;
-	dentry = lookup_hash(nd);
+	dentry = lookup_dcache(&nd->last, dir, nd, &need_lookup);
 	if (IS_ERR(dentry))
 		return ERR_CAST(dentry);
 
+	if (need_lookup) {
+		BUG_ON(dentry->d_inode);
+
+		dentry = lookup_real(dir_inode, dentry, nd);
+		if (IS_ERR(dentry))
+			return ERR_CAST(dentry);
+	}
+
 	/* Negative dentry, just create the file */
 	if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
 		umode_t mode = op->mode;