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

Commit 2f889129 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: Restore 'remaining' count when retrying an write operation 



When retrying a write due to barrier failure, we don't reset 'remaining', so
it goes negative and never hits 0 again.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8ddeeae5

drivers/md/raid1.c

+3 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,9 @@ static void raid1d(mddev_t *mddev) 
			int i;

			clear_bit(R1BIO_BarrierRetry, &r1_bio->state);

			clear_bit(R1BIO_Barrier, &r1_bio->state);

			for (i=0; i < conf->raid_disks; i++)

				if (r1_bio->bios[i])

					atomic_inc(&r1_bio->remaining);

			for (i=0; i < conf->raid_disks; i++)

				if (r1_bio->bios[i]) {

					struct bio_vec *bvec;