Re: [PATCH 29/49] vcs: add poll/fasync support

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Nicolas Pitre
Date: Tuesday, November 9, 2010 - 11:33 pm

On Wed, 10 Nov 2010, Kay Sievers wrote:


OK.  What about this then?
----- >8
Subject: [PATCH] vcs: make proper usage of the poll flags

Kay Sievers pointed out that usage of POLLIN is well defined by POSIX,
and the current usage here doesn't follow that definition.  So let's
duplicate the same semantics as implemented by sysfs_poll() instead.

Signed-off-by: Nicolas Pitre <nicolas.pitre@canonical.com>
---
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 273ab44..a93856e 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -553,12 +553,12 @@ static unsigned int
 vcs_poll(struct file *file, poll_table *wait)
 {
 	struct vcs_poll_data *poll = vcs_poll_data_get(file);
-	int ret = 0;
+	int ret = DEFAULT_POLLMASK|POLLERR|POLLPRI;
 
 	if (poll) {
 		poll_wait(file, &poll->waitq, wait);
-		if (!poll->seen_last_update)
-			ret = POLLIN | POLLRDNORM;
+		if (poll->seen_last_update)
+			ret = DEFAULT_POLLMASK; 
 	}
 	return ret;
 }
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PATCH] TTY/Serial merge for .37-rc1, Greg KH, (Fri Oct 22, 10:51 am)
[PATCH 01/49] tty: add tty_struct-&gt;dev pointer to correspo ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 02/49] serport: place serport serio device correctl ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 03/49] serial: mfd: snprintf() returns largish values, Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 04/49] serial: Add CONSOLE_POLL support for uartlite, Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 05/49] tty: Remove __GFP_NOFAIL from tty_add_file(), Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 06/49] ioctl: Use asm-generic/ioctls.h on arm (enab ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 07/49] ioctl: Use asm-generic/ioctls.h on avr32 (en ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 08/49] ioctl: Use asm-generic/ioctls.h on cris (ena ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 09/49] ioctl: Use asm-generic/ioctls.h on frv (enab ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 10/49] ioctl: Use asm-generic/ioctls.h on h8300 (en ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 11/49] ioctl: Use asm-generic/ioctls.h on ia64 (ena ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 12/49] ioctl: Use asm-generic/ioctls.h on m32r (ena ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 13/49] ioctl: Use asm-generic/ioctls.h on m68k (ena ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 14/49] ioctl: Use asm-generic/ioctls.h on mn10300 ( ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 15/49] ioctl: Use asm-generic/ioctls.h on s390 (ena ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 16/49] serial-core: skip call set_termios/console_s ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 17/49] serial-core: restore termios settings when r ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 18/49] add ttyprintk driver, Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 19/49] Char: mxser, call pci_disable_device from pr ..., Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 20/49] tty_io: check return code of tty_register_device, Greg Kroah-Hartman, (Fri Oct 22, 11:20 am)
[PATCH 21/49] serial: mrst_max3110: some code cleanup, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 22/49] serial: mrst_max3110: Make the IRQ option ru ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 23/49] serial: max3107: Fix memory leaks when retur ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 24/49] tty: Make tiocgicount a handler, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 25/49] tty: Convert the USB drivers to the new icou ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 26/49] tty: icount changeover for other main devices, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 27/49] tty: Fix warning left over from TIOCGICOUNT ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 28/49] tty: Add a new file /proc/tty/consoles, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 29/49] vcs: add poll/fasync support, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 30/49] vcs: invoke the vt update callback when /dev ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 31/49] tty: MAINTAINERS: add drivers/serial/jsm/ as ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 32/49] serial: 8250: Don't delay after transmitter ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 33/49] serial: mark the 8250 driver as maintained, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 34/49] serial: Factor out uart_poll_timeout() from ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 35/49] altera_uart: Add support for polling mode (I ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 36/49] altera_uart: Add support for getting mapbase ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 37/49] altera_uart: Add support for different addre ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 38/49] altera_uart: Make it possible to use Altera ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 39/49] altera_uart: Fixup type usage of port flags, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 40/49] altera_uart: Fix missing prototype for regis ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 41/49] altera_uart: Don't use plain integer as NULL ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 42/49] 8250: allow platforms to override PM hook., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 43/49] Alchemy: Add UART PM methods., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 44/49] jsm: Remove the uart port on errors, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 45/49] serial: mfd: add more baud rates support, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 46/49] serial/imx: check that the buffer is non-emp ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 47/49] serial: abstraction for 8250 legacy ports, Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
[PATCH 48/49] serial: bfin_sport_uart: speed up sport RX s ..., Greg Kroah-Hartman, (Fri Oct 22, 11:21 am)
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles, Christoph Hellwig, (Sat Oct 23, 4:46 am)
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles, Dr. Werner Fink, (Mon Oct 25, 12:51 am)
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles, Dr. Werner Fink, (Wed Oct 27, 2:27 am)
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles, Dr. Werner Fink, (Wed Oct 27, 4:31 am)
Re: [PATCH 29/49] vcs: add poll/fasync support, Kay Sievers, (Tue Nov 9, 5:12 pm)
Re: [PATCH 29/49] vcs: add poll/fasync support, Nicolas Pitre, (Tue Nov 9, 6:26 pm)
Re: [PATCH 29/49] vcs: add poll/fasync support, Kay Sievers, (Tue Nov 9, 6:42 pm)
Re: [PATCH 29/49] vcs: add poll/fasync support, Nicolas Pitre, (Tue Nov 9, 11:33 pm)
Re: [PATCH 29/49] vcs: add poll/fasync support, Kay Sievers, (Wed Nov 10, 2:35 am)