Revert "blk-cgroup: pass a gendisk to blkg_lookup"

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

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 1653786644eab1aa785080dc066484b4156ab33b..1574566321245e8c8177641d0bc50da93e3e750c 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -350,7 +350,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, struct gendisk *disk,
 
        /* link parent */
        if (blkcg_parent(blkcg)) {
-               blkg->parent = blkg_lookup(blkcg_parent(blkcg), disk);
+               blkg->parent = blkg_lookup(blkcg_parent(blkcg), disk->queue);
                if (WARN_ON_ONCE(!blkg->parent)) {
                        ret = -ENODEV;
                        goto err_put_css;
@@ -423,12 +423,12 @@ static struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,
 
        WARN_ON_ONCE(!rcu_read_lock_held());
 
-       blkg = blkg_lookup(blkcg, disk);
+       blkg = blkg_lookup(blkcg, q);
        if (blkg)
                return blkg;
 
        spin_lock_irqsave(&q->queue_lock, flags);
-       blkg = blkg_lookup(blkcg, disk);
+       blkg = blkg_lookup(blkcg, q);
        if (blkg) {
                if (blkcg != &blkcg_root &&
                    blkg != rcu_dereference(blkcg->blkg_hint))
@@ -447,7 +447,7 @@ static struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,
                struct blkcg_gq *ret_blkg = q->root_blkg;
 
                while (parent) {
-                       blkg = blkg_lookup(parent, disk);
+                       blkg = blkg_lookup(parent, q);
                        if (blkg) {
                                /* remember closest blkg */
                                ret_blkg = blkg;
@@ -733,7 +733,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
                goto fail_unlock;
        }
 
-       blkg = blkg_lookup(blkcg, disk);
+       blkg = blkg_lookup(blkcg, q);
        if (blkg)
                goto success;
 
@@ -747,7 +747,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
                struct blkcg_gq *new_blkg;
 
                parent = blkcg_parent(blkcg);
-               while (parent && !blkg_lookup(parent, disk)) {
+               while (parent && !blkg_lookup(parent, q)) {
                        pos = parent;
                        parent = blkcg_parent(parent);
                }
@@ -777,7 +777,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
                        goto fail_preloaded;
                }
 
-               blkg = blkg_lookup(pos, disk);
+               blkg = blkg_lookup(pos, q);
                if (blkg) {
                        blkg_free(new_blkg);
                } else {
@@ -1852,7 +1852,7 @@ void blkcg_maybe_throttle_current(void)
        blkcg = css_to_blkcg(blkcg_css());
        if (!blkcg)
                goto out;
-       blkg = blkg_lookup(blkcg, disk);
+       blkg = blkg_lookup(blkcg, disk->queue);
        if (!blkg)
                goto out;
        if (!blkg_tryget(blkg))