summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2010-05-26 11:49:40 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-05 11:15:56 -0700
commit139c793b0c742110966f2dbfd4a8677c3bf48a49 (patch)
treed5ae029585067f9aa65d2ac1a46c36ad97098358
parent0e4ce79e3cbb6140fd8fe338a1ebdc355833b58e (diff)
downloadkernel-crypto-139c793b0c742110966f2dbfd4a8677c3bf48a49.tar.gz
kernel-crypto-139c793b0c742110966f2dbfd4a8677c3bf48a49.tar.xz
kernel-crypto-139c793b0c742110966f2dbfd4a8677c3bf48a49.zip
do_generic_file_read: clear page errors when issuing a fresh read of the page
commit 91803b499cca2fe558abad709ce83dc896b80950 upstream. I/O errors can happen due to temporary failures, like multipath errors or losing network contact with the iSCSI server. Because of that, the VM will retry readpage on the page. However, do_generic_file_read does not clear PG_error. This causes the system to be unable to actually use the data in the page cache page, even if the subsequent readpage completes successfully! The function filemap_fault has had a ClearPageError before readpage forever. This patch simply adds the same to do_generic_file_read. Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Rik van Riel <riel@redhat.com> Acked-by: Larry Woodman <lwoodman@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/filemap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 3dce0107262..96398d397e7 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1099,6 +1099,12 @@ page_not_up_to_date_locked:
}
readpage:
+ /*
+ * A previous I/O error may have been due to temporary
+ * failures, eg. multipath errors.
+ * PG_error will be set again if readpage fails.
+ */
+ ClearPageError(page);
/* Start the actual read. The read will unlock the page. */
error = mapping->a_ops->readpage(filp, page);