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/udf | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/file.c | 3 | ||||
| -rw-r--r-- | fs/udf/inode.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 662647088..0b3dce0d1 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -60,6 +60,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page) bh = bread (inode->i_dev, block, inode->i_sb->s_blocksize); memcpy(kaddr, bh->b_data + udf_ext0_offset(inode), inode->i_size); brelse(bh); + flush_dcache_page(page); SetPageUptodate(page); kunmap(page); UnlockPage(page); @@ -100,7 +101,7 @@ static int udf_adinicb_commit_write(struct file *file, struct page *page, unsign struct buffer_head *bh; int block; - char *kaddr = (char*)page_address(page); + char *kaddr = page_address(page); block = udf_get_lb_pblock(inode->i_sb, UDF_I_LOCATION(inode), 0); bh = bread (inode->i_dev, block, inode->i_sb->s_blocksize); diff --git a/fs/udf/inode.c b/fs/udf/inode.c index bbc4e30a5..e7e6c53e8 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -188,6 +188,7 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err) PAGE_CACHE_SIZE - UDF_I_LENALLOC(inode)); memcpy((char *)kaddr, bh->b_data + udf_file_entry_alloc_offset(inode), UDF_I_LENALLOC(inode)); + flush_dcache_page(page); SetPageUptodate(page); kunmap(page); } |