diff --git a/[refs] b/[refs] index a28a4da4dd5b..a174096fa1ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 269f541555d8f5da322d592fb3e13e23ed62d80c +refs/heads/master: 5617cbef7723952cbdff28c7a10ff8a254945f4f diff --git a/trunk/block/blk-throttle.c b/trunk/block/blk-throttle.c index 97ea7f82477d..b9412d1cea9e 100644 --- a/trunk/block/blk-throttle.c +++ b/trunk/block/blk-throttle.c @@ -1176,10 +1176,8 @@ int blk_throtl_init(struct request_queue *q) td->root_tg = tg; rcu_read_lock(); - blkiocg_add_blkio_group(&blkio_root_cgroup, &tg->blkg, (void *)td, - 0, BLKIO_POLICY_THROTL); + throtl_init_add_tg_lists(td, tg, &blkio_root_cgroup); rcu_read_unlock(); - throtl_add_group_to_td_list(td, tg); /* Attach throtl data to request queue */ q->td = td;