From: Al Viro <viro@www.linux.org.uk>
Cosmetical cleanups - __follow_mount() calls in __link_path_walk() absorbed
into do_lookup().
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
fs/namei.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
diff -puN fs/namei.c~namei-fixes-18-19 fs/namei.c
--- 25/fs/namei.c~namei-fixes-18-19 Fri May 20 15:42:47 2005
+++ 25-akpm/fs/namei.c Fri May 20 15:42:47 2005
@@ -682,6 +682,7 @@ static int do_lookup(struct nameidata *n
done:
path->mnt = mnt;
path->dentry = dentry;
+ __follow_mount(path);
return 0;
need_lookup:
@@ -789,8 +790,6 @@ static fastcall int __link_path_walk(con
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 @@ last_component:
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) {
_