From 9590d9d04efc4b44f9b20f685f384934f1537e8f Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sat, 21 Oct 2006 10:24:07 -0700 Subject: [PATCH] --- yaml --- r: 40106 b: refs/heads/master c: 2e333e89860431d22816c1bdaa2ea72c2753396e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/multipath.c | 2 +- trunk/drivers/md/raid10.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8ef5c625bf22..215430396ace 100644 --- 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 index 171ff41b52b0..a6260f0e3b9e 100644 --- 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 index 1250f0eab4af..74f17a9a6ebb 100644 --- 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++; }