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/reiserfs/xattr.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/reiserfs/xattr.c')
-rw-r--r-- | fs/reiserfs/xattr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 2cac56210e2b..bf6e58214538 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
@@ -410,11 +410,7 @@ static struct page *reiserfs_get_page(struct inode *dir, unsigned long n) | |||
410 | mapping_set_gfp_mask(mapping, GFP_NOFS); | 410 | mapping_set_gfp_mask(mapping, GFP_NOFS); |
411 | page = read_mapping_page(mapping, n, NULL); | 411 | page = read_mapping_page(mapping, n, NULL); |
412 | if (!IS_ERR(page)) { | 412 | if (!IS_ERR(page)) { |
413 | wait_on_page_locked(page); | ||
414 | kmap(page); | 413 | kmap(page); |
415 | if (!PageUptodate(page)) | ||
416 | goto fail; | ||
417 | |||
418 | if (PageError(page)) | 414 | if (PageError(page)) |
419 | goto fail; | 415 | goto fail; |
420 | } | 416 | } |