Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-microblaze.git] / block / bfq-cgroup.c

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 09b69a3..f0ff665 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -610,12 +610,13 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
         */
        entity = &bfqg->entity;
        for_each_entity(entity) {
-               bfqg = container_of(entity, struct bfq_group, entity);
-               if (bfqg != bfqd->root_group) {
-                       parent = bfqg_parent(bfqg);
+               struct bfq_group *curr_bfqg = container_of(entity,
+                                               struct bfq_group, entity);
+               if (curr_bfqg != bfqd->root_group) {
+                       parent = bfqg_parent(curr_bfqg);
                        if (!parent)
                                parent = bfqd->root_group;
-                       bfq_group_set_parent(bfqg, parent);
+                       bfq_group_set_parent(curr_bfqg, parent);
                }
        }