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

Commit decf3400 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: do_last(): use inode variable 



Use helper variable instead of path->dentry->d_inode before complete_walk().
This will allow this code to be used in RCU mode.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a1eb3315

fs/namei.c

+5 −3
Original line number Diff line number Diff line
@@ -2358,15 +2358,17 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
	if (error)

		nd->flags |= LOOKUP_JUMPED;



	BUG_ON(nd->flags & LOOKUP_RCU);

	inode = path->dentry->d_inode;

	error = -ENOENT;

	if (!path->dentry->d_inode)

	if (!inode)

		goto exit_dput;



	if (path->dentry->d_inode->i_op->follow_link)

	if (inode->i_op->follow_link)

		return NULL;



	path_to_nameidata(path, nd);

	nd->inode = path->dentry->d_inode;

	nd->inode = inode;

	/* Why this, you ask?  _Now_ we might have grown LOOKUP_JUMPED... */

	error = complete_walk(nd);

	if (error)