From a125b3abf90d8978d6224eaf73cd54cba2c8ca4b Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 21 May 2012 17:30:09 +0200
Subject: [PATCH] --- yaml --- r: 310058 b: refs/heads/master c:
 d45ea86792db9679ed010b2c3df3db32b2ce5bde h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b1c3b77b5791..2a8f8dd139dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: decf3400879d02d0eafedea52c7f208587be062a
+refs/heads/master: d45ea86792db9679ed010b2c3df3db32b2ce5bde
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 41445e7fd339..c6b996817bb3 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2201,6 +2201,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	int acc_mode = op->acc_mode;
 	struct file *filp;
 	struct inode *inode;
+	int symlink_ok = 0;
 	int error;
 
 	nd->flags &= ~LOOKUP_PARENT;
@@ -2232,7 +2233,6 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	}
 
 	if (!(open_flag & O_CREAT)) {
-		int symlink_ok = 0;
 		if (nd->last.name[nd->last.len])
 			nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
 		if (open_flag & O_PATH && !(nd->flags & LOOKUP_FOLLOW))
@@ -2364,8 +2364,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 	if (!inode)
 		goto exit_dput;
 
-	if (inode->i_op->follow_link)
+	if (should_follow_link(inode, !symlink_ok)) {
+		if (nd->flags & LOOKUP_RCU) {
+			if (unlikely(unlazy_walk(nd, path->dentry))) {
+				error = -ECHILD;
+				goto exit;
+			}
+		}
+		BUG_ON(inode != path->dentry->d_inode);
 		return NULL;
+	}
 
 	path_to_nameidata(path, nd);
 	nd->inode = inode;