Commit c609299e authored by Li Lingfeng's avatar Li Lingfeng
Browse files

Revert "md/raid10: fix softlockup in raid10_unplug"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8UKFJ


CVE: NA

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

This reverts commit 7efc0915.

The problem can be solved by commit 01044462 ("md/raid10: prevent soft
lockup while flush writes") from mainline, so revert this patch and apply
the mainline one.

Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 6d9d4951
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ static void flush_pending_writes(struct r10conf *conf)
			else
				submit_bio_noacct(bio);
			bio = next;
			cond_resched();
		}
		blk_finish_plug(&plug);
	} else
@@ -1116,7 +1115,6 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)
		else
			submit_bio_noacct(bio);
		bio = next;
		cond_resched();
	}
	kfree(plug);
}