diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 21:51:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 21:51:55 -0500 |
commit | c086ae4ed94f9a1d283318e006813268c2dbf9fc (patch) | |
tree | dbabbb09ddafcb818f32af038831419702574917 /drivers/md/md.c | |
parent | 7b67e751479d50b7f84d1a3cc5216eed5e534b66 (diff) | |
parent | 307729c8bc5b5a41361af8af95906eee7552acb1 (diff) |
Merge tag 'md-3.3-fixes' of git://neil.brown.name/md
Two bugfixes for md.
One is a recently introduced regression that affects an unusual
configuration with a guaranteed BUG_ON. Has been tagged for -stable.
The other is minor missing functionality.
* tag 'md-3.3-fixes' of git://neil.brown.name/md:
md/raid1: perform bad-block tests for WriteMostly devices too.
md: notify the 'degraded' sysfs attribute on failure.
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index ca8527fe77eb..da52acb60f52 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -7382,6 +7382,7 @@ static int remove_and_add_spares(struct mddev *mddev) | |||
7382 | { | 7382 | { |
7383 | struct md_rdev *rdev; | 7383 | struct md_rdev *rdev; |
7384 | int spares = 0; | 7384 | int spares = 0; |
7385 | int removed = 0; | ||
7385 | 7386 | ||
7386 | mddev->curr_resync_completed = 0; | 7387 | mddev->curr_resync_completed = 0; |
7387 | 7388 | ||
@@ -7395,8 +7396,13 @@ static int remove_and_add_spares(struct mddev *mddev) | |||
7395 | mddev, rdev) == 0) { | 7396 | mddev, rdev) == 0) { |
7396 | sysfs_unlink_rdev(mddev, rdev); | 7397 | sysfs_unlink_rdev(mddev, rdev); |
7397 | rdev->raid_disk = -1; | 7398 | rdev->raid_disk = -1; |
7399 | removed++; | ||
7398 | } | 7400 | } |
7399 | } | 7401 | } |
7402 | if (removed) | ||
7403 | sysfs_notify(&mddev->kobj, NULL, | ||
7404 | "degraded"); | ||
7405 | |||
7400 | 7406 | ||
7401 | list_for_each_entry(rdev, &mddev->disks, same_set) { | 7407 | list_for_each_entry(rdev, &mddev->disks, same_set) { |
7402 | if (rdev->raid_disk >= 0 && | 7408 | if (rdev->raid_disk >= 0 && |