diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-24 07:45:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-24 07:45:34 +0100 |
| commit | e6036c0b88962df82a8853971b86a55f09faef40 (patch) | |
| tree | e03e4fc034a29c21a77fbebdf7c4cb27ab95e5d4 /drivers/md/raid10.c | |
| parent | be6e8c76047408561452dd7c48576bbf420cb09d (diff) | |
| parent | d47648fcf0611812286f68131b40251c6fa54f5e (diff) | |
| download | linux-e6036c0b88962df82a8853971b86a55f09faef40.tar.bz2 | |
Merge tag 'md/3.12-fixes' of git://neil.brown.name/md
Pull md bugfixes from Neil Brown:
"Assorted md bug-fixes for 3.12.
All tagged for -stable releases too"
* tag 'md/3.12-fixes' of git://neil.brown.name/md:
raid5: avoid finding "discard" stripe
raid5: set bio bi_vcnt 0 for discard request
md: avoid deadlock when md_set_badblocks.
md: Fix skipping recovery for read-only arrays.
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index df7b0a06b0ea..73dc8a377522 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1782,6 +1782,7 @@ static int raid10_spare_active(struct mddev *mddev) } sysfs_notify_dirent_safe(tmp->replacement->sysfs_state); } else if (tmp->rdev + && tmp->rdev->recovery_offset == MaxSector && !test_bit(Faulty, &tmp->rdev->flags) && !test_and_set_bit(In_sync, &tmp->rdev->flags)) { count++; |