diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-09 10:05:18 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-12 10:04:27 -0400 |
| commit | 152b6372c90630ef6787334e84cdddbcf8beb241 (patch) | |
| tree | e7b52fdb73b63dd35653232405e1d4de9e70d956 /fs/pipe.c | |
| parent | 52c91f8b3b1f5f69e47f7f65f76066d0c940b191 (diff) | |
| download | linux-stable-152b6372c90630ef6787334e84cdddbcf8beb241.tar.gz linux-stable-152b6372c90630ef6787334e84cdddbcf8beb241.tar.bz2 linux-stable-152b6372c90630ef6787334e84cdddbcf8beb241.zip | |
create_pipe_files(): switch the first allocation to alloc_file_pseudo()
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 1909422e5a78..9701bd3458d1 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -744,32 +744,24 @@ fail_inode: int create_pipe_files(struct file **res, int flags) { - int err; struct inode *inode = get_pipe_inode(); struct file *f; - struct path path; 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)) { - 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; - 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); @@ -777,20 +769,10 @@ int create_pipe_files(struct file **res, int flags) 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; - -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) |