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

Next file: linux/fs/umsdos/README-WIP.txt
Previous file: linux/fs/ufs/util.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/fs/ufs/util.h linux/fs/ufs/util.h
@@ -331,7 +331,7 @@
 	base = offset >> uspi->s_bpfshift;
 	offset &= uspi->s_bpfmask;
 	for (;;) {
-		count = min(unsigned int, size + offset, uspi->s_bpf);
+		count = min_t(unsigned int, size + offset, uspi->s_bpf);
 		size -= count - offset;
 		pos = ext2_find_next_zero_bit (ubh->bh[base]->b_data, count, offset);
 		if (pos < count || !size)
@@ -378,7 +378,7 @@
 	base = start >> uspi->s_bpfshift;
 	start &= uspi->s_bpfmask;
 	for (;;) {
-		count = min(unsigned int,
+		count = min_t(unsigned int,
 			    size + (uspi->s_bpf - start), uspi->s_bpf)
 			- (uspi->s_bpf - start);
 		size -= count;

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