---

yaml --- r: 40106 b: refs/heads/master c: 2e333e8 h: refs/heads/master v: v3
git-mirror · Oct 21, 2006 · 9590d9d · 9590d9d
1 parent 148749e
commit 9590d9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c5473f80770768ab5712eb5a7492c16e97209fe
+refs/heads/master: 2e333e89860431d22816c1bdaa2ea72c2753396e
diff --git a/trunk/drivers/md/multipath.c b/trunk/drivers/md/multipath.c
@@ -501,7 +501,7 @@ static int multipath_run (mddev_t *mddev)
 			mdname(mddev));
 		goto out_free_conf;
 	}
-	mddev->degraded = conf->raid_disks = conf->working_disks;
+	mddev->degraded = conf->raid_disks - conf->working_disks;
 
 	conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
 						 sizeof(struct multipath_bh));

diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
@@ -2079,7 +2079,7 @@ static int run(mddev_t *mddev)
 		disk = conf->mirrors + i;
 
 		if (!disk->rdev ||
-		    !test_bit(In_sync, &rdev->flags)) {
+		    !test_bit(In_sync, &disk->rdev->flags)) {
 			disk->head_position = 0;
 			mddev->degraded++;
 		}