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);