blkcg: associate blkg when associating a device

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

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index cdbd10564e666b5fb94894f9ee7f8d0949702ad1..e6b47c2555213958e34598074ab08453f614f846 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -472,14 +472,12 @@ static void check_scale_change(struct iolatency_grp *iolat)
 static void blkcg_iolatency_throttle(struct rq_qos *rqos, struct bio *bio)
 {
        struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos);
-       struct blkcg_gq *blkg;
+       struct blkcg_gq *blkg = bio->bi_blkg;
        bool issue_as_root = bio_issue_as_root_blkg(bio);
 
        if (!blk_iolatency_enabled(blkiolat))
                return;
 
-       bio_associate_blkg(bio);
-       blkg = bio->bi_blkg;
        bio_issue_init(&bio->bi_issue, bio_sectors(bio));
 
        while (blkg && blkg->parent) {