Skip to content

Commit

Permalink
lift file_*_write out of do_splice_from()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jun 29, 2013
1 parent bc77daa commit 500368f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/splice.c
Original file line number Diff line number Diff line change
Expand Up @@ -1115,10 +1115,7 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
else
splice_write = default_file_splice_write;

file_start_write(out);
ret = splice_write(pipe, out, ppos, len, flags);
file_end_write(out);
return ret;
return splice_write(pipe, out, ppos, len, flags);
}

/*
Expand Down Expand Up @@ -1306,9 +1303,11 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
};
long ret;

file_start_write(out);
ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
if (ret > 0)
*ppos = sd.pos;
file_end_write(out);

return ret;
}
Expand Down Expand Up @@ -1361,7 +1360,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,
offset = out->f_pos;
}

file_start_write(out);
ret = do_splice_from(ipipe, out, &offset, len, flags);
file_end_write(out);

if (!off_out)
out->f_pos = offset;
Expand Down

0 comments on commit 500368f

Please sign in to comment.