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/nfs | |
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/nfs')
-rw-r--r-- | fs/nfs/dir.c | 5 | ||||
-rw-r--r-- | fs/nfs/symlink.c | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index e59fd31c9a22..625d8e5fb39d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -334,8 +334,6 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc) | |||
334 | status = PTR_ERR(page); | 334 | status = PTR_ERR(page); |
335 | goto out; | 335 | goto out; |
336 | } | 336 | } |
337 | if (!PageUptodate(page)) | ||
338 | goto read_error; | ||
339 | 337 | ||
340 | /* NOTE: Someone else may have changed the READDIRPLUS flag */ | 338 | /* NOTE: Someone else may have changed the READDIRPLUS flag */ |
341 | desc->page = page; | 339 | desc->page = page; |
@@ -349,9 +347,6 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc) | |||
349 | out: | 347 | out: |
350 | dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, status); | 348 | dfprintk(DIRCACHE, "NFS: %s: returns %d\n", __FUNCTION__, status); |
351 | return status; | 349 | return status; |
352 | read_error: | ||
353 | page_cache_release(page); | ||
354 | return -EIO; | ||
355 | } | 350 | } |
356 | 351 | ||
357 | /* | 352 | /* |
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index f4a0548b9ce8..bc2821331c29 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c | |||
@@ -61,15 +61,9 @@ static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
61 | err = page; | 61 | err = page; |
62 | goto read_failed; | 62 | goto read_failed; |
63 | } | 63 | } |
64 | if (!PageUptodate(page)) { | ||
65 | err = ERR_PTR(-EIO); | ||
66 | goto getlink_read_error; | ||
67 | } | ||
68 | nd_set_link(nd, kmap(page)); | 64 | nd_set_link(nd, kmap(page)); |
69 | return page; | 65 | return page; |
70 | 66 | ||
71 | getlink_read_error: | ||
72 | page_cache_release(page); | ||
73 | read_failed: | 67 | read_failed: |
74 | nd_set_link(nd, err); | 68 | nd_set_link(nd, err); |
75 | return NULL; | 69 | return NULL; |