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/jffs/inode-v23.c | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'fs/jffs/inode-v23.c')
| -rw-r--r-- | fs/jffs/inode-v23.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index b1973918d..06ac42709 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c @@ -623,7 +623,7 @@ jffs_lookup_end: static int jffs_readpage(struct file *file, struct page *page) { - unsigned long buf; + void *buf; unsigned long read_len; int result = -EIO; struct inode *inode = (struct inode*)page->mapping->host; @@ -643,10 +643,10 @@ jffs_readpage(struct file *file, struct page *page) offset = page->index << PAGE_CACHE_SHIFT; if (offset < inode->i_size) { read_len = jffs_min(inode->i_size - offset, PAGE_SIZE); - r = jffs_read_data(f, (char *)buf, offset, read_len); + r = jffs_read_data(f, buf, offset, read_len); if (r == read_len) { if (read_len < PAGE_SIZE) { - memset((void *)(buf + read_len), 0, + memset(buf + read_len, 0, PAGE_SIZE - read_len); } SetPageUptodate(page); @@ -659,9 +659,10 @@ jffs_readpage(struct file *file, struct page *page) }); } if (result) { - memset((void *)buf, 0, PAGE_SIZE); + memset(buf, 0, PAGE_SIZE); SetPageError(page); } + flush_dcache_page(page); UnlockPage(page); |