diff -u linux/fs/xfs/linux/xfs_iops.c-o linux/fs/xfs/linux/xfs_iops.c
--- linux/fs/xfs/linux/xfs_iops.c-o	2003-06-10 14:27:56.000000000 +0200
+++ linux/fs/xfs/linux/xfs_iops.c	2003-06-10 15:14:47.000000000 +0200
@@ -585,7 +585,7 @@
 linvfs_setxattr(
 	struct dentry	*dentry,
 	const char	*name,
-	void		*data,
+	const void	*data,
 	size_t		size,
 	int		flags)
 {
diff -u linux/fs/xfs/linux/xfs_aops.c-o linux/fs/xfs/linux/xfs_aops.c
--- linux/fs/xfs/linux/xfs_aops.c-o	2003-06-10 14:27:56.000000000 +0200
+++ linux/fs/xfs/linux/xfs_aops.c	2003-06-10 15:28:52.000000000 +0200
@@ -1097,7 +1097,7 @@
 	int			rw,
 	struct file		*file,
 	struct kiobuf		*iobuf,
-	sector_t		blocknr,
+	unsigned long		blocknr,
 	int			blocksize)
 {
 	struct inode		*inode = file->f_dentry->d_inode;
@@ -1230,7 +1230,7 @@
 	.commit_write		= generic_commit_write,
 #ifndef HAVE_SECTOR_T
 	.bmap			= (bmap_proc *)linvfs_bmap,
-	.direct_IO		= (direct_IO_proc *)linvfs_direct_IO,
+	.direct_IO		= linvfs_direct_IO,
 #else
 	.bmap			= linvfs_bmap,
 	.direct_IO		= linvfs_direct_IO,
diff -u linux/fs/xfs/pagebuf/page_buf.c-o linux/fs/xfs/pagebuf/page_buf.c
--- linux/fs/xfs/pagebuf/page_buf.c-o	2003-06-10 14:27:56.000000000 +0200
+++ linux/fs/xfs/pagebuf/page_buf.c	2003-06-10 15:08:53.000000000 +0200
@@ -575,8 +575,7 @@
 		} else if (flags & PBF_MAPPED) {
 			if (as_list_len > 64)
 				purge_addresses();
-			pb->pb_addr = vmap(pb->pb_pages, page_count,
-					VM_ALLOC, PAGE_KERNEL);
+			pb->pb_addr = vmap(pb->pb_pages, page_count);
 			if (pb->pb_addr == NULL)
 				return -ENOMEM;
 			pb->pb_addr += pb->pb_offset;