From 3a7fab0ecd71e1d9eecafe1f4e9e52b3c04e6884 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 9 Mar 2011 01:34:45 -0500
Subject: [PATCH] --- yaml --- r: 234266 b: refs/heads/master c:
 f374ed5fa8afed8590deaae5dc147422e0e1a6d9 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 06f96b79a0d5..4250efa8b3a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0d46c493217cf48999b3f8808910ae534aa085
+refs/heads/master: f374ed5fa8afed8590deaae5dc147422e0e1a6d9
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 441f1106de08..6972e761286b 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2183,11 +2183,6 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	path->dentry = dentry;
 	path->mnt = nd->path.mnt;
 
-	if (IS_ERR(nd->intent.open.file)) {
-		error = PTR_ERR(nd->intent.open.file);
-		goto exit_mutex_unlock;
-	}
-
 	/* Negative dentry, just create the file */
 	if (!dentry->d_inode) {
 		int mode = op->mode;