summary refs log tree commit diff
path: root/block/bfq-cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2019-08-28 15:05:51 -0700
committerJens Axboe <axboe@kernel.dk>2019-08-28 21:17:01 -0600
commitcf09a8ee19ad1f78b4e18cdde9f2a61133efacf5 (patch)
treefe93a7359f9de19bb6480a37847e76acfb64887f /block/bfq-cgroup.c
parentda8c828190fcd04662f594f3e00a184885aa5aa3 (diff)
downloadlinux-cf09a8ee19ad1f78b4e18cdde9f2a61133efacf5.tar.gz
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>
Diffstat (limited to 'block/bfq-cgroup.c')
-rw-r--r--block/bfq-cgroup.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 0f6cd688924f..e6fb537b4bfc 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -501,11 +501,12 @@ static void bfq_cpd_free(struct blkcg_policy_data *cpd)
 	kfree(cpd_to_bfqgd(cpd));
 }
 
-static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
+static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, struct request_queue *q,
+					     struct blkcg *blkcg)
 {
 	struct bfq_group *bfqg;
 
-	bfqg = kzalloc_node(sizeof(*bfqg), gfp, node);
+	bfqg = kzalloc_node(sizeof(*bfqg), gfp, q->node);
 	if (!bfqg)
 		return NULL;