aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-05-03 04:41:33 -0400
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-05-04 00:55:12 -0400
commit76ad4d11105ccd40a536db1057083f28326019fd (patch)
treedea71a387ca8821c47a00da5496d4b6edbab9d5e /fs
parent1432873af7ae29d4bb3c56114c05b539d078ca62 (diff)
[PATCH] splice: rename remaining info variables to pipe
Same thing was done in fs/pipe.c and most of fs/splice.c, but we had a few missing still. Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 0b202425b0b5..8fa9217ed585 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -51,7 +51,7 @@ struct splice_pipe_desc {
51 * addition of remove_mapping(). If success is returned, the caller may 51 * addition of remove_mapping(). If success is returned, the caller may
52 * attempt to reuse this page for another destination. 52 * attempt to reuse this page for another destination.
53 */ 53 */
54static int page_cache_pipe_buf_steal(struct pipe_inode_info *info, 54static int page_cache_pipe_buf_steal(struct pipe_inode_info *pipe,
55 struct pipe_buffer *buf) 55 struct pipe_buffer *buf)
56{ 56{
57 struct page *page = buf->page; 57 struct page *page = buf->page;
@@ -82,14 +82,14 @@ static int page_cache_pipe_buf_steal(struct pipe_inode_info *info,
82 return 0; 82 return 0;
83} 83}
84 84
85static void page_cache_pipe_buf_release(struct pipe_inode_info *info, 85static void page_cache_pipe_buf_release(struct pipe_inode_info *pipe,
86 struct pipe_buffer *buf) 86 struct pipe_buffer *buf)
87{ 87{
88 page_cache_release(buf->page); 88 page_cache_release(buf->page);
89 buf->flags &= ~PIPE_BUF_FLAG_LRU; 89 buf->flags &= ~PIPE_BUF_FLAG_LRU;
90} 90}
91 91
92static int page_cache_pipe_buf_pin(struct pipe_inode_info *info, 92static int page_cache_pipe_buf_pin(struct pipe_inode_info *pipe,
93 struct pipe_buffer *buf) 93 struct pipe_buffer *buf)
94{ 94{
95 struct page *page = buf->page; 95 struct page *page = buf->page;
@@ -500,14 +500,14 @@ EXPORT_SYMBOL(generic_file_splice_read);
500 * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' 500 * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos'
501 * using sendpage(). Return the number of bytes sent. 501 * using sendpage(). Return the number of bytes sent.
502 */ 502 */
503static int pipe_to_sendpage(struct pipe_inode_info *info, 503static int pipe_to_sendpage(struct pipe_inode_info *pipe,
504 struct pipe_buffer *buf, struct splice_desc *sd) 504 struct pipe_buffer *buf, struct splice_desc *sd)
505{ 505{
506 struct file *file = sd->file; 506 struct file *file = sd->file;
507 loff_t pos = sd->pos; 507 loff_t pos = sd->pos;
508 int ret, more; 508 int ret, more;
509 509
510 ret = buf->ops->pin(info, buf); 510 ret = buf->ops->pin(pipe, buf);
511 if (!ret) { 511 if (!ret) {
512 more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len; 512 more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len;
513 513
@@ -538,7 +538,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *info,
538 * SPLICE_F_MOVE isn't set, or we cannot move the page, we simply create 538 * SPLICE_F_MOVE isn't set, or we cannot move the page, we simply create
539 * a new page in the output file page cache and fill/dirty that. 539 * a new page in the output file page cache and fill/dirty that.
540 */ 540 */
541static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, 541static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
542 struct splice_desc *sd) 542 struct splice_desc *sd)
543{ 543{
544 struct file *file = sd->file; 544 struct file *file = sd->file;
@@ -552,7 +552,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
552 /* 552 /*
553 * make sure the data in this buffer is uptodate 553 * make sure the data in this buffer is uptodate
554 */ 554 */
555 ret = buf->ops->pin(info, buf); 555 ret = buf->ops->pin(pipe, buf);
556 if (unlikely(ret)) 556 if (unlikely(ret))
557 return ret; 557 return ret;
558 558
@@ -573,7 +573,7 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf,
573 * pagecache and we can reuse it. The page will also be 573 * pagecache and we can reuse it. The page will also be
574 * locked on successful return. 574 * locked on successful return.
575 */ 575 */
576 if (buf->ops->steal(info, buf)) 576 if (buf->ops->steal(pipe, buf))
577 goto find_page; 577 goto find_page;
578 578
579 page = buf->page; 579 page = buf->page;
@@ -659,13 +659,13 @@ find_page:
659 /* 659 /*
660 * Careful, ->map() uses KM_USER0! 660 * Careful, ->map() uses KM_USER0!
661 */ 661 */
662 char *src = buf->ops->map(info, buf, 1); 662 char *src = buf->ops->map(pipe, buf, 1);
663 char *dst = kmap_atomic(page, KM_USER1); 663 char *dst = kmap_atomic(page, KM_USER1);
664 664
665 memcpy(dst + offset, src + buf->offset, this_len); 665 memcpy(dst + offset, src + buf->offset, this_len);
666 flush_dcache_page(page); 666 flush_dcache_page(page);
667 kunmap_atomic(dst, KM_USER1); 667 kunmap_atomic(dst, KM_USER1);
668 buf->ops->unmap(info, buf, src); 668 buf->ops->unmap(pipe, buf, src);
669 } 669 }
670 670
671 ret = mapping->a_ops->commit_write(file, page, offset, offset+this_len); 671 ret = mapping->a_ops->commit_write(file, page, offset, offset+this_len);