Skip to content

Commit

Permalink
vfs: do_last() common post lookup
Browse files Browse the repository at this point in the history
Now the post lookup code can be shared between O_CREAT and plain opens since
they are essentially the same.

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 d7fdd7f commit 5f5daac
Showing 1 changed file with 3 additions and 31 deletions.
34 changes: 3 additions & 31 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2249,37 +2249,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,

inode = path->dentry->d_inode;
}
error = -ENOENT;
if (!inode) {
path_to_nameidata(path, nd);
goto exit;
}

if (should_follow_link(inode, !symlink_ok)) {
if (nd->flags & LOOKUP_RCU) {
if (unlikely(unlazy_walk(nd, path->dentry))) {
error = -ECHILD;
goto exit;
}
}
BUG_ON(inode != path->dentry->d_inode);
return NULL;
}
path_to_nameidata(path, nd);
nd->inode = inode;

/* sayonara */
error = complete_walk(nd);
if (error)
return ERR_PTR(error);

error = -ENOTDIR;
if (nd->flags & LOOKUP_DIRECTORY) {
if (!nd->inode->i_op->lookup)
goto exit;
}
audit_inode(pathname, nd->path.dentry);
goto ok;
goto finish_lookup;
}

/* create side of things */
Expand Down Expand Up @@ -2360,6 +2330,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,

BUG_ON(nd->flags & LOOKUP_RCU);
inode = path->dentry->d_inode;
finish_lookup:
/* we _can_ be in RCU mode here */
error = -ENOENT;
if (!inode) {
path_to_nameidata(path, nd);
Expand Down

0 comments on commit 5f5daac

Please sign in to comment.