---

yaml
---
r: 25311
b: refs/heads/master
c: b2b39fa
h: refs/heads/master
i:
  25309: a7dea90
  25307: 7d15899
  25303: 85f8ee5
  25295: a64771c
  25279: dcc88a5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83f9135bddffded9f1716519b6c147bcf046c87e
+refs/heads/master: b2b39fa478db6db89b7ccafb0649973845b0eb75

trunk/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)

trunk/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