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

Next file: linux/fs/ufs/util.h
Previous file: linux/fs/ufs/truncate.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/fs/ufs/util.c linux/fs/ufs/util.c
@@ -170,7 +170,7 @@
 		size = ubh->count << uspi->s_fshift;
 	bhno = 0;
 	while (size) {
-		len = min(unsigned int, size, uspi->s_fsize);
+		len = min_t(unsigned int, size, uspi->s_fsize);
 		memcpy (mem, ubh->bh[bhno]->b_data, len);
 		mem += uspi->s_fsize;
 		size -= len;
@@ -186,7 +186,7 @@
 		size = ubh->count << uspi->s_fshift;
 	bhno = 0;
 	while (size) {
-		len = min(unsigned int, size, uspi->s_fsize);
+		len = min_t(unsigned int, size, uspi->s_fsize);
 		memcpy (ubh->bh[bhno]->b_data, mem, len);
 		mem += uspi->s_fsize;
 		size -= len;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)