diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-21 11:06:46 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 14:13:02 -0400 |
| commit | 4b8a8f1e4f94fd87747e6e3acef74cf0b4dc0dae (patch) | |
| tree | fb45e867f1c548fb763b4283c7f57349374ab6a7 /fs/pipe.c | |
| parent | 7bee130e222dfb3a7a70c0404dc09f104cddd7d6 (diff) | |
| download | linux-stable-4b8a8f1e4f94fd87747e6e3acef74cf0b4dc0dae.tar.gz linux-stable-4b8a8f1e4f94fd87747e6e3acef74cf0b4dc0dae.tar.bz2 linux-stable-4b8a8f1e4f94fd87747e6e3acef74cf0b4dc0dae.zip | |
get rid of the last free_pipe_info() callers
and rename __free_pipe_info() to free_pipe_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 6cac5ceeded0..a029a14bacf1 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -751,7 +751,7 @@ pipe_release(struct inode *inode, struct file *file) __pipe_unlock(pipe); if (kill) - __free_pipe_info(pipe); + free_pipe_info(pipe); return 0; } @@ -795,7 +795,7 @@ struct pipe_inode_info *alloc_pipe_info(void) return NULL; } -void __free_pipe_info(struct pipe_inode_info *pipe) +void free_pipe_info(struct pipe_inode_info *pipe) { int i; @@ -810,12 +810,6 @@ void __free_pipe_info(struct pipe_inode_info *pipe) kfree(pipe); } -void free_pipe_info(struct inode *inode) -{ - __free_pipe_info(inode->i_pipe); - inode->i_pipe = NULL; -} - static struct vfsmount *pipe_mnt __read_mostly; /* @@ -911,12 +905,12 @@ int create_pipe_files(struct file **res, int flags) err_file: put_filp(f); err_dentry: - free_pipe_info(inode); + free_pipe_info(inode->i_pipe); path_put(&path); return err; err_inode: - free_pipe_info(inode); + free_pipe_info(inode->i_pipe); iput(inode); return err; } @@ -1039,7 +1033,7 @@ static int fifo_open(struct inode *inode, struct file *filp) if (unlikely(inode->i_pipe)) { inode->i_pipe->files++; spin_unlock(&inode->i_lock); - __free_pipe_info(pipe); + free_pipe_info(pipe); pipe = inode->i_pipe; } else { inode->i_pipe = pipe; @@ -1143,7 +1137,7 @@ err: spin_unlock(&inode->i_lock); __pipe_unlock(pipe); if (kill) - __free_pipe_info(pipe); + free_pipe_info(pipe); return ret; } |