patch-2.4.10 linux/drivers/md/lvm-snap.c
Next file: linux/drivers/md/lvm.c
Previous file: linux/drivers/md/Makefile
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Mon Sep 10 08:00:55 2001
- Orig file:
v2.4.9/linux/drivers/md/lvm-snap.c
- Orig date:
Mon Aug 27 12:41:42 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/md/lvm-snap.c linux/drivers/md/lvm-snap.c
@@ -386,8 +386,8 @@
blksize_org = lvm_get_blksize(org_phys_dev);
blksize_snap = lvm_get_blksize(snap_phys_dev);
- max_blksize = max(int, blksize_org, blksize_snap);
- min_blksize = min(int, blksize_org, blksize_snap);
+ max_blksize = max(blksize_org, blksize_snap);
+ min_blksize = min(blksize_org, blksize_snap);
max_sectors = KIO_MAX_SECTORS * (min_blksize>>9);
if (chunk_size % (max_blksize>>9))
@@ -395,7 +395,7 @@
while (chunk_size)
{
- nr_sectors = min(int, chunk_size, max_sectors);
+ nr_sectors = min(chunk_size, max_sectors);
chunk_size -= nr_sectors;
iobuf->length = nr_sectors << 9;
@@ -503,7 +503,7 @@
buckets = lv->lv_remap_end;
max_buckets = calc_max_buckets();
- buckets = min(unsigned long, buckets, max_buckets);
+ buckets = min(buckets, max_buckets);
while (buckets & (buckets-1))
buckets &= (buckets-1);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)