diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /fs/jffs2 | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index dd64ddc11d43..ed85f9afdbc8 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
| @@ -647,7 +647,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, | |||
| 647 | struct inode *inode = OFNI_EDONI_2SFFJ(f); | 647 | struct inode *inode = OFNI_EDONI_2SFFJ(f); |
| 648 | struct page *pg; | 648 | struct page *pg; |
| 649 | 649 | ||
| 650 | pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, | 650 | pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, |
| 651 | (void *)jffs2_do_readpage_unlock, inode); | 651 | (void *)jffs2_do_readpage_unlock, inode); |
| 652 | if (IS_ERR(pg)) | 652 | if (IS_ERR(pg)) |
| 653 | return (void *)pg; | 653 | return (void *)pg; |