do_poll: return -EINTR when signalled
PATCH 2/2 do_poll: return -EINTR when signalled
do_poll() checks signal_pending() but returns 0 when interrupted. This means the caller has to check signal_pending() again.
Change it to return -EINTR when signal_pending() and count == 0.
Signed-off-by Oleg Nesterov <[email protected]>
fs/select.c renamed from fs/select.c~2_move +7 -7
@@ -588,7 +588,7 @@ static int do_poll(unsigned int nfds, s/* Optimise the no-wait case */ if (!(*timeout)) pt =NULL ; - +for (;;) {struct poll_list *walk;long __timeout;
@@ -618,10 +618,12 @@ static int do_poll(unsigned int nfds, s* a poll_table to them on the next loop iteration. */ pt =NULL ; -if (count || !*timeout ||signal_pending (current)) -break ; - count = wait->error; -if (count) +if (!count) { + count = wait->error; +if (signal_pending (current)) + count = -EINTR ; + } +if (count || !*timeout)break ;if (*timeout <0 ) {
@@ -691,8 +693,6 @@ int do_sys_poll(struct pollfd __user *ufpoll_initwait (&table); fdcount =do_poll (nfds, head, &table, timeout); -if (!fdcount &&signal_pending (current)) - fdcount = -EINTR ;poll_freewait (&table);for (walk = head; walk; walk = walk->next) {