Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8cb6b4c authored by NeilBrown's avatar NeilBrown
Browse files

md/raid1: fix_read_error should act on all non-faulty devices. 



If a devices is being recovered it is not InSync and is not Faulty.

If a read error is experienced on that device, fix_read_error()
will be called, but it ignores non-InSync devices.  So it will
neither fix the error nor fail the device.

It is incorrect that fix_read_error() ignores non-InSync devices.
It should only ignore Faulty devices.  So fix it.

This became a bug when we allowed reading from a device that was being
recovered.  It is suitable for any subsequent -stable kernel.

Fixes: da8840a7
Cc: stable@vger.kernel.org (v3.5+)
Reported-by: default avatarAlexander Lyakas <alex.bolshoy@gmail.com>
Tested-by: default avatarAlexander Lyakas <alex.bolshoy@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 34e97f17

drivers/md/raid1.c

+2 −2
Original line number Diff line number Diff line
@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, 
			d--;

			rdev = conf->mirrors[d].rdev;

			if (rdev &&

			    test_bit(In_sync, &rdev->flags))

			    !test_bit(Faulty, &rdev->flags))

				r1_sync_page_io(rdev, sect, s,

						conf->tmppage, WRITE);

		}
@@ -2167,7 +2167,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, 
			d--;

			rdev = conf->mirrors[d].rdev;

			if (rdev &&

			    test_bit(In_sync, &rdev->flags)) {

			    !test_bit(Faulty, &rdev->flags)) {

				if (r1_sync_page_io(rdev, sect, s,

						    conf->tmppage, READ)) {

					atomic_add(s, &rdev->corrected_errors);