]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails
authorOleg Nesterov <oleg@tv-sign.ru>
Sun, 8 Jun 2008 17:20:43 +0000 (21:20 +0400)
committerIngo Molnar <mingo@elte.hu>
Tue, 14 Oct 2008 15:15:33 +0000 (17:15 +0200)
commit85462323555dda749f1c5373a8d72679464c968d
treeaeec1f9a2ad6665c70a88483cbe5e9a3a2f33536
parent7591103c08abade60aeddb432ed0686ddd0de1c6
do_generic_file_read: s/EINTR/EIO/ if lock_page_killable() fails

If lock_page_killable() fails because the task was killed by SIGKILL or
any other fatal signal, do_generic_file_read() returns -EIO.

This seems to be OK, because in fact the userspace won't see this error,
the task will dequeue SIGKILL and exit.

However, /sbin/init is different, it will dequeue SIGKILL, ignore it, and
return to the user-space with the bogus -EIO.

Change the code to return the error code from lock_page_killable(), -EINTR.
This doesn't fix the bug, but perhaps makes sense anyway. Imho, with this
change the code looks a bit more logical, and the "good" init should handle
the spurious EINTR or short read.

Afaics we can also change lock_page_killable() to return -ERESTARTNOINTR,
but this can't prevent the short reads.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
mm/filemap.c