Skip to content

Commit

Permalink
vfs: do_last(): use inode variable
Browse files Browse the repository at this point in the history
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: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Miklos Szeredi authored and Al Viro committed Jun 1, 2012
1 parent a1eb331 commit decf340
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit decf340

Please sign in to comment.