The patch titled Subject: do_generic_file_read(): fail immediately if killed has been added to the -mm tree. Its filename is do_generic_file_read-fail-immediately-if-killed.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/do_generic_file_read-fail-immediately-if-killed.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/do_generic_file_read-fail-immediately-if-killed.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Subject: do_generic_file_read(): fail immediately if killed If a fatal signal has been received, fail immediately instead of trying to read more data. If wait_on_page_locked_killable() was interrupted then this page is most likely is not PageUptodate() and in this case do_generic_file_read() will fail after lock_page_killable(). See also commit ebded02788b5 ("mm: filemap: avoid unnecessary calls to lock_page when waiting for IO to complete during a read") [oleg@xxxxxxxxxx: changelog addition] Link: http://lkml.kernel.org/r/63068e8e-8bee-b208-8441-a3c39a9d9eb6@xxxxxxxxxxx Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Reviewed-by: Jan Kara <jack@xxxxxxx> Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN mm/filemap.c~do_generic_file_read-fail-immediately-if-killed mm/filemap.c --- a/mm/filemap.c~do_generic_file_read-fail-immediately-if-killed +++ a/mm/filemap.c @@ -1708,7 +1708,9 @@ find_page: * wait_on_page_locked is used to avoid unnecessarily * serialisations and why it's safe. */ - wait_on_page_locked_killable(page); + error = wait_on_page_locked_killable(page); + if (unlikely(error)) + goto readpage_error; if (PageUptodate(page)) goto page_ok; _ Patches currently in -mm which might be from bart.vanassche@xxxxxxxxxxx are do_generic_file_read-fail-immediately-if-killed.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html