create_pipe_files(): switch the first allocation to alloc_file_pseudo()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 Jun 2018 14:05:18 +0000 (10:05 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Jul 2018 14:04:27 +0000 (10:04 -0400)
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/pipe.c

index 1909422e5a789fd692c02fb7dfdf95632d07c516..9701bd3458d146ecfaf9cf343f09729e3dead0ec 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -744,32 +744,24 @@ fail_inode:
 
 int create_pipe_files(struct file **res, int flags)
 {
 
 int create_pipe_files(struct file **res, int flags)
 {
-       int err;
        struct inode *inode = get_pipe_inode();
        struct file *f;
        struct inode *inode = get_pipe_inode();
        struct file *f;
-       struct path path;
 
        if (!inode)
                return -ENFILE;
 
 
        if (!inode)
                return -ENFILE;
 
-       err = -ENOMEM;
-       path.dentry = d_alloc_pseudo(pipe_mnt->mnt_sb, &empty_name);
-       if (!path.dentry)
-               goto err_inode;
-       path.mnt = mntget(pipe_mnt);
-
-       d_instantiate(path.dentry, inode);
-
-       f = alloc_file(&path, O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)),
-                       &pipefifo_fops);
+       f = alloc_file_pseudo(inode, pipe_mnt, "",
+                               O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)),
+                               &pipefifo_fops);
        if (IS_ERR(f)) {
        if (IS_ERR(f)) {
-               err = PTR_ERR(f);
-               goto err_dentry;
+               free_pipe_info(inode->i_pipe);
+               iput(inode);
+               return PTR_ERR(f);
        }
 
        f->private_data = inode->i_pipe;
 
        }
 
        f->private_data = inode->i_pipe;
 
-       res[0] = alloc_file(&path, O_RDONLY | (flags & O_NONBLOCK),
+       res[0] = alloc_file(&f->f_path, O_RDONLY | (flags & O_NONBLOCK),
                        &pipefifo_fops);
        if (IS_ERR(res[0])) {
                put_pipe_info(inode, inode->i_pipe);
                        &pipefifo_fops);
        if (IS_ERR(res[0])) {
                put_pipe_info(inode, inode->i_pipe);
@@ -777,20 +769,10 @@ int create_pipe_files(struct file **res, int flags)
                return PTR_ERR(res[0]);
        }
 
                return PTR_ERR(res[0]);
        }
 
-       path_get(&path);
+       path_get(&f->f_path);
        res[0]->private_data = inode->i_pipe;
        res[1] = f;
        return 0;
        res[0]->private_data = inode->i_pipe;
        res[1] = f;
        return 0;
-
-err_dentry:
-       free_pipe_info(inode->i_pipe);
-       path_put(&path);
-       return err;
-
-err_inode:
-       free_pipe_info(inode->i_pipe);
-       iput(inode);
-       return err;
 }
 
 static int __do_pipe_flags(int *fd, struct file **files, int flags)
 }
 
 static int __do_pipe_flags(int *fd, struct file **files, int flags)