patch-2.4.9 linux/fs/ufs/util.c

• Lines: 30
• Date: Wed Aug 15 01:22:17 2001
• Orig file: v2.4.8/linux/fs/ufs/util.c
• Orig date: Fri Feb 9 11:29:44 2001

diff -u --recursive --new-file v2.4.8/linux/fs/ufs/util.c linux/fs/ufs/util.c
@@ -166,11 +166,11 @@
 	unsigned char * mem, struct ufs_buffer_head * ubh, unsigned size)
 {
 	unsigned len, bhno;
-	if ( size > (ubh->count << uspi->s_fshift) )
+	if (size > (ubh->count << uspi->s_fshift))
 		size = ubh->count << uspi->s_fshift;
 	bhno = 0;
-	while ( size ) {
-		len = min (size, uspi->s_fsize);
+	while (size) {
+		len = min(unsigned int, size, uspi->s_fsize);
 		memcpy (mem, ubh->bh[bhno]->b_data, len);
 		mem += uspi->s_fsize;
 		size -= len;
@@ -182,11 +182,11 @@
 	struct ufs_buffer_head * ubh, unsigned char * mem, unsigned size)
 {
 	unsigned len, bhno;
-	if ( size > (ubh->count << uspi->s_fshift) )
+	if (size > (ubh->count << uspi->s_fshift))
 		size = ubh->count << uspi->s_fshift;
 	bhno = 0;
-	while ( size ) {
-		len = min (size, uspi->s_fsize);
+	while (size) {
+		len = min(unsigned int, size, uspi->s_fsize);
 		memcpy (ubh->bh[bhno]->b_data, mem, len);
 		mem += uspi->s_fsize;
 		size -= len;