Merge with Linux 2.3.99-pre7 and various other bits.

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 69f398d29..7801add9a 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -540,11 +540,11 @@ struct buffer_head * ufs_bread (struct inode * inode, unsigned fragment,
 	return NULL;
 }
 
-static int ufs_writepage(struct file *file, struct dentry *dentry, struct page *page)
+static int ufs_writepage(struct file *file, struct page *page)
 {
 	return block_write_full_page(page,ufs_getfrag_block);
 }
-static int ufs_readpage(struct dentry *dentry, struct page *page)
+static int ufs_readpage(struct file *file, struct page *page)
 {
 	return block_read_full_page(page,ufs_getfrag_block);
 }