Skip to content

Commit

Permalink
[PATCH] splice: add a SPLICE_F_MORE flag
Browse files Browse the repository at this point in the history
This lets userspace indicate whether more data will be coming in a
subsequent splice call.

Signed-off-by: Jens Axboe <axboe@suse.de>
  • Loading branch information
Jens Axboe committed Apr 2, 2006
1 parent 83f9135 commit b2b39fa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/splice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions include/linux/pipe_fs_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b2b39fa

Please sign in to comment.