---

yaml --- r: 147039 b: refs/heads/master c: 77f6bf5 h: refs/heads/master i: 147037: 1ea4aa6 147035: b95025f 147031: 8be8498 147023: 945122a 147007: 2fe8f76 v: v3
git-mirror · May 14, 2009 · 2e6e0b0 · 2e6e0b0
1 parent 820a164
commit 2e6e0b0
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: 4f23122858a27ba97444b9b37a066d83edebd4c8
+refs/heads/master: 77f6bf57ba9d2c50173536dbfdacdab27cb867ca
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -595,8 +595,10 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
 	}
 
 	res = kernel_readv(in, vec, spd.nr_pages, *ppos);
-	if (res < 0)
+	if (res < 0) {
+		error = res;
 		goto err;
+	}
 
 	error = 0;
 	if (!res)