diff options
| author | Jan Kara <jack@suse.cz> | 2022-04-01 13:27:42 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-04-18 04:34:02 +0300 |
| commit | 70456e5210f40ffdb8f6d905acfdcec5bd5fad9e (patch) | |
| tree | c06413cc3d5d353d1fc45aaf58c92db0d3867794 /block/bfq-iosched.c | |
| parent | 852ad96cb03621f7995764b4b31cbff9801d8bcd (diff) | |
| download | linux-70456e5210f40ffdb8f6d905acfdcec5bd5fad9e.tar.xz | |
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: "yukuai (C)" <yukuai3@huawei.com>
Fixes: 430a67f9d616 ("block, bfq: merge bursts of newly-created queues")
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220401102752.8599-1-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bfq-iosched.c')
| -rw-r--r-- | block/bfq-iosched.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 2e0dd68a3cbe..6d122c28086e 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2895,9 +2895,12 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, struct bfq_queue *new_bfqq = bfq_setup_merge(bfqq, stable_merge_bfqq); - bic->stably_merged = true; - if (new_bfqq && new_bfqq->bic) - new_bfqq->bic->stably_merged = true; + if (new_bfqq) { + bic->stably_merged = true; + if (new_bfqq->bic) + new_bfqq->bic->stably_merged = + true; + } return new_bfqq; } else return NULL; |