From a5072abe95ca306e641b12ce2c3c163848a88efd Mon Sep 17 00:00:00 2001
From: Al Viro <viro@www.linux.org.uk>
Date: Mon, 6 Jun 2005 13:36:13 -0700
Subject: [PATCH] --- yaml --- r: 1857 b: refs/heads/master c:
 634ee7017b31e46e28c0bd2cb488213331bfd39a h: refs/heads/master i:   1855:
 feda4af2a32963835582ea4e9490286ce6aafda2 v: v3

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

diff --git a/[refs] b/[refs]
index aa2ee75f550f..6d7deebff606 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58c465eba4d7ed307c4c7cb3382ba7ee565e8858
+refs/heads/master: 634ee7017b31e46e28c0bd2cb488213331bfd39a
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 36925ff307b3..5af7681e8ea3 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -682,6 +682,7 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 done:
 	path->mnt = mnt;
 	path->dentry = dentry;
+	__follow_mount(path);
 	return 0;
 
 need_lookup:
@@ -789,8 +790,6 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
 		err = do_lookup(nd, &this, &next);
 		if (err)
 			break;
-		/* Check mountpoints.. */
-		__follow_mount(&next);
 
 		err = -ENOENT;
 		inode = next.dentry->d_inode;
@@ -850,7 +849,6 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
 		err = do_lookup(nd, &this, &next);
 		if (err)
 			break;
-		__follow_mount(&next);
 		inode = next.dentry->d_inode;
 		if ((lookup_flags & LOOKUP_FOLLOW)
 		    && inode && inode->i_op && inode->i_op->follow_link) {