vfs: do_last() common post lookup

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>

1 files changed, 3 insertions, 31 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 125386c250bb..998d5316921a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -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 */
@@ -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);