Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 634ee701 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] namei fixes (18/19) 



Cosmetical cleanups - __follow_mount() calls in __link_path_walk() absorbed
into do_lookup().

Obviously equivalent transformation.

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 58c465eb

fs/namei.c

+1 −3
Original line number Diff line number Diff line
@@ -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 @@ 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) {