diff options
author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:47:56 +0200 |
---|---|---|
committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:47:56 +0200 |
commit | 4f3a08cd3b023ee3f0410c1ef801c8ad76a761a0 (patch) | |
tree | 74ee931d156540865ba078d6d2b8be16df4fb974 /block | |
parent | 22443056035e24c2df98f812a7218596ca312a84 (diff) | |
parent | 31cdcb6d430f07760dd2f540a354b11e6bb6a4a4 (diff) |
Merge tag 'v5.4.151' into 5.4-2.3.x-imx
This is the 5.4.151 stable release
Diffstat (limited to 'block')
-rw-r--r-- | block/bfq-iosched.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 8dee243e639f..73bffd7af15c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2523,15 +2523,6 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) * are likely to increase the throughput. */ bfqq->new_bfqq = new_bfqq; - /* - * The above assignment schedules the following redirections: - * each time some I/O for bfqq arrives, the process that - * generated that I/O is disassociated from bfqq and - * associated with new_bfqq. Here we increases new_bfqq->ref - * in advance, adding the number of processes that are - * expected to be associated with new_bfqq as they happen to - * issue I/O. - */ new_bfqq->ref += process_refs; return new_bfqq; } @@ -2591,10 +2582,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, { struct bfq_queue *in_service_bfqq, *new_bfqq; - /* if a merge has already been setup, then proceed with that first */ - if (bfqq->new_bfqq) - return bfqq->new_bfqq; - /* * Do not perform queue merging if the device is non * rotational and performs internal queueing. In fact, such a @@ -2649,6 +2636,9 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, if (bfq_too_late_for_merging(bfqq)) return NULL; + if (bfqq->new_bfqq) + return bfqq->new_bfqq; + if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq)) return NULL; |