Commit 8277dff6 authored by NeilBrown's avatar NeilBrown Committed by Luis Henriques

md/raid1: fix test for 'was read error from last working device'.

commit 34cab6f4 upstream.

When we get a read error from the last working device, we don't
try to repair it, and don't fail the device.  We simple report a
read error to the caller.

However the current test for 'is this the last working device' is
wrong.
When there is only one fully working device, it assumes that a
non-faulty device is that device.  However a spare which is rebuilding
would be non-faulty but so not the only working device.

So change the test from "!Faulty" to "In_sync".  If ->degraded says
there is only one fully working device and this device is in_sync,
this must be the one.

This bug has existed since we allowed read_balance to read from
a recovering spare in v3.0
Reported-and-tested-by: default avatarAlexander Lyakas <alex.bolshoy@gmail.com>
Fixes: 76073054 ("md/raid1: clean up read_balance.")
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 83d6450b
...@@ -336,7 +336,7 @@ static void raid1_end_read_request(struct bio *bio, int error) ...@@ -336,7 +336,7 @@ static void raid1_end_read_request(struct bio *bio, int error)
spin_lock_irqsave(&conf->device_lock, flags); spin_lock_irqsave(&conf->device_lock, flags);
if (r1_bio->mddev->degraded == conf->raid_disks || if (r1_bio->mddev->degraded == conf->raid_disks ||
(r1_bio->mddev->degraded == conf->raid_disks-1 && (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; uptodate = 1;
spin_unlock_irqrestore(&conf->device_lock, flags); spin_unlock_irqrestore(&conf->device_lock, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment