diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-21 11:01:38 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 14:13:01 -0400 |
commit | 6447a3cf19da8c4653283d1c491e2e775633f348 (patch) | |
tree | 9fda0088125df81c816b5cce416e5d010c9de498 /fs/pipe.c | |
parent | ebec73f4752b777b79b384bd52e5240203cb9b00 (diff) |
get rid of pipe->inode
it's used only as a flag to distinguish normal pipes/FIFOs from the
internal per-task one used by file-to-file splice. And pipe->files
would work just as well for that purpose...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE; | |||
55 | 55 | ||
56 | static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass) | 56 | static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass) |
57 | { | 57 | { |
58 | if (pipe->inode) | 58 | if (pipe->files) |
59 | mutex_lock_nested(&pipe->mutex, subclass); | 59 | mutex_lock_nested(&pipe->mutex, subclass); |
60 | } | 60 | } |
61 | 61 | ||
@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock); | |||
70 | 70 | ||
71 | void pipe_unlock(struct pipe_inode_info *pipe) | 71 | void pipe_unlock(struct pipe_inode_info *pipe) |
72 | { | 72 | { |
73 | if (pipe->inode) | 73 | if (pipe->files) |
74 | mutex_unlock(&pipe->mutex); | 74 | mutex_unlock(&pipe->mutex); |
75 | } | 75 | } |
76 | EXPORT_SYMBOL(pipe_unlock); | 76 | EXPORT_SYMBOL(pipe_unlock); |
@@ -785,7 +785,6 @@ struct pipe_inode_info * alloc_pipe_info(struct inode *inode) | |||
785 | if (pipe->bufs) { | 785 | if (pipe->bufs) { |
786 | init_waitqueue_head(&pipe->wait); | 786 | init_waitqueue_head(&pipe->wait); |
787 | pipe->r_counter = pipe->w_counter = 1; | 787 | pipe->r_counter = pipe->w_counter = 1; |
788 | pipe->inode = inode; | ||
789 | pipe->buffers = PIPE_DEF_BUFFERS; | 788 | pipe->buffers = PIPE_DEF_BUFFERS; |
790 | mutex_init(&pipe->mutex); | 789 | mutex_init(&pipe->mutex); |
791 | return pipe; | 790 | return pipe; |