Commit 70456e52 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe

bfq: Avoid false marking of bic as stably merged

bfq_setup_cooperator() can mark bic as stably merged even though it
decides to not merge its bfqqs (when bfq_setup_merge() returns NULL).
Make sure to mark bic as stably merged only if we are really going to
merge bfqqs.

CC: stable@vger.kernel.org
Tested-by: default avatar"yukuai (C)" <yukuai3@huawei.com>
Fixes: 430a67f9 ("block, bfq: merge bursts of newly-created queues")
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220401102752.8599-1-jack@suse.czSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 852ad96c
...@@ -2895,9 +2895,12 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, ...@@ -2895,9 +2895,12 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
struct bfq_queue *new_bfqq = struct bfq_queue *new_bfqq =
bfq_setup_merge(bfqq, stable_merge_bfqq); bfq_setup_merge(bfqq, stable_merge_bfqq);
bic->stably_merged = true; if (new_bfqq) {
if (new_bfqq && new_bfqq->bic) bic->stably_merged = true;
new_bfqq->bic->stably_merged = true; if (new_bfqq->bic)
new_bfqq->bic->stably_merged =
true;
}
return new_bfqq; return new_bfqq;
} else } else
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment