diff options
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | fs/jffs2/fs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index a69e426435dd..f73991522672 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -242,7 +242,7 @@ void jffs2_evict_inode (struct inode *inode) | |||
242 | 242 | ||
243 | jffs2_dbg(1, "%s(): ino #%lu mode %o\n", | 243 | jffs2_dbg(1, "%s(): ino #%lu mode %o\n", |
244 | __func__, inode->i_ino, inode->i_mode); | 244 | __func__, inode->i_ino, inode->i_mode); |
245 | truncate_inode_pages(&inode->i_data, 0); | 245 | truncate_inode_pages_final(&inode->i_data); |
246 | clear_inode(inode); | 246 | clear_inode(inode); |
247 | jffs2_do_clear_inode(c, f); | 247 | jffs2_do_clear_inode(c, f); |
248 | } | 248 | } |
@@ -687,7 +687,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, | |||
687 | struct inode *inode = OFNI_EDONI_2SFFJ(f); | 687 | struct inode *inode = OFNI_EDONI_2SFFJ(f); |
688 | struct page *pg; | 688 | struct page *pg; |
689 | 689 | ||
690 | pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, | 690 | pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT, |
691 | (void *)jffs2_do_readpage_unlock, inode); | 691 | (void *)jffs2_do_readpage_unlock, inode); |
692 | if (IS_ERR(pg)) | 692 | if (IS_ERR(pg)) |
693 | return (void *)pg; | 693 | return (void *)pg; |