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

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

[PATCH] namei fixes (8/19) 



In open_namei() we never use path.mnt or path.dentry after exit: or ok:.
Assignment of path.dentry in case of LAST_BIND is dead code and only
obfuscates already convoluted function; assignment of path.mnt after
__do_follow_link() can be moved down to the place where we set path.dentry.

Obviously equivalent transformations, just to clean the air a bit in that
region.

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 cd4e91d3

fs/namei.c

+2 −4
Original line number Diff line number Diff line
@@ -1526,14 +1526,11 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) 
	if (error)

		goto exit_dput;

	error = __do_follow_link(&path, nd);

	path.mnt = nd->mnt;

	if (error)

		return error;

	nd->flags &= ~LOOKUP_PARENT;

	if (nd->last_type == LAST_BIND) {

		path.dentry = nd->dentry;

	if (nd->last_type == LAST_BIND)

		goto ok;

	}

	error = -EISDIR;

	if (nd->last_type != LAST_NORM)

		goto exit;
@@ -1549,6 +1546,7 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) 
	dir = nd->dentry;

	down(&dir->d_inode->i_sem);

	path.dentry = __lookup_hash(&nd->last, nd->dentry, nd);

	path.mnt = nd->mnt;

	putname(nd->last.name);

	goto do_last;

}