blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn()

Instead of @node, pass in @q and @blkcg so that the alloc function has
more context.  This doesn't cause any behavior change and will be used
by io.weight implementation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 3 insertions, 3 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 55a7dc227dfb..6a82ca3fb5cf 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -175,7 +175,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
                         continue;
 
                 /* alloc per-policy data and attach it to blkg */
-                pd = pol->pd_alloc_fn(gfp_mask, q->node);
+                pd = pol->pd_alloc_fn(gfp_mask, q, blkcg);
                 if (!pd)
                         goto err_free;
 
@@ -1346,7 +1346,7 @@ int blkcg_activate_policy(struct request_queue *q,
                 blk_mq_freeze_queue(q);
 pd_prealloc:
         if (!pd_prealloc) {
-                pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node);
+                pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q, &blkcg_root);
                 if (!pd_prealloc) {
                         ret = -ENOMEM;
                         goto out_bypass_end;
@@ -1362,7 +1362,7 @@ pd_prealloc:
                 if (blkg->pd[pol->plid])
                         continue;
 
-                pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q->node);
+                pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q, &blkcg_root);
                 if (!pd)
                         swap(pd, pd_prealloc);
                 if (!pd) {