patch-2.4.9 linux/fs/ncpfs/mmap.c

• Lines: 21
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/fs/ncpfs/mmap.c
• Orig date: Fri Mar 2 15:15:12 2001

diff -u --recursive --new-file v2.4.8/linux/fs/ncpfs/mmap.c linux/fs/ncpfs/mmap.c
@@ -22,11 +22,6 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-static inline int min(int a, int b)
-{
-	return a < b ? a : b;
-}
-
 /*
  * Fill in the supplied page for mmap
  */
@@ -66,7 +61,7 @@
 
 			to_read = bufsize - (pos % bufsize);
 
-			to_read = min(to_read, count - already_read);
+			to_read = min(unsigned int, to_read, count - already_read);
 
 			if (ncp_read_kernel(NCP_SERVER(inode),
 				     NCP_FINFO(inode)->file_handle,