[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>

diff --git a/fs/splice.c b/fs/splice.c
index 34591924c783538552641324ba69a87a714c938b..e8454455894690c9c5d0d4cb67da0d26a3e58dff 100644 (file)
--- 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 32865004751c7cc375a403d1f68f634daa287ec9..70ae9332ec16ee64709908f8cc854532cb612616 100644 (file)
--- 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