Merge tag 'staging-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / block / bfq-wf2q.c

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 476b5a90a5a48852d0849bc9d72bcd1a4e91f148..4b0d5fb6916005571d4d4b9885e5a24d194e7a7d 100644 (file)
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -792,24 +792,18 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
                 * queue, remove the entity from its old weight counter (if
                 * there is a counter associated with the entity).
                 */
-               if (prev_weight != new_weight) {
-                       if (bfqq) {
-                               root = &bfqd->queue_weights_tree;
-                               __bfq_weights_tree_remove(bfqd, bfqq, root);
-                       } else
-                               bfqd->num_active_groups--;
+               if (prev_weight != new_weight && bfqq) {
+                       root = &bfqd->queue_weights_tree;
+                       __bfq_weights_tree_remove(bfqd, bfqq, root);
                }
                entity->weight = new_weight;
                /*
                 * Add the entity, if it is not a weight-raised queue,
                 * to the counter associated with its new weight.
                 */
-               if (prev_weight != new_weight) {
-                       if (bfqq && bfqq->wr_coeff == 1) {
-                               /* If we get here, root has been initialized. */
-                               bfq_weights_tree_add(bfqd, bfqq, root);
-                       } else
-                               bfqd->num_active_groups++;
+               if (prev_weight != new_weight && bfqq && bfqq->wr_coeff == 1) {
+                       /* If we get here, root has been initialized. */
+                       bfq_weights_tree_add(bfqd, bfqq, root);
                }
 
                new_st->wsum += entity->weight;