diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index ecd3d0ec2f3b68c7fe6b9ceb453402da2454c4ce..9c3957d37069f85004e357dc4fac0e1b826c5a3b 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 003965683d0f21782a06e6d0e6c24bedb42d5806..6d218ac9007151949f37e4e43f105125d838e7bb 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -127,7 +127,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;
 
@@ -1436,7 +1436,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;
@@ -1451,7 +1451,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 0529e94a20f7f54f7bb8019a5cefdc0d53d69114..11de05b36cc7c2dd73652123d84d212b61829f9b 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -869,11 +869,12 @@ 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 caee658609d7385937bf7d08d4258aec70346692..76abcd771a5f2c620532a6dc3d71dda4fe8b8c8f 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..ea5e9e9e91e6a808c0b11c085a0dd577a4f4a3bf 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1612,11 +1612,12 @@ 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 911cc20d959a67425f06fbf54399ce4d6c4c0274..e65ec627844c59bf6ee930b741ad3a6160efe43b 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -154,7 +154,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);