summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-04-02 23:05:41 +0200
committerJens Axboe <axboe@suse.de>2006-04-02 23:05:41 +0200
commitb2b39fa478db6db89b7ccafb0649973845b0eb75 (patch)
tree784d85b94fb634e3b33dfd3f1153c98580cfac15
parent83f9135bddffded9f1716519b6c147bcf046c87e (diff)
downloadlinux-3.10-b2b39fa478db6db89b7ccafb0649973845b0eb75.tar.gz
linux-3.10-b2b39fa478db6db89b7ccafb0649973845b0eb75.tar.bz2
linux-3.10-b2b39fa478db6db89b7ccafb0649973845b0eb75.zip
[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>
-rw-r--r--fs/splice.c5
-rw-r--r--include/linux/pipe_fs_i.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 34591924c78..e8454455894 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -354,6 +354,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *info,
unsigned int offset;
ssize_t ret;
void *ptr;
+ int more;
/*
* 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,
return PTR_ERR(ptr);
offset = pos & ~PAGE_CACHE_MASK;
+ more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len;
- ret = file->f_op->sendpage(file, buf->page, offset, sd->len, &pos,
- sd->len < sd->total_len);
+ ret = file->f_op->sendpage(file, buf->page, offset, sd->len, &pos,more);
buf->ops->unmap(info, buf);
if (ret == sd->len)
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 32865004751..70ae9332ec1 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -62,5 +62,6 @@ void free_pipe_info(struct inode* inode);
#define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */
/* we may still block on the fd we splice */
/* from/to, of course */
+#define SPLICE_F_MORE (0x04) /* expect more data */
#endif