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/ocfs2/symlink.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/ocfs2/symlink.c')
-rw-r--r-- | fs/ocfs2/symlink.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index 40dc1a51f4a9..7134007ba22f 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c | |||
@@ -67,16 +67,9 @@ static char *ocfs2_page_getlink(struct dentry * dentry, | |||
67 | page = read_mapping_page(mapping, 0, NULL); | 67 | page = read_mapping_page(mapping, 0, NULL); |
68 | if (IS_ERR(page)) | 68 | if (IS_ERR(page)) |
69 | goto sync_fail; | 69 | goto sync_fail; |
70 | wait_on_page_locked(page); | ||
71 | if (!PageUptodate(page)) | ||
72 | goto async_fail; | ||
73 | *ppage = page; | 70 | *ppage = page; |
74 | return kmap(page); | 71 | return kmap(page); |
75 | 72 | ||
76 | async_fail: | ||
77 | page_cache_release(page); | ||
78 | return ERR_PTR(-EIO); | ||
79 | |||
80 | sync_fail: | 73 | sync_fail: |
81 | return (char*)page; | 74 | return (char*)page; |
82 | } | 75 | } |