Merge with Linux 2.3.99-pre7 and various other bits.

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index e90d2bb8e..7e5263fb1 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -620,11 +620,11 @@ struct buffer_head * ext2_bread (struct inode * inode, int block,
 	return NULL;
 }
 
-static int ext2_writepage(struct file *file, struct dentry *dentry, struct page *page)
+static int ext2_writepage(struct file *file, struct page *page)
 {
 	return block_write_full_page(page,ext2_get_block);
 }
-static int ext2_readpage(struct dentry *dentry, struct page *page)
+static int ext2_readpage(struct file *file, struct page *page)
 {
 	return block_read_full_page(page,ext2_get_block);
 }