aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/pipe.c6
-rw-r--r--fs/splice.c2
-rw-r--r--include/linux/pipe_fs_i.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 39bdec06fe2b..6cac5ceeded0 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -775,7 +775,7 @@ pipe_fasync(int fd, struct file *filp, int on)
775 return retval; 775 return retval;
776} 776}
777 777
778struct pipe_inode_info * alloc_pipe_info(struct inode *inode) 778struct pipe_inode_info *alloc_pipe_info(void)
779{ 779{
780 struct pipe_inode_info *pipe; 780 struct pipe_inode_info *pipe;
781 781
@@ -841,7 +841,7 @@ static struct inode * get_pipe_inode(void)
841 841
842 inode->i_ino = get_next_ino(); 842 inode->i_ino = get_next_ino();
843 843
844 pipe = alloc_pipe_info(inode); 844 pipe = alloc_pipe_info();
845 if (!pipe) 845 if (!pipe)
846 goto fail_iput; 846 goto fail_iput;
847 847
@@ -1031,7 +1031,7 @@ static int fifo_open(struct inode *inode, struct file *filp)
1031 spin_unlock(&inode->i_lock); 1031 spin_unlock(&inode->i_lock);
1032 } else { 1032 } else {
1033 spin_unlock(&inode->i_lock); 1033 spin_unlock(&inode->i_lock);
1034 pipe = alloc_pipe_info(inode); 1034 pipe = alloc_pipe_info();
1035 if (!pipe) 1035 if (!pipe)
1036 return -ENOMEM; 1036 return -ENOMEM;
1037 pipe->files = 1; 1037 pipe->files = 1;
diff --git a/fs/splice.c b/fs/splice.c
index 9f2a4447da50..45e645b15d92 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1183,7 +1183,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
1183 */ 1183 */
1184 pipe = current->splice_pipe; 1184 pipe = current->splice_pipe;
1185 if (unlikely(!pipe)) { 1185 if (unlikely(!pipe)) {
1186 pipe = alloc_pipe_info(NULL); 1186 pipe = alloc_pipe_info();
1187 if (!pipe) 1187 if (!pipe)
1188 return -ENOMEM; 1188 return -ENOMEM;
1189 1189
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ed8eeeb10811..765114f16243 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -146,7 +146,7 @@ int pipe_proc_fn(struct ctl_table *, int, void __user *, size_t *, loff_t *);
146/* Drop the inode semaphore and wait for a pipe event, atomically */ 146/* Drop the inode semaphore and wait for a pipe event, atomically */
147void pipe_wait(struct pipe_inode_info *pipe); 147void pipe_wait(struct pipe_inode_info *pipe);
148 148
149struct pipe_inode_info * alloc_pipe_info(struct inode * inode); 149struct pipe_inode_info *alloc_pipe_info(void);
150void free_pipe_info(struct inode * inode); 150void free_pipe_info(struct inode * inode);
151void __free_pipe_info(struct pipe_inode_info *); 151void __free_pipe_info(struct pipe_inode_info *);
152 152