projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
03d95eb
)
lift sb_start_write into default_file_splice_write()
author
Al Viro
<viro@zeniv.linux.org.uk>
Wed, 20 Mar 2013 17:19:30 +0000
(13:19 -0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Tue, 9 Apr 2013 18:12:57 +0000
(14:12 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/splice.c
patch
|
blob
|
history
diff --git
a/fs/splice.c
b/fs/splice.c
index
e78a749
..
17d7323
100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-1052,9
+1052,7
@@
static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
loff_t tmp = sd->pos;
data = buf->ops->map(pipe, buf, 0);
- file_start_write(sd->u.file);
ret = __kernel_write(sd->u.file, data + buf->offset, sd->len, &tmp);
- file_end_write(sd->u.file);
buf->ops->unmap(pipe, buf, data);
return ret;
@@
-1066,7
+1064,9
@@
static ssize_t default_file_splice_write(struct pipe_inode_info *pipe,
{
ssize_t ret;
+ file_start_write(out);
ret = splice_from_pipe(pipe, out, ppos, len, flags, write_pipe_buf);
+ file_end_write(out);
if (ret > 0)
*ppos += ret;