blk-cgroup: pass a gendisk to pd_alloc_fn

No need to the request_queue here, pass a gendisk and extract the
node ids from that.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 9d1c9e35af41d8c5ccbd6dc5bb9fc2183414122e..1351fab3755e4a12d13bc6b5ad8823fee062801c 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -515,12 +515,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, struct request_queue *q,
-                                            struct blkcg *blkcg)
+static struct blkg_policy_data *bfq_pd_alloc(struct gendisk *disk,
+               struct blkcg *blkcg, gfp_t gfp)
 {
        struct bfq_group *bfqg;
 
-       bfqg = kzalloc_node(sizeof(*bfqg), gfp, q->node);
+       bfqg = kzalloc_node(sizeof(*bfqg), gfp, disk->node_id);
        if (!bfqg)
                return NULL;
 

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 01b6620067cdcb6cf6e4f1ac414dc584914c8063..8dcfcb6c582a8ea3d88fec4fc43f9e3522e07371 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -247,7 +247,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct gendisk *disk,
                        continue;
 
                /* alloc per-policy data and attach it to blkg */
-               pd = pol->pd_alloc_fn(gfp_mask, disk->queue, blkcg);
+               pd = pol->pd_alloc_fn(disk, blkcg, gfp_mask);
                if (!pd)
                        goto err_free;
 
@@ -1379,8 +1379,8 @@ retry:
                        pd = pd_prealloc;
                        pd_prealloc = NULL;
                } else {
-                       pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q,
-                                             blkg->blkcg);
+                       pd = pol->pd_alloc_fn(disk, blkg->blkcg,
+                                             GFP_NOWAIT | __GFP_NOWARN);
                }
 
                if (!pd) {
@@ -1397,8 +1397,8 @@ retry:
 
                        if (pd_prealloc)
                                pol->pd_free_fn(pd_prealloc);
-                       pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q,
-                                                      blkg->blkcg);
+                       pd_prealloc = pol->pd_alloc_fn(disk, blkg->blkcg,
+                                                      GFP_KERNEL);
                        if (pd_prealloc)
                                goto retry;
                        else

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index a9d8402a57861c83e7785c11f361f99514e4ae06..e9e42dda0e0f8e44bedb83d0fc00ac5684e3da2a 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -143,8 +143,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,
-                               struct request_queue *q, struct blkcg *blkcg);
+typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(struct gendisk *disk,
+               struct blkcg *blkcg, gfp_t gfp);
 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);

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index dc5b7520475d4d00b70273974c54d36ff457eeea..eb8cddadb957feb9c456e5f83540a912113b40cc 100644 (file)
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -2910,13 +2910,14 @@ static void ioc_cpd_free(struct blkcg_policy_data *cpd)
        kfree(container_of(cpd, struct ioc_cgrp, cpd));
 }
 
-static struct blkg_policy_data *ioc_pd_alloc(gfp_t gfp, struct request_queue *q,
-                                            struct blkcg *blkcg)
+static struct blkg_policy_data *ioc_pd_alloc(struct gendisk *disk,
+               struct blkcg *blkcg, gfp_t gfp)
 {
        int levels = blkcg->css.cgroup->level + 1;
        struct ioc_gq *iocg;
 
-       iocg = kzalloc_node(struct_size(iocg, ancestors, levels), gfp, q->node);
+       iocg = kzalloc_node(struct_size(iocg, ancestors, levels), gfp,
+                           disk->node_id);
        if (!iocg)
                return NULL;
 

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 1e244ca6a79069c0c525a2840336a58cad2de064..f9c98e2987f2b2654671de7839c8081e05306719 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -947,13 +947,12 @@ static void iolatency_pd_stat(struct blkg_policy_data *pd, struct seq_file *s)
                        iolat->rq_depth.max_depth, avg_lat, cur_win);
 }
 
-static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp,
-                                                  struct request_queue *q,
-                                                  struct blkcg *blkcg)
+static struct blkg_policy_data *iolatency_pd_alloc(struct gendisk *disk,
+               struct blkcg *blkcg, gfp_t gfp)
 {
        struct iolatency_grp *iolat;
 
-       iolat = kzalloc_node(sizeof(*iolat), gfp, q->node);
+       iolat = kzalloc_node(sizeof(*iolat), gfp, disk->node_id);
        if (!iolat)
                return NULL;
        iolat->stats = __alloc_percpu_gfp(sizeof(struct latency_stat),

diff --git a/block/blk-ioprio.c b/block/blk-ioprio.c
index 8194826cc824bce151795899a04d2ff5cfe786f1..055529b9b92bab5de70e689d76f536345d4067c3 100644 (file)
--- a/block/blk-ioprio.c
+++ b/block/blk-ioprio.c
@@ -116,7 +116,7 @@ static ssize_t ioprio_set_prio_policy(struct kernfs_open_file *of, char *buf,
 }
 
 static struct blkg_policy_data *
-ioprio_alloc_pd(gfp_t gfp, struct request_queue *q, struct blkcg *blkcg)
+ioprio_alloc_pd(struct gendisk *disk, struct blkcg *blkcg, gfp_t gfp)
 {
        struct ioprio_blkg *ioprio_blkg;
 

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 974d6b1ff166dd28443905fc9717a00a87e4ec80..f105224a3f84f9dbfc641ce6533f9c37c08450b5 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -335,14 +335,13 @@ 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,
-                                               struct request_queue *q,
-                                               struct blkcg *blkcg)
+static struct blkg_policy_data *throtl_pd_alloc(struct gendisk *disk,
+               struct blkcg *blkcg, gfp_t gfp)
 {
        struct throtl_grp *tg;
        int rw;
 
-       tg = kzalloc_node(sizeof(*tg), gfp, q->node);
+       tg = kzalloc_node(sizeof(*tg), gfp, disk->node_id);
        if (!tg)
                return NULL;