Merge tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

[sfrench/cifs-2.6.git] / block / blk-iolatency.c

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 0fff7b56df0e4d0fa0f82be4102f3ceb03735034..c128d50cb4107969cab6460e3447b93f7c54553f 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -725,7 +725,7 @@ int blk_iolatency_init(struct request_queue *q)
                return -ENOMEM;
 
        rqos = &blkiolat->rqos;
-       rqos->id = RQ_QOS_CGROUP;
+       rqos->id = RQ_QOS_LATENCY;
        rqos->ops = &blkcg_iolatency_ops;
        rqos->q = q;
 
@@ -934,11 +934,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 latency_stat),