hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tty: fix up hung_up_tty_read() conversion 

In commit "tty: implement read_iter", I left the read_iter conversion of
the hung up tty case alone, because I incorrectly thought it didn't
matter.

Jiri showed me the errors of my ways, and pointed out the problems with
that incomplete conversion.  Fix it all up.

Reported-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/CAHk-=wh+-rGsa=xruEWdg_fJViFG8rN9bpLrfLz=_yBYh2tBhA@mail.gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Linus Torvalds 2021-01-21 10:08:15 -08:00 committed by Greg Kroah-Hartman
parent c7135bbe5a
commit ddc5fda745
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/tty/tty_io.c
View File

@ -431,8 +431,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line)
EXPORT_SYMBOL_GPL(tty_find_polling_driver); EXPORT_SYMBOL_GPL(tty_find_polling_driver);
#endif #endif
static ssize_t hung_up_tty_read(struct file *file, char __user *buf, static ssize_t hung_up_tty_read(struct kiocb *iocb, struct iov_iter *to)
size_t count, loff_t *ppos)
{ {
return 0; return 0;
} }
@ -504,7 +503,7 @@ static const struct file_operations console_fops = {
static const struct file_operations hung_up_tty_fops = { static const struct file_operations hung_up_tty_fops = {
.llseek = no_llseek, .llseek = no_llseek,
.read = hung_up_tty_read, .read_iter = hung_up_tty_read,
.write_iter = hung_up_tty_write, .write_iter = hung_up_tty_write,
.poll = hung_up_tty_poll, .poll = hung_up_tty_poll,
.unlocked_ioctl = hung_up_tty_ioctl, .unlocked_ioctl = hung_up_tty_ioctl,
@ -940,8 +939,10 @@ static ssize_t tty_read(struct kiocb *iocb, struct iov_iter *to)
/* We want to wait for the line discipline to sort out in this /* We want to wait for the line discipline to sort out in this
situation */ situation */
ld = tty_ldisc_ref_wait(tty); ld = tty_ldisc_ref_wait(tty);
if (!ld)
return hung_up_tty_read(iocb, to);
i = -EIO; i = -EIO;
if (ld && ld->ops->read) if (ld->ops->read)
i = iterate_tty_read(ld, tty, file, to); i = iterate_tty_read(ld, tty, file, to);
tty_ldisc_deref(ld); tty_ldisc_deref(ld);