diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 9fe5952d117d553f12f32055fde8683c554b06a8..0c7ee5d023ec32c7af35e3d4d104f793dd504f4d 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -434,11 +434,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;
 
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index e8ad9568facfc8ed6d2f43aa77d38233d9c47e12..94b15808cf71fe23cd4e5e57620c90f795694af0 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -128,7 +128,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;
 
@@ -1410,7 +1410,7 @@ int blkcg_activate_policy(struct request_queue *q,
 		blk_queue_bypass_start(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;
@@ -1425,7 +1425,7 @@ int blkcg_activate_policy(struct request_queue *q,
 		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) {
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index c6529f23048ac08741ce4a7beee0bc79d22a0ad9..4f4a614f60fe6b3620a673cf51e70e884a24dfa2 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -871,11 +871,13 @@ static size_t iolatency_pd_stat(struct blkg_policy_data *pd, char *buf,
 }
 
 
-static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp, int node)
+static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp,
+						   struct request_queue *q,
+						   struct blkcg *blkcg)
 {
 	struct iolatency_grp *iolat;
 
-	iolat = kzalloc_node(sizeof(*iolat), gfp, node);
+	iolat = kzalloc_node(sizeof(*iolat), gfp, q->node);
 	if (!iolat)
 		return NULL;
 	iolat->stats = __alloc_percpu_gfp(sizeof(struct blk_rq_stat),
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 506a59f1000f9f49db0ad8cba5da8e7e265efed2..2f630a0553e3b8ed224a343dda5198a1e2f1e3ec 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -479,12 +479,14 @@ static void throtl_service_queue_init(struct throtl_service_queue *sq)
 	timer_setup(&sq->pending_timer, throtl_pending_timer_fn, 0);
 }
 
-static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp, int node)
+static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp,
+						struct request_queue *q,
+						struct blkcg *blkcg)
 {
 	struct throtl_grp *tg;
 	int rw;
 
-	tg = kzalloc_node(sizeof(*tg), gfp, node);
+	tg = kzalloc_node(sizeof(*tg), gfp, q->node);
 	if (!tg)
 		return NULL;
 
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 2eb87444b157271fe4c3e9d57f4cffc303f0c0a5..f6fc37569c2776db6f14b6074b309a778b91816e 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1612,11 +1612,13 @@ static void cfq_cpd_bind(struct blkcg_policy_data *cpd)
 	WARN_ON_ONCE(__cfq_set_weight(&blkcg->css, weight, on_dfl, true, true));
 }
 
-static struct blkg_policy_data *cfq_pd_alloc(gfp_t gfp, int node)
+static struct blkg_policy_data *cfq_pd_alloc(gfp_t gfp,
+					     struct request_queue *q,
+					     struct blkcg *blkcg)
 {
 	struct cfq_group *cfqg;
 
-	cfqg = kzalloc_node(sizeof(*cfqg), gfp, node);
+	cfqg = kzalloc_node(sizeof(*cfqg), gfp, q->node);
 	if (!cfqg)
 		return NULL;
 
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 6d766a19f2bbb2b62facc79ff3871aa81be68534..bd8b80bd3f044baae04eb7a65b5d8e7d2be260af 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -149,7 +149,8 @@ typedef struct blkcg_policy_data *(blkcg_pol_alloc_cpd_fn)(gfp_t gfp);
 typedef void (blkcg_pol_init_cpd_fn)(struct blkcg_policy_data *cpd);
 typedef void (blkcg_pol_free_cpd_fn)(struct blkcg_policy_data *cpd);
 typedef void (blkcg_pol_bind_cpd_fn)(struct blkcg_policy_data *cpd);
-typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(gfp_t gfp, int node);
+typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(gfp_t gfp,
+				struct request_queue *q, struct blkcg *blkcg);
 typedef void (blkcg_pol_init_pd_fn)(struct blkg_policy_data *pd);
 typedef void (blkcg_pol_online_pd_fn)(struct blkg_policy_data *pd);
 typedef void (blkcg_pol_offline_pd_fn)(struct blkg_policy_data *pd);