---

yaml --- r: 348401 b: refs/heads/master c: ae62ca7 h: refs/heads/master i: 348399: ec99129 v: v3
git-mirror · Jan 7, 2013 · 35976f1 · 35976f1
1 parent ec74eb6
commit 35976f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dd4a13a89d7c27e51cb87b9e95e82d8999826da
+refs/heads/master: ae62ca7b03217be5e74759dc6d7698c95df498b3
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -696,8 +696,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
 		return -EINVAL;
 
 	more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
-	if (sd->len < sd->total_len)
+
+	if (sd->len < sd->total_len && pipe->nrbufs > 1)
 		more |= MSG_SENDPAGE_NOTLAST;
+
 	return file->f_op->sendpage(file, buf->page, buf->offset,
 				    sd->len, &pos, more);
 }