From dafed7a53c70e0602eefc0f8bee9c03e47895ee8 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Jan 2011 18:46:46 +0000
Subject: [PATCH] --- yaml --- r: 231523 b: refs/heads/master c:
 87556ef19926e97464e0163a7840140527ae6615 h: refs/heads/master i:   231521:
 e5fb679456f7016a463ba7ae085f7d5e672aa31b   231519:
 c6c6122fa740f8ad02228ef7b3638444e9f3d22c v: v3

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

diff --git a/[refs] b/[refs]
index 9bc656f43dc9..15fb7c1d6afd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1972580bb4edea3ed6fe273b2ca72f44f10f8c86
+refs/heads/master: 87556ef19926e97464e0163a7840140527ae6615
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 61995fba4e21..373852012713 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -800,12 +800,8 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
 	touch_atime(link->mnt, dentry);
 	nd_set_link(nd, NULL);
 
-	if (link->mnt != nd->path.mnt) {
-		path_to_nameidata(link, nd);
-		nd->inode = nd->path.dentry->d_inode;
-		dget(dentry);
-	}
-	mntget(link->mnt);
+	if (link->mnt == nd->path.mnt)
+		mntget(link->mnt);
 
 	nd->last_type = LAST_BIND;
 	*p = dentry->d_inode->i_op->follow_link(dentry, nd);