summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2009-08-15 08:43:22 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-09-11 14:34:33 +0200
commit723590ed52d244b025f10a8e2f54c2f57ed02b4d (patch)
treeeaf52e605a462beb9a167837a6cc31024eb42a40 /fs
parentd62f843b295393124970d29316344150c7de009b (diff)
downloadlinux-3.10-723590ed52d244b025f10a8e2f54c2f57ed02b4d.tar.gz
linux-3.10-723590ed52d244b025f10a8e2f54c2f57ed02b4d.tar.bz2
linux-3.10-723590ed52d244b025f10a8e2f54c2f57ed02b4d.zip
splice: update mtime and atime on files
Splice should update the modification and access times on regular files just like read and write. Not updating mtime will confuse backup tools, etc... This patch only adds the time updates for regular files. For pipes and other special files that splice touches the need for updating the times is less clear. Let's discuss and fix that separately. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 73766d24f97..aec4014291b 100644
--- a/fs/splice.c
+++ b/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);