diff options
author | Jens Axboe <axboe@suse.de> | 2006-04-02 17:05:41 -0400 |
---|---|---|
committer | Jens Axboe <axboe@suse.de> | 2006-04-02 17:05:41 -0400 |
commit | b2b39fa478db6db89b7ccafb0649973845b0eb75 (patch) | |
tree | 784d85b94fb634e3b33dfd3f1153c98580cfac15 /fs | |
parent | 83f9135bddffded9f1716519b6c147bcf046c87e (diff) |
[PATCH] splice: add a SPLICE_F_MORE flag
This lets userspace indicate whether more data will be coming in a
subsequent splice call.
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/splice.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index 34591924c783..e84544558946 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -354,6 +354,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *info, | |||
354 | unsigned int offset; | 354 | unsigned int offset; |
355 | ssize_t ret; | 355 | ssize_t ret; |
356 | void *ptr; | 356 | void *ptr; |
357 | int more; | ||
357 | 358 | ||
358 | /* | 359 | /* |
359 | * sub-optimal, but we are limited by the pipe ->map. we don't | 360 | * sub-optimal, but we are limited by the pipe ->map. we don't |
@@ -366,9 +367,9 @@ static int pipe_to_sendpage(struct pipe_inode_info *info, | |||
366 | return PTR_ERR(ptr); | 367 | return PTR_ERR(ptr); |
367 | 368 | ||
368 | offset = pos & ~PAGE_CACHE_MASK; | 369 | offset = pos & ~PAGE_CACHE_MASK; |
370 | more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len; | ||
369 | 371 | ||
370 | ret = file->f_op->sendpage(file, buf->page, offset, sd->len, &pos, | 372 | ret = file->f_op->sendpage(file, buf->page, offset, sd->len, &pos,more); |
371 | sd->len < sd->total_len); | ||
372 | 373 | ||
373 | buf->ops->unmap(info, buf); | 374 | buf->ops->unmap(info, buf); |
374 | if (ret == sd->len) | 375 | if (ret == sd->len) |