From 2e6e0b01e42796afdccc4c9c46d4649ce01c4dc7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 14 May 2009 09:49:44 +0200
Subject: [PATCH] --- yaml --- r: 147039 b: refs/heads/master c:
 77f6bf57ba9d2c50173536dbfdacdab27cb867ca h: refs/heads/master i:   147037:
 1ea4aa65da89409b92c9d3a3eec97a873c6e0d0e   147035:
 b95025fde55a87bb2f6d2a8e1d0e3e735349673e   147031:
 8be8498d28b2ad78718484daf5d055dd8ff6cc9a   147023:
 945122a1d680f44d9e96117e503d7c51219ca957   147007:
 2fe8f76b4ee537b41e98e38e138d82d36c1cb528 v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 78e51eb7f5cf..f2e19ed1e7ed 100644
--- 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
index c5e3c79b95a8..41179c0a655b 100644
--- 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)