--- 2.4.11aa2/drivers/md/lvm-snap.c.~1~	Thu Oct 11 04:28:46 2001
+++ 2.4.11aa2/drivers/md/lvm-snap.c	Thu Oct 11 05:09:12 2001
@@ -324,6 +324,7 @@
 {
 	const char * reason;
 	unsigned long org_start, snap_start, snap_phys_dev, virt_start, pe_off;
+	unsigned long phys_start;
 	int idx = lv_snap->lv_remap_ptr, chunk_size = lv_snap->lv_chunk_size;
 	struct kiobuf * iobuf;
 	unsigned long blocks[KIO_MAX_SECTORS];
@@ -358,8 +359,8 @@
 
 	iobuf = lv_snap->lv_iobuf;
 
-	blksize_org = lvm_get_blksize(org_phys_dev);
-	blksize_snap = lvm_get_blksize(snap_phys_dev);
+	blksize_org = get_hardsect_size(org_phys_dev);
+	blksize_snap = get_hardsect_size(snap_phys_dev);
 	max_blksize = max(blksize_org, blksize_snap);
 	min_blksize = min(blksize_org, blksize_snap);
 	max_sectors = KIO_MAX_SECTORS * (min_blksize>>9);
@@ -367,6 +368,7 @@
 	if (chunk_size % (max_blksize>>9))
 		goto fail_blksize;
 
+	phys_start = org_start;
 	while (chunk_size)
 	{
 		nr_sectors = min(chunk_size, max_sectors);
@@ -374,7 +376,7 @@
 
 		iobuf->length = nr_sectors << 9;
 
-		if(!lvm_snapshot_prepare_blocks(blocks, org_start,
+		if(!lvm_snapshot_prepare_blocks(blocks, phys_start,
 						nr_sectors, blksize_org))
 			goto fail_prepare;
 
@@ -389,6 +391,9 @@
 		if (__brw_kiovec(WRITE, 1, &iobuf, snap_phys_dev, blocks,
 				 blksize_snap, lv_snap) != (nr_sectors<<9))
 			goto fail_raw_write;
+
+		phys_start += nr_sectors;
+		snap_start += nr_sectors;
 	}
 
 #ifdef DEBUG_SNAPSHOT