Commit c23e1cd1 authored by Li Nan's avatar Li Nan Committed by Jialin Zhang
Browse files

md/raid10: fix io hung in md_wait_for_blocked_rdev() 

hulk inclusion
category: bugfix
bugzilla: 188569, https://gitee.com/openeuler/kernel/issues/I6XBZQ


CVE: NA

--------------------------------

If badblocks are merged but bb->count exceedded, badblocks_set() will
return 1 and merged badblocks will become un-ack. rdev_set_badblocks()
will not set sb_flags and wakeup mddev->thread, io wait in
md_wait_for_blocked_rdev() will hung because BlockedBadBlocks may not be
cleared.

Fix it by checking badblocks->changed instead of return value. This flag
is set when badblocks changes.

Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
parent 78cba163

drivers/md/md.c

+3 −3
Original line number Diff line number Diff line
@@ -9577,13 +9577,13 @@ int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors, 
		       int is_new)

{

	struct mddev *mddev = rdev->mddev;

	int rv;



	if (is_new)

		s += rdev->new_data_offset;

	else

		s += rdev->data_offset;

	rv = badblocks_set(&rdev->badblocks, s, sectors, 0);

	if (rv == 0) {

	badblocks_set(&rdev->badblocks, s, sectors, 0);

	if (rdev->badblocks.changed) {

		/* Make sure they get written out promptly */

		if (test_bit(ExternalBbl, &rdev->flags))

			sysfs_notify_dirent_safe(rdev->sysfs_unack_badblocks);