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/minix | |
parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'fs/minix')
-rw-r--r-- | fs/minix/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 4c9fa16a3..a581e328a 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -1014,7 +1014,7 @@ static int minix_readpage(struct dentry *dentry, struct page *page) { return block_read_full_page(page,minix_get_block); } -static int minix_prepare_write(struct page *page, unsigned from, unsigned to) +static int minix_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { return block_prepare_write(page,from,to,minix_get_block); } |