diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 10:34:54 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 10:34:54 -0700 |
| commit | 8eb2c0ee67f4853c0e433394f65ef8143a748c80 (patch) | |
| tree | ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f /drivers/md/md.c | |
| parent | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (diff) | |
| parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
| download | op-kernel-dev-8eb2c0ee67f4853c0e433394f65ef8143a748c80.zip op-kernel-dev-8eb2c0ee67f4853c0e433394f65ef8143a748c80.tar.gz | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4332fc2..91e31e2 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7088,6 +7088,7 @@ static int remove_and_add_spares(mddev_t *mddev) list_for_each_entry(rdev, &mddev->disks, same_set) { if (rdev->raid_disk >= 0 && !test_bit(In_sync, &rdev->flags) && + !test_bit(Faulty, &rdev->flags) && !test_bit(Blocked, &rdev->flags)) spares++; if (rdev->raid_disk < 0 |
