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/splice.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/splice.c')
-rw-r--r-- | fs/splice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index 7efc2f5057fb..9f2a4447da50 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -218,7 +218,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, | |||
218 | page_nr++; | 218 | page_nr++; |
219 | ret += buf->len; | 219 | ret += buf->len; |
220 | 220 | ||
221 | if (pipe->inode) | 221 | if (pipe->files) |
222 | do_wakeup = 1; | 222 | do_wakeup = 1; |
223 | 223 | ||
224 | if (!--spd->nr_pages) | 224 | if (!--spd->nr_pages) |
@@ -828,7 +828,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd, | |||
828 | ops->release(pipe, buf); | 828 | ops->release(pipe, buf); |
829 | pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1); | 829 | pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1); |
830 | pipe->nrbufs--; | 830 | pipe->nrbufs--; |
831 | if (pipe->inode) | 831 | if (pipe->files) |
832 | sd->need_wakeup = true; | 832 | sd->need_wakeup = true; |
833 | } | 833 | } |
834 | 834 | ||