lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lift file_*_write out of do_splice_from()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2013-05-23 20:07:11 -04:00
parent bc77daa783
commit 500368f7fb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/splice.c
View File

@@ -1115,10 +1115,7 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
else else
splice_write = default_file_splice_write; splice_write = default_file_splice_write;
file_start_write(out); return splice_write(pipe, out, ppos, len, flags);
ret = splice_write(pipe, out, ppos, len, flags);
file_end_write(out);
return ret;
} }
/* /*
@@ -1306,9 +1303,11 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
}; };
long ret; long ret;
file_start_write(out);
ret = splice_direct_to_actor(in, &sd, direct_splice_actor); ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
if (ret > 0) if (ret > 0)
*ppos = sd.pos; *ppos = sd.pos;
file_end_write(out);
return ret; return ret;
} }
@@ -1361,7 +1360,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,
offset = out->f_pos; offset = out->f_pos;
} }
file_start_write(out);
ret = do_splice_from(ipipe, out, &offset, len, flags); ret = do_splice_from(ipipe, out, &offset, len, flags);
file_end_write(out);
if (!off_out) if (!off_out)
out->f_pos = offset; out->f_pos = offset;