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

Commit 5f066c63 authored by NeilBrown's avatar NeilBrown
Browse files

md/raid5: fix refcount problem when blocked_rdev is set. 



commit 43220aa0
    md/raid5: fix a hang on device failure.

fixed a hang, but introduced a refcounting in-balance so
that if the presence of bad-blocks ever caused an rdev to
be 'blocked' we would increment the refcount on the rdev and
never decrement it.

So added the needed rdev_dec_pending when md_wait_for_blocked_rdev
is not called.

Reported-by: default avatarmajianpeng <majianpeng@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 7c2c57c9

drivers/md/raid5.c

+12 −2
Original line number Diff line number Diff line
@@ -3588,8 +3588,18 @@ static void handle_stripe(struct stripe_head *sh) 


finish:

	/* wait for this device to become unblocked */

	if (conf->mddev->external && unlikely(s.blocked_rdev))

		md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);

	if (unlikely(s.blocked_rdev)) {

		if (conf->mddev->external)

			md_wait_for_blocked_rdev(s.blocked_rdev,

						 conf->mddev);

		else

			/* Internal metadata will immediately

			 * be written by raid5d, so we don't

			 * need to wait here.

			 */

			rdev_dec_pending(s.blocked_rdev,

					 conf->mddev);

	}



	if (s.handle_bad_blocks)

		for (i = disks; i--; ) {