From 92ca0bd50b7f151301eb308c1c61beb0f88ce01f Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Sat, 15 Aug 2009 08:43:22 +0200
Subject: [PATCH] --- yaml --- r: 161215 b: refs/heads/master c:
 723590ed52d244b025f10a8e2f54c2f57ed02b4d h: refs/heads/master i:   161213:
 e8855f84247f2d27e43c67fdbcca953b7d6a7a43   161211:
 1cbb16d9cdc5eaefb1229121f586b2b8bd696b75   161207:
 3bf6020293bb4246647e1c6344684b126a10060e   161199:
 91a6240e684af939cf15fd10c901a112acf3e29c   161183:
 fb0c542bdd13b344e2e20803dccc7d2ec77d61de   161151:
 3edea7a2d2664f482e465d333c4d309f693a3b5c v: v3

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

diff --git a/[refs] b/[refs]
index 5812018dbbae..91c0881b7c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d62f843b295393124970d29316344150c7de009b
+refs/heads/master: 723590ed52d244b025f10a8e2f54c2f57ed02b4d
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index 73766d24f97b..aec4014291be 100644
--- a/trunk/fs/splice.c
+++ b/trunk/fs/splice.c
@@ -502,8 +502,10 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
 		len = left;
 
 	ret = __generic_file_splice_read(in, ppos, pipe, len, flags);
-	if (ret > 0)
+	if (ret > 0) {
 		*ppos += ret;
+		file_accessed(in);
+	}
 
 	return ret;
 }
@@ -963,8 +965,10 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
 
 		mutex_lock_nested(&inode->i_mutex, I_MUTEX_CHILD);
 		ret = file_remove_suid(out);
-		if (!ret)
+		if (!ret) {
+			file_update_time(out);
 			ret = splice_from_pipe_feed(pipe, &sd, pipe_to_file);
+		}
 		mutex_unlock(&inode->i_mutex);
 	} while (ret > 0);
 	splice_from_pipe_end(pipe, &sd);