Merge with Linux 2.3.99-pre7 and various other bits.

3 files changed, 9 insertions, 9 deletions

diff --git a/fs/udf/file.c b/fs/udf/file.c
index ebb6fda24..94597406d 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -42,7 +42,7 @@
 #include "udf_i.h"
 #include "udf_sb.h"
 
-static int udf_adinicb_readpage(struct dentry *dentry, struct page * page)
+static int udf_adinicb_readpage(struct file *file, struct page * page)
 {
 	struct inode *inode = (struct inode *)page->mapping->host;
 
@@ -65,7 +65,7 @@ static int udf_adinicb_readpage(struct dentry *dentry, struct page * page)
 	return 0;
 }
 
-static int udf_adinicb_writepage(struct file *file, struct dentry *dentry, struct page *page)
+static int udf_adinicb_writepage(struct file *file, struct page *page)
 {
 	struct inode *inode = (struct inode *)page->mapping->host;
 
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 3b8f6a4d4..8c38883c0 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -125,12 +125,12 @@ void udf_discard_prealloc(struct inode * inode)
 		udf_trunc(inode);
 }
 
-static int udf_writepage(struct file *file, struct dentry *dentry, struct page *page)
+static int udf_writepage(struct file *file, struct page *page)
 {
 	return block_write_full_page(page, udf_get_block);
 }
 
-static int udf_readpage(struct dentry *dentry, struct page *page)
+static int udf_readpage(struct file *file, struct page *page)
 {
 	return block_read_full_page(page, udf_get_block);
 }
@@ -202,7 +202,7 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err)
 	mark_buffer_dirty(bh, 1);
 	udf_release_data(bh);
 
-	inode->i_data.a_ops->writepage(NULL, NULL, page);
+	inode->i_data.a_ops->writepage(NULL, page);
 	UnlockPage(page);
 	page_cache_release(page);
 
@@ -397,7 +397,7 @@ static struct buffer_head * inode_getblk(struct inode * inode, long block,
 	int c = 1;
 	int lbcount = 0, b_off = 0, offset = 0;
 	Uint32 newblocknum, newblock;
-	char etype;
+	int etype;
 	int goal = 0, pgoal = UDF_I_LOCATION(inode).logicalBlockNum;
 	char lastblock = 0;
 
@@ -1885,7 +1885,7 @@ int udf_delete_aext(struct inode *inode, lb_addr nbloc, int nextoffset,
 	struct buffer_head *obh;
 	lb_addr obloc;
 	int oextoffset, adsize;
-	char type;
+	int type;
 	struct AllocExtDesc *aed;
 
 	if (!(nbh))
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index 86c83695d..cb575cbf9 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -76,9 +76,9 @@ static void udf_pc_to_char(char *from, int fromlen, char *to)
 		p[0] = '\0';
 }
 
-static int udf_symlink_filler(struct dentry * dentry, struct page *page)
+static int udf_symlink_filler(struct file *file, struct page *page)
 {
-	struct inode *inode = dentry->d_inode;
+	struct inode *inode = (struct inode*)page->mapping->host;
 	struct buffer_head *bh = NULL;
 	char *symlink;
 	int err = -EIO;