Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50cd2c57 authored by Al Viro's avatar Al Viro
Browse files

lift file_*_write out of do_splice_direct() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 500368f7

fs/read_write.c

+2 −0
Original line number Diff line number Diff line
@@ -1129,7 +1129,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, 
	if (in.file->f_flags & O_NONBLOCK)

		fl = SPLICE_F_NONBLOCK;

#endif

	file_start_write(out.file);

	retval = do_splice_direct(in.file, &pos, out.file, &out_pos, count, fl);

	file_end_write(out.file);



	if (retval > 0) {

		add_rchar(current, retval);

fs/splice.c

+0 −2
Original line number Diff line number Diff line
@@ -1303,11 +1303,9 @@ 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;

}