Revert "block, bfq: choose the last bfqq from merge chain in bfq_setup_cooperator()"
This reverts commit 9ea4bad25e
.
This commit is contained in:
parent
5af498c438
commit
8b80716260
1 changed files with 2 additions and 6 deletions
|
@ -2639,12 +2639,8 @@ 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 */
|
||||
new_bfqq = bfqq->new_bfqq;
|
||||
if (new_bfqq) {
|
||||
while (new_bfqq->new_bfqq)
|
||||
new_bfqq = new_bfqq->new_bfqq;
|
||||
return new_bfqq;
|
||||
}
|
||||
if (bfqq->new_bfqq)
|
||||
return bfqq->new_bfqq;
|
||||
|
||||
/*
|
||||
* Do not perform queue merging if the device is non
|
||||
|
|
Loading…
Reference in a new issue