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

Commit 75065ff6 authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "relay: fix splice problem" 

This reverts commit c3270e57.
parent ffee0259

fs/splice.c

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, 


	ret = splice_direct_to_actor(in, &sd, direct_splice_actor);

	if (ret > 0)

		*ppos = sd.pos;

		*ppos += ret;



	return ret;

}

kernel/relay.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in, 
	ret = 0;

	spliced = 0;



	while (len && !spliced) {

	while (len) {

		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);

		if (ret < 0)

			break;