diff options
| -rw-r--r-- | fs/pipe.c | 6 | ||||
| -rw-r--r-- | fs/splice.c | 2 | ||||
| -rw-r--r-- | include/linux/pipe_fs_i.h | 2 |
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) return retval; } -struct pipe_inode_info * alloc_pipe_info(struct inode *inode) +struct pipe_inode_info *alloc_pipe_info(void) { struct pipe_inode_info *pipe; @@ -841,7 +841,7 @@ static struct inode * get_pipe_inode(void) inode->i_ino = get_next_ino(); - pipe = alloc_pipe_info(inode); + pipe = alloc_pipe_info(); if (!pipe) goto fail_iput; @@ -1031,7 +1031,7 @@ static int fifo_open(struct inode *inode, struct file *filp) spin_unlock(&inode->i_lock); } else { spin_unlock(&inode->i_lock); - pipe = alloc_pipe_info(inode); + pipe = alloc_pipe_info(); if (!pipe) return -ENOMEM; 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, */ pipe = current->splice_pipe; if (unlikely(!pipe)) { - pipe = alloc_pipe_info(NULL); + pipe = alloc_pipe_info(); if (!pipe) return -ENOMEM; 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 *); /* Drop the inode semaphore and wait for a pipe event, atomically */ void pipe_wait(struct pipe_inode_info *pipe); -struct pipe_inode_info * alloc_pipe_info(struct inode * inode); +struct pipe_inode_info *alloc_pipe_info(void); void free_pipe_info(struct inode * inode); void __free_pipe_info(struct pipe_inode_info *); |