diff -Naur -Xskipfiles slinx.orig/linux/xfs_aops.c slinx/linux/xfs_aops.c
--- slinx.orig/linux/xfs_aops.c	2003-12-08 21:18:33.000000000 -0600
+++ slinx/linux/xfs_aops.c	2003-12-11 18:27:16.000000000 -0600
@@ -910,7 +910,7 @@
 					create, 1, BMAPI_WRITE|BMAPI_DIRECT);
 }
 
-STATIC sector_t
+STATIC int
 linvfs_bmap(
 	struct address_space	*mapping,
 	sector_t		block)
@@ -1117,7 +1117,7 @@
 	int			rw,
 	struct inode		*inode,
 	struct kiobuf		*iobuf,
-	sector_t		blocknr,
+	unsigned long		blocknr,
 	int			blocksize)
 {
 	struct page		**maplist;
@@ -1225,21 +1225,6 @@
 }
 
 
-/* since the address_space_operations are not consitent with the type used
- * for block indexes we must cast the functions into what is expected..
- * thus the following 2 lines.
- * If running on a kernel with LBD support and hence bmap and direct_IO
- * correctly defined with sector_t params. use the second set of typedefs
- * or casts from the address space_operations
- * RMC
- */
-
-#ifndef  HAVE_SECTOR_T
-typedef int (bmap_proc)(struct address_space *, long);
-typedef int (direct_IO_proc)(int, struct inode *, struct kiobuf *,
-			     unsigned long, int);
-#endif
-
 struct address_space_operations linvfs_aops = {
 	.readpage		= linvfs_readpage,
 	.writepage		= linvfs_writepage,
@@ -1247,11 +1232,6 @@
 	.releasepage		= linvfs_release_page,
 	.prepare_write		= linvfs_prepare_write,
 	.commit_write		= generic_commit_write,
-#ifndef HAVE_SECTOR_T
-	.bmap			= (bmap_proc *)linvfs_bmap,
-	.direct_IO		= (direct_IO_proc *)linvfs_direct_IO,
-#else
 	.bmap			= linvfs_bmap,
 	.direct_IO		= linvfs_direct_IO,
-#endif
 };