diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-02-03 16:03:58 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-02-03 16:20:05 +0100 |
| commit | 0a0b4f79db2e6e745672aa3852cf5fdf7af14a0f (patch) | |
| tree | 8203bd55bd2db45d0c1970c871796fcb2865b99a /block/blk-iocost.c | |
| parent | blk-cgroup: pass a gendisk to blkcg_{de,}activate_policy (diff) | |
| download | linux-0a0b4f79db2e6e745672aa3852cf5fdf7af14a0f.tar.xz linux-0a0b4f79db2e6e745672aa3852cf5fdf7af14a0f.zip | |
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>
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20230203150400.3199230-18-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-iocost.c')
| -rw-r--r-- | block/blk-iocost.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 078b77709519..7a2dc9dc8e3b 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2923,13 +2923,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; |