---

yaml --- r: 360737 b: refs/heads/master c: 4c0ca26 h: refs/heads/master i: 360735: c866daf v: v3
git-mirror · Feb 26, 2013 · 4cfccda · 4cfccda
1 parent aa84a26
commit 4cfccda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8dc9c654794a765ca61baed07f84ed8aaa7ca8c
+refs/heads/master: 4c0ca26bd260dddf3b9781758cb5e2df3f74d4a3
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
@@ -552,14 +552,13 @@ static void __raid10_find_phys(struct geom *geo, struct r10bio *r10bio)
 	for (n = 0; n < geo->near_copies; n++) {
 		int d = dev;
 		sector_t s = sector;
-		r10bio->devs[slot].addr = sector;
 		r10bio->devs[slot].devnum = d;
+		r10bio->devs[slot].addr = s;
 		slot++;
 
 		for (f = 1; f < geo->far_copies; f++) {
 			d += geo->near_copies;
-			if (d >= geo->raid_disks)
-				d -= geo->raid_disks;
+			d %= geo->raid_disks;
 			s += geo->stride;
 			r10bio->devs[slot].devnum = d;
 			r10bio->devs[slot].addr = s;