Skip to content

Commit

Permalink
[PATCH] namei fixes (18/19)
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jun 6, 2005
1 parent 58c465e commit 634ee70
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 634ee70

Please sign in to comment.