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

Commit b50c259e authored by NeilBrown's avatar NeilBrown
Browse files

md/raid10: fix two bugs in handling of known-bad-blocks. 



If we discover a bad block when reading we split the request and
potentially read some of it from a different device.

The code path of this has two bugs in RAID10.
1/ we get a spin_lock with _irq, but unlock without _irq!!
2/ The calculation of 'sectors_handled' is wrong, as can be clearly
   seen by comparison with raid1.c

This leads to at least 2 warnings and a probable crash is a RAID10
ever had known bad blocks.

Cc: stable@vger.kernel.org (v3.1+)
Fixes: 856e08e2
Reported-by: default avatarDamian Nowak <spam@nowaker.net>
URL: https://bugzilla.kernel.org/show_bug.cgi?id=68181


Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 1cc03eb9

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -1319,7 +1319,7 @@ static void make_request(struct mddev *mddev, struct bio * bio) 
			/* Could not read all from this device, so we will

			 * need another r10_bio.

			 */

			sectors_handled = (r10_bio->sectors + max_sectors

			sectors_handled = (r10_bio->sector + max_sectors

					   - bio->bi_sector);

			r10_bio->sectors = max_sectors;

			spin_lock_irq(&conf->device_lock);
@@ -1327,7 +1327,7 @@ static void make_request(struct mddev *mddev, struct bio * bio) 
				bio->bi_phys_segments = 2;

			else

				bio->bi_phys_segments++;

			spin_unlock(&conf->device_lock);

			spin_unlock_irq(&conf->device_lock);

			/* Cannot call generic_make_request directly

			 * as that will be queued in __generic_make_request

			 * and subsequent mempool_alloc might block