From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 21 Jan 2021 08:40:55 +0000 (+0100)
Subject: Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds... 
X-Git-Tag: v5.12-rc1~177^2~10
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=3cfade53c77315d018c50ea1ee3420cef1c50fe7

Merge branch 'tty-splice' of git://git./linux/kernel/git/torvalds/linux into tty-next

Fixes both the "splice/sendfile to a tty" and "splice/sendfile from a
tty" regression from 5.10.

* 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
  tty: teach the n_tty ICANON case about the new "cookie continuations" too
  tty: teach n_tty line discipline about the new "cookie continuations"
  tty: clean up legacy leftovers from n_tty line discipline
  tty: implement read_iter
  tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
  tty: implement write_iter
---

3cfade53c77315d018c50ea1ee3420cef1c50fe7
diff --cc drivers/tty/tty_io.c
index f19a34a93fe5,8846d3b99845..c7763743a3d6
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@@ -1080,10 -1126,10 +1142,10 @@@ ssize_t redirected_tty_write(struct kio
  		fput(p);
  		return res;
  	}
- 	return tty_write(file, buf, count, ppos);
+ 	return tty_write(iocb, iter);
  }
  
 -/**
 +/*
   *	tty_send_xchar	-	send priority character
   *
   *	Send a high priority character to the tty even if stopped