diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-09-11 19:52:54 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-09-14 11:12:36 -0400 |
| commit | a913bc76ed7bdc0b31255268afcb7feffdc8600b (patch) | |
| tree | bb009cff66a70f97da59d02d0a78cb82a808502e /drivers | |
| parent | e21120383f2dce32312f63ffca145ff8a87d41f5 (diff) | |
| download | linux-stable-a913bc76ed7bdc0b31255268afcb7feffdc8600b.tar.gz linux-stable-a913bc76ed7bdc0b31255268afcb7feffdc8600b.tar.bz2 linux-stable-a913bc76ed7bdc0b31255268afcb7feffdc8600b.zip | |
tty_ioctl(): drop FIONBIO handling
That code had been live for 11 weeks back in 1992, but it had been 26 years
since sys_ioctl() began handling FIONBIO on its own. Time to to bury the body,
already...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/tty_io.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 7bfc8afc130a..ef2a8766d34f 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2289,34 +2289,6 @@ static int tioccons(struct file *file) } /** - * fionbio - non blocking ioctl - * @file: file to set blocking value - * @p: user parameter - * - * Historical tty interfaces had a blocking control ioctl before - * the generic functionality existed. This piece of history is preserved - * in the expected tty API of posix OS's. - * - * Locking: none, the open file handle ensures it won't go away. - */ - -static int fionbio(struct file *file, int __user *p) -{ - int nonblock; - - if (get_user(nonblock, p)) - return -EFAULT; - - spin_lock(&file->f_lock); - if (nonblock) - file->f_flags |= O_NONBLOCK; - else - file->f_flags &= ~O_NONBLOCK; - spin_unlock(&file->f_lock); - return 0; -} - -/** * tiocsetd - set line discipline * @tty: tty device * @p: pointer to user data @@ -2562,8 +2534,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return tiocswinsz(real_tty, p); case TIOCCONS: return real_tty != tty ? -EINVAL : tioccons(file); - case FIONBIO: - return fionbio(file, p); case TIOCEXCL: set_bit(TTY_EXCLUSIVE, &tty->flags); return 0; |