---

yaml --- r: 231523 b: refs/heads/master c: 87556ef h: refs/heads/master i: 231521: e5fb679 231519: c6c6122 v: v3
git-mirror · Jan 16, 2011 · dafed7a · dafed7a
1 parent c18f78f
commit dafed7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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);