diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
| commit | 07c57548539dbeeb3c4d3766b02eaf4b2d945f8f (patch) | |
| tree | d0e53e8e213fa26a151367f60c7699f5719d898e /drivers/md/raid1.c | |
| parent | 977826e7012c4efebcb5b923d15455ebd468b579 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.08-android
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index b96ee9d78aa3..9be97e0bd149 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -336,7 +336,7 @@ static void raid1_end_read_request(struct bio *bio, int error) spin_lock_irqsave(&conf->device_lock, flags); if (r1_bio->mddev->degraded == conf->raid_disks || (r1_bio->mddev->degraded == conf->raid_disks-1 && - !test_bit(Faulty, &conf->mirrors[mirror].rdev->flags))) + test_bit(In_sync, &conf->mirrors[mirror].rdev->flags))) uptodate = 1; spin_unlock_irqrestore(&conf->device_lock, flags); } |