projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[linux-2.6]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index
2dead9a
..
1e6a7d3
100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-1461,6
+1461,11
@@
page_not_uptodate:
*/
ClearPageError(page);
error = mapping->a_ops->readpage(file, page);
+ if (!error) {
+ wait_on_page_locked(page);
+ if (!PageUptodate(page))
+ error = -EIO;
+ }
page_cache_release(page);
if (!error || error == AOP_TRUNCATED_PAGE)