tree 9a74f4b8292a696620f95933171ac5ddff970ef9
parent 41aac24f8fb5a21ff3d0f6f56f85fad3cf0e88a9
author Jeff Moyer <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:05 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:05 -0700
[PATCH] filemap_getpage can block when MAP_NONBLOCK specified
We will return NULL from filemap_getpage when a page does not exist in the
page cache and MAP_NONBLOCK is specified, here:
page = find_get_page(mapping, pgoff);
if (!page) {
if (nonblock)
return NULL;
goto no_cached_page;
}
But we forget to do so when the page in the cache is not uptodate. The
following could result in a blocking call:
/*
* Ok, found a page in the page cache, now we need to check
* that it's up-to-date.
*/
if (!PageUptodate(page))
goto page_not_uptodate;
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
filemap.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
Index: mm/filemap.c
===================================================================
--- 417e6bfaf6f993543af0dfb0c721574c0690dedc/mm/filemap.c (mode:100644
sha1:439b2bea8e34211a8da7f800d66f2a4ce9d674c9)
+++ 9a74f4b8292a696620f95933171ac5ddff970ef9/mm/filemap.c (mode:100644
sha1:93595c327bbdc43fcea91b513fd750d1a73edfec)
@@ -1379,8 +1379,13 @@
* Ok, found a page in the page cache, now we need to check
* that it's up-to-date.
*/
- if (!PageUptodate(page))
+ if (!PageUptodate(page)) {
+ if (nonblock) {
+ page_cache_release(page);
+ return NULL;
+ }
goto page_not_uptodate;
+ }
success:
/*
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
