Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161215
b: refs/heads/master
c: 723590e
h: refs/heads/master
i:
  161213: e8855f8
  161211: 1cbb16d
  161207: 3bf6020
  161199: 91a6240
  161183: fb0c542
  161151: 3edea7a
v: v3
  • Loading branch information
Miklos Szeredi authored and Jens Axboe committed Sep 11, 2009
1 parent 9dbdbf3 commit 92ca0bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d62f843b295393124970d29316344150c7de009b
refs/heads/master: 723590ed52d244b025f10a8e2f54c2f57ed02b4d
8 changes: 6 additions & 2 deletions trunk/fs/splice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 92ca0bd

Please sign in to comment.