From: Christoph Hellwig <hch@lst.de>
Date: Sat, 27 Jun 2020 07:31:55 +0000 (+0200)
Subject: blk-cgroup: remove the !bio->bi_blkg check in blkcg_bio_issue_check
X-Git-Tag: v5.15~3211^2~88
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81630e27fff3dc1ccbf64ecb48a70170d7071545;p=platform%2Fkernel%2Flinux-starfive.git

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

This is purely a sanity check for grave programming errors.  Remove it
to simplify further work in this area.

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 60df972..8e86b59 100644
--- 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;