diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /fs/qnx4 | |
parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'fs/qnx4')
-rw-r--r-- | fs/qnx4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 9e78119c9..c6511354b 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -418,7 +418,7 @@ static int qnx4_readpage(struct dentry *dentry, struct page *page) { return block_read_full_page(page,qnx4_get_block); } -static int qnx4_prepare_write(struct page *page, unsigned from, unsigned to) +static int qnx4_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { return cont_prepare_write(page,from,to,qnx4_get_block, &((struct inode*)page->mapping->host)->u.qnx4_i.mmu_private); |