vfs: do_last(): use inode variable
authorMiklos Szeredi <mszeredi@suse.cz>
Mon, 21 May 2012 15:30:08 +0000 (17:30 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 1 Jun 2012 16:11:57 +0000 (12:11 -0400)
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>
fs/namei.c

index f6b31c9..41445e7 100644 (file)
@@ -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)