diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /fs/cramfs | |
parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'fs/cramfs')
-rw-r--r-- | fs/cramfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 3f51c2aa1..8b0a91426 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -328,12 +328,13 @@ static int cramfs_readpage(struct file *file, struct page * page) if (compr_len == 0) ; /* hole */ else - bytes_filled = cramfs_uncompress_block((void *) page_address(page), + bytes_filled = cramfs_uncompress_block(page_address(page), PAGE_CACHE_SIZE, cramfs_read(sb, start_offset, compr_len), compr_len); } - memset((void *) (page_address(page) + bytes_filled), 0, PAGE_CACHE_SIZE - bytes_filled); + memset(page_address(page) + bytes_filled, 0, PAGE_CACHE_SIZE - bytes_filled); + flush_dcache_page(page); SetPageUptodate(page); UnlockPage(page); return 0; |