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/dir.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/dir.c')
-rw-r--r-- | fs/ufs/dir.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 4890ddf1518e..4fb8b2e077ee 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c | |||
@@ -180,13 +180,9 @@ fail: | |||
180 | static struct page *ufs_get_page(struct inode *dir, unsigned long n) | 180 | static struct page *ufs_get_page(struct inode *dir, unsigned long n) |
181 | { | 181 | { |
182 | struct address_space *mapping = dir->i_mapping; | 182 | struct address_space *mapping = dir->i_mapping; |
183 | struct page *page = read_cache_page(mapping, n, | 183 | struct page *page = read_mapping_page(mapping, n, NULL); |
184 | (filler_t*)mapping->a_ops->readpage, NULL); | ||
185 | if (!IS_ERR(page)) { | 184 | if (!IS_ERR(page)) { |
186 | wait_on_page_locked(page); | ||
187 | kmap(page); | 185 | kmap(page); |
188 | if (!PageUptodate(page)) | ||
189 | goto fail; | ||
190 | if (!PageChecked(page)) | 186 | if (!PageChecked(page)) |
191 | ufs_check_page(page); | 187 | ufs_check_page(page); |
192 | if (PageError(page)) | 188 | if (PageError(page)) |