The patch titled
Fix a bad bug in read_cache_page_async() [try #2]
has been added to the -mm tree. Its filename is
fix-a-bad-bug-in-read_cache_page_async.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix a bad bug in read_cache_page_async() [try #2]
From: David Howells <dhowells@xxxxxxxxxx>
Fix a bad bug in read_cache_page_async() introduced in commit:
6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2
This adds:
mark_page_accessed(page)
into the error handling path in read_cache_page_async(). In such a case,
'page' holds the error code.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/filemap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN mm/filemap.c~fix-a-bad-bug-in-read_cache_page_async mm/filemap.c
--- a/mm/filemap.c~fix-a-bad-bug-in-read_cache_page_async
+++ a/mm/filemap.c
@@ -1599,7 +1599,7 @@ struct page *read_cache_page_async(struc
retry:
page = __read_cache_page(mapping, index, filler, data);
if (IS_ERR(page))
- goto out;
+ return page;
mark_page_accessed(page);
if (PageUptodate(page))
goto out;
@@ -1617,9 +1617,9 @@ retry:
err = filler(data, page);
if (err < 0) {
page_cache_release(page);
- page = ERR_PTR(err);
+ return ERR_PTR(err);
}
- out:
+out:
mark_page_accessed(page);
return page;
}
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
origin.patch
frv-replace-pgd-management-via-slabs-through-quicklists.patch
afs-export-a-couple-of-core-functions-for-afs-write.patch
afs-afs-fixups.patch
afs-implement-basic-file-write-support.patch
aio-use-flush_work.patch
kblockd-use-flush_work.patch
tg3-use-flush_keventd_work.patch
e1000-use-flush_keventd_work.patch
libata-use-flush_work.patch
phy-use-flush_work.patch
workqueue-kill-noautorel-works.patch
introduce-freezer-flags-rev-2.patch
make-cancel_rearming_delayed_work-reliable.patch
rename-thread_info-to-stack.patch
fix-a-bad-bug-in-read_cache_page_async.patch
nommu-present-backing-device-capabilities-for-mtd.patch
nommu-add-support-for-direct-mapping-through-mtdconcat.patch
nommu-generalise-the-handling-of-mtd-specific-superblocks.patch
nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch
romfs-printk-format-warnings.patch
frv-gdb-use-__maybe_unused.patch
mutex-subsystem-synchro-test-module.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
