From 416ec78d5d013e30132c2f679e92b09706c01460 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 14 Mar 2011 21:28:04 -0400
Subject: [PATCH] --- yaml --- r: 234292 b: refs/heads/master c:
 ce0525449da56444948c368f52e10f3db0465338 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index edb94d92ae15..20063a5357e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd92d7fed877ed1e6997e4f3f13dbcd872947653
+refs/heads/master: ce0525449da56444948c368f52e10f3db0465338
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index a3431639e166..9575d0039699 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1467,8 +1467,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			nd->last_type = type;
 			return 0;
 		}
-		err = walk_component(nd, &next, &this, type,
-					lookup_flags & LOOKUP_FOLLOW);
+		err = walk_component(nd, &next, &this, type, LOOKUP_FOLLOW);
 		if (err < 0)
 			return err;
 		if (err) {
@@ -1476,11 +1475,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			if (err)
 				return err;
 		}
-		if (lookup_flags & LOOKUP_DIRECTORY) {
-			err = -ENOTDIR; 
-			if (!nd->inode->i_op->lookup)
-				break;
-		}
 		return 0;
 	}
 	terminate_walk(nd);