VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Luca Mariotti <mariottiluca1@hotmail.it> 2021-06-19 16:09:43 +0200 committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2021-07-14 17:06:36 +0200 commit: c37238fae66db055ad9ced2cdefc3d2d2f60023f parent: a1e7400147eb5706323a6c12c439991115f0b6e1
Commit Summary:
block, bfq: fix delayed stable merge check
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index acd1f881273e..2adb1e69c9d2 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -2697,7 +2697,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 	if (unlikely(!bfqd->nonrot_with_queueing)) {
 		if (bic->stable_merge_bfqq &&
 		    !bfq_bfqq_just_created(bfqq) &&
-		    time_is_after_jiffies(bfqq->split_time +
+		    time_is_before_jiffies(bfqq->split_time +
 					  msecs_to_jiffies(200))) {
 			struct bfq_queue *stable_merge_bfqq =
 				bic->stable_merge_bfqq;