blk-cgroup: remove the !bio->bi_blkg check in blkcg_bio_issue_check

[sfrench/cifs-2.6.git] / include / linux / blk-cgroup.h

diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 60df97202314c7a16e9a778fb7d6a998ba3cd65d..8e86b598316c104d5de2d9628f95b782485d2159 100644 (file)
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -543,24 +543,11 @@ static inline void blkcg_bio_issue_init(struct bio *bio)
 static inline bool blkcg_bio_issue_check(struct request_queue *q,
                                         struct bio *bio)
 {
-       struct blkcg_gq *blkg;
+       struct blkcg_gq *blkg = bio->bi_blkg;
        bool throtl = false;
 
        rcu_read_lock();
-
-       if (!bio->bi_blkg) {
-               char b[BDEVNAME_SIZE];
-
-               WARN_ONCE(1,
-                         "no blkg associated for bio on block-device: %s\n",
-                         bio_devname(bio, b));
-               bio_associate_blkg(bio);
-       }
-
-       blkg = bio->bi_blkg;
-
        throtl = blk_throtl_bio(q, blkg, bio);
-
        if (!throtl) {
                struct blkg_iostat_set *bis;
                int rwd, cpu;