md/raid5: fix refcount problem when blocked_rdev is set. (5f066c63) · Commits · 戴 / test

commit 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:

majianpeng <majianpeng@gmail.com> Signed-off-by:

NeilBrown <neilb@suse.de>

drivers/md/raid5.c

+12 −2

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

	finish:		finish:
	/* wait for this device to become unblocked */		/* wait for this device to become unblocked */
	if (conf->mddev->external && unlikely(s.blocked_rdev))		if (unlikely(s.blocked_rdev)) {
	md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);		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)		if (s.handle_bad_blocks)
	for (i = disks; i--; ) {		for (i = disks; i--; ) {

Admin message