diff options
author | Nick Piggin <npiggin@suse.de> | 2007-05-06 17:49:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:51 -0400 |
commit | 6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2 (patch) | |
tree | 8bbfe5072279227cc50a941ad4813908082426a1 /fs/ufs/util.c | |
parent | 714b8171af9c930a59a0da8f6fe50518e70ab035 (diff) |
mm: make read_cache_page synchronous
Ensure pages are uptodate after returning from read_cache_page, which allows
us to cut out most of the filesystem-internal PageUptodate calls.
I didn't have a great look down the call chains, but this appears to fixes 7
possible use-before uptodate in hfs, 2 in hfsplus, 1 in jfs, a few in
ecryptfs, 1 in jffs2, and a possible cleared data overwritten with readpage in
block2mtd. All depending on whether the filler is async and/or can return
with a !uptodate page.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ufs/util.c')
-rw-r--r-- | fs/ufs/util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 17437574f79c..84357f1ff0ec 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c | |||
@@ -251,13 +251,11 @@ struct page *ufs_get_locked_page(struct address_space *mapping, | |||
251 | 251 | ||
252 | page = find_lock_page(mapping, index); | 252 | page = find_lock_page(mapping, index); |
253 | if (!page) { | 253 | if (!page) { |
254 | page = read_cache_page(mapping, index, | 254 | page = read_mapping_page(mapping, index, NULL); |
255 | (filler_t*)mapping->a_ops->readpage, | ||
256 | NULL); | ||
257 | 255 | ||
258 | if (IS_ERR(page)) { | 256 | if (IS_ERR(page)) { |
259 | printk(KERN_ERR "ufs_change_blocknr: " | 257 | printk(KERN_ERR "ufs_change_blocknr: " |
260 | "read_cache_page error: ino %lu, index: %lu\n", | 258 | "read_mapping_page error: ino %lu, index: %lu\n", |
261 | mapping->host->i_ino, index); | 259 | mapping->host->i_ino, index); |
262 | goto out; | 260 | goto out; |
263 | } | 261 | } |