1 files changed, 22 insertions, 39 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 4a56f9b59e8c..e584f04745b5 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1147,9 +1147,16 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
 
 }
 
-static int __path_lookup_intent_open(int dfd, const char *name,
-                unsigned int lookup_flags, struct nameidata *nd,
-                int open_flags, int create_mode)
+/**
+ * path_lookup_open - lookup a file path with open intent
+ * @dfd: the directory to use as base, or AT_FDCWD
+ * @name: pointer to file name
+ * @lookup_flags: lookup intent flags
+ * @nd: pointer to nameidata
+ * @open_flags: open intent flags
+ */
+int path_lookup_open(int dfd, const char *name, unsigned int lookup_flags,
+                struct nameidata *nd, int open_flags)
 {
         struct file *filp = get_empty_filp();
         int err;
@@ -1158,7 +1165,7 @@ static int __path_lookup_intent_open(int dfd, const char *name,
                 return -ENFILE;
         nd->intent.open.file = filp;
         nd->intent.open.flags = open_flags;
-        nd->intent.open.create_mode = create_mode;
+        nd->intent.open.create_mode = 0;
         err = do_path_lookup(dfd, name, lookup_flags|LOOKUP_OPEN, nd);
         if (IS_ERR(nd->intent.open.file)) {
                 if (err == 0) {
@@ -1170,38 +1177,6 @@ static int __path_lookup_intent_open(int dfd, const char *name,
         return err;
 }
 
-/**
- * path_lookup_open - lookup a file path with open intent
- * @dfd: the directory to use as base, or AT_FDCWD
- * @name: pointer to file name
- * @lookup_flags: lookup intent flags
- * @nd: pointer to nameidata
- * @open_flags: open intent flags
- */
-int path_lookup_open(int dfd, const char *name, unsigned int lookup_flags,
-                struct nameidata *nd, int open_flags)
-{
-        return __path_lookup_intent_open(dfd, name, lookup_flags, nd,
-                        open_flags, 0);
-}
-
-/**
- * path_lookup_create - lookup a file path with open + create intent
- * @dfd: the directory to use as base, or AT_FDCWD
- * @name: pointer to file name
- * @lookup_flags: lookup intent flags
- * @nd: pointer to nameidata
- * @open_flags: open intent flags
- * @create_mode: create intent flags
- */
-static int path_lookup_create(int dfd, const char *name,
-                              unsigned int lookup_flags, struct nameidata *nd,
-                              int open_flags, int create_mode)
-{
-        return __path_lookup_intent_open(dfd, name, lookup_flags|LOOKUP_CREATE,
-                        nd, open_flags, create_mode);
-}
-
 static struct dentry *__lookup_hash(struct qstr *name,
                 struct dentry *base, struct nameidata *nd)
 {
@@ -1711,8 +1686,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
         /*
          * Create - we need to know the parent.
          */
-        error = path_lookup_create(dfd, pathname, LOOKUP_PARENT,
-                                   &nd, flag, mode);
+        error = do_path_lookup(dfd, pathname, LOOKUP_PARENT, &nd);
         if (error)
                 return ERR_PTR(error);
 
@@ -1723,10 +1697,18 @@ struct file *do_filp_open(int dfd, const char *pathname,
          */
         error = -EISDIR;
         if (nd.last_type != LAST_NORM || nd.last.name[nd.last.len])
-                goto exit;
+                goto exit_parent;
 
+        error = -ENFILE;
+        filp = get_empty_filp();
+        if (filp == NULL)
+                goto exit_parent;
+        nd.intent.open.file = filp;
+        nd.intent.open.flags = flag;
+        nd.intent.open.create_mode = mode;
         dir = nd.path.dentry;
         nd.flags &= ~LOOKUP_PARENT;
+        nd.flags |= LOOKUP_CREATE | LOOKUP_OPEN;
         mutex_lock(&dir->d_inode->i_mutex);
         path.dentry = lookup_hash(&nd);
         path.mnt = nd.path.mnt;
@@ -1831,6 +1813,7 @@ exit_dput:
 exit:
         if (!IS_ERR(nd.intent.open.file))
                 release_open_intent(&nd);
+exit_parent:
         path_put(&nd.path);
         return ERR_PTR(error);