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/afs | |
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/afs')
-rw-r--r-- | fs/afs/dir.c | 3 | ||||
-rw-r--r-- | fs/afs/mntpt.c | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index dac5b990c0cd..0c1e902f17a3 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c | |||
@@ -194,10 +194,7 @@ static struct page *afs_dir_get_page(struct inode *dir, unsigned long index, | |||
194 | 194 | ||
195 | page = read_mapping_page(dir->i_mapping, index, &file); | 195 | page = read_mapping_page(dir->i_mapping, index, &file); |
196 | if (!IS_ERR(page)) { | 196 | if (!IS_ERR(page)) { |
197 | wait_on_page_locked(page); | ||
198 | kmap(page); | 197 | kmap(page); |
199 | if (!PageUptodate(page)) | ||
200 | goto fail; | ||
201 | if (!PageChecked(page)) | 198 | if (!PageChecked(page)) |
202 | afs_dir_check_page(dir, page); | 199 | afs_dir_check_page(dir, page); |
203 | if (PageError(page)) | 200 | if (PageError(page)) |
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index b905ae37f912..034fcfd4e330 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c | |||
@@ -68,13 +68,11 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key) | |||
68 | } | 68 | } |
69 | 69 | ||
70 | ret = -EIO; | 70 | ret = -EIO; |
71 | wait_on_page_locked(page); | ||
72 | buf = kmap(page); | ||
73 | if (!PageUptodate(page)) | ||
74 | goto out_free; | ||
75 | if (PageError(page)) | 71 | if (PageError(page)) |
76 | goto out_free; | 72 | goto out_free; |
77 | 73 | ||
74 | buf = kmap(page); | ||
75 | |||
78 | /* examine the symlink's contents */ | 76 | /* examine the symlink's contents */ |
79 | size = vnode->status.size; | 77 | size = vnode->status.size; |
80 | _debug("symlink to %*.*s", (int) size, (int) size, buf); | 78 | _debug("symlink to %*.*s", (int) size, (int) size, buf); |
@@ -91,8 +89,8 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode, struct key *key) | |||
91 | 89 | ||
92 | ret = 0; | 90 | ret = 0; |
93 | 91 | ||
94 | out_free: | ||
95 | kunmap(page); | 92 | kunmap(page); |
93 | out_free: | ||
96 | page_cache_release(page); | 94 | page_cache_release(page); |
97 | out: | 95 | out: |
98 | _leave(" = %d", ret); | 96 | _leave(" = %d", ret); |
@@ -171,8 +169,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) | |||
171 | } | 169 | } |
172 | 170 | ||
173 | ret = -EIO; | 171 | ret = -EIO; |
174 | wait_on_page_locked(page); | 172 | if (PageError(page)) |
175 | if (!PageUptodate(page) || PageError(page)) | ||
176 | goto error; | 173 | goto error; |
177 | 174 | ||
178 | buf = kmap(page); | 175 | buf = kmap(page); |