| From stable-bounces@linux.kernel.org Thu Oct 19 20:26:21 2006 |
| From: NeilBrown <neilb@suse.de> |
| To: Andrew Morton <akpm@osdl.org> |
| Date: Fri, 20 Oct 2006 13:25:30 +1000 |
| Message-Id: <1061020032530.1668@suse.de> |
| Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org |
| Subject: md: Fix calculation of ->degraded for multipath and raid10 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset="us-ascii" |
| |
| From: NeilBrown <neilb@suse.de> |
| |
| Two less-used md personalities have bugs in the calculation of |
| ->degraded (the extent to which the array is degraded). |
| |
| Signed-off-by: Neil Brown <neilb@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| |
| --- |
| drivers/md/multipath.c | 2 +- |
| drivers/md/raid10.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- linux-2.6.18.1.orig/drivers/md/multipath.c |
| +++ linux-2.6.18.1/drivers/md/multipath.c |
| @@ -480,7 +480,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)); |
| --- linux-2.6.18.1.orig/drivers/md/raid10.c |
| +++ linux-2.6.18.1/drivers/md/raid10.c |
| @@ -2042,7 +2042,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++; |
| } |
