aboutsummaryrefslogtreecommitdiff
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2013-11-25 13:14:58 +0100
committerAnders Roxell <anders.roxell@linaro.org>2013-11-25 13:14:58 +0100
commit4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch)
treedb2b279c1ef40e8170883efd1c0bd118d1803aec /drivers/md/raid1.c
parentb153532021104be5cc1abc3b6b60c004739b31c7 (diff)
parent3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff)
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r--drivers/md/raid1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 6f4824426e86..afaa5d425e9a 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1479,6 +1479,7 @@ static int raid1_spare_active(struct mddev *mddev)
}
}
if (rdev
+ && rdev->recovery_offset == MaxSector
&& !test_bit(Faulty, &rdev->flags)
&& !test_and_set_bit(In_sync, &rdev->flags)) {
count++;