Merge tag 'printk-for-5.20-sane' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / block / blk-ioprio.c

diff --git a/block/blk-ioprio.c b/block/blk-ioprio.c
index 79e797f..c00060a 100644 (file)
--- a/block/blk-ioprio.c
+++ b/block/blk-ioprio.c
@@ -62,7 +62,6 @@ struct ioprio_blkg {
 struct ioprio_blkcg {
        struct blkcg_policy_data cpd;
        enum prio_policy         prio_policy;
-       bool                     prio_set;
 };
 
 static inline struct ioprio_blkg *pd_to_ioprio(struct blkg_policy_data *pd)
@@ -113,7 +112,6 @@ static ssize_t ioprio_set_prio_policy(struct kernfs_open_file *of, char *buf,
        if (ret < 0)
                return ret;
        blkcg->prio_policy = ret;
-       blkcg->prio_set = true;
        return nbytes;
 }
 
@@ -183,26 +181,20 @@ static struct blkcg_policy ioprio_policy = {
        .pd_free_fn     = ioprio_free_pd,
 };
 
-struct blk_ioprio {
-       struct rq_qos rqos;
-};
-
-static void blkcg_ioprio_track(struct rq_qos *rqos, struct request *rq,
-                              struct bio *bio)
+void blkcg_set_ioprio(struct bio *bio)
 {
        struct ioprio_blkcg *blkcg = ioprio_blkcg_from_bio(bio);
        u16 prio;
 
-       if (!blkcg->prio_set)
+       if (!blkcg || blkcg->prio_policy == POLICY_NO_CHANGE)
                return;
 
        /*
         * Except for IOPRIO_CLASS_NONE, higher I/O priority numbers
         * correspond to a lower priority. Hence, the max_t() below selects
         * the lower priority of bi_ioprio and the cgroup I/O priority class.
-        * If the cgroup policy has been set to POLICY_NO_CHANGE == 0, the
-        * bio I/O priority is not modified. If the bio I/O priority equals
-        * IOPRIO_CLASS_NONE, the cgroup I/O priority is assigned to the bio.
+        * If the bio I/O priority equals IOPRIO_CLASS_NONE, the cgroup I/O
+        * priority is assigned to the bio.
         */
        prio = max_t(u16, bio->bi_ioprio,
                        IOPRIO_PRIO_VALUE(blkcg->prio_policy, 0));
@@ -210,49 +202,14 @@ static void blkcg_ioprio_track(struct rq_qos *rqos, struct request *rq,
                bio->bi_ioprio = prio;
 }
 
-static void blkcg_ioprio_exit(struct rq_qos *rqos)
+void blk_ioprio_exit(struct request_queue *q)
 {
-       struct blk_ioprio *blkioprio_blkg =
-               container_of(rqos, typeof(*blkioprio_blkg), rqos);
-
-       blkcg_deactivate_policy(rqos->q, &ioprio_policy);
-       kfree(blkioprio_blkg);
+       blkcg_deactivate_policy(q, &ioprio_policy);
 }
 
-static struct rq_qos_ops blkcg_ioprio_ops = {
-       .track  = blkcg_ioprio_track,
-       .exit   = blkcg_ioprio_exit,
-};
-
 int blk_ioprio_init(struct request_queue *q)
 {
-       struct blk_ioprio *blkioprio_blkg;
-       struct rq_qos *rqos;
-       int ret;
-
-       blkioprio_blkg = kzalloc(sizeof(*blkioprio_blkg), GFP_KERNEL);
-       if (!blkioprio_blkg)
-               return -ENOMEM;
-
-       ret = blkcg_activate_policy(q, &ioprio_policy);
-       if (ret) {
-               kfree(blkioprio_blkg);
-               return ret;
-       }
-
-       rqos = &blkioprio_blkg->rqos;
-       rqos->id = RQ_QOS_IOPRIO;
-       rqos->ops = &blkcg_ioprio_ops;
-       rqos->q = q;
-
-       /*
-        * Registering the rq-qos policy after activating the blk-cgroup
-        * policy guarantees that ioprio_blkcg_from_bio(bio) != NULL in the
-        * rq-qos callbacks.
-        */
-       rq_qos_add(q, rqos);
-
-       return 0;
+       return blkcg_activate_policy(q, &ioprio_policy);
 }
 
 static int __init ioprio_init(void)