iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blkcg: put back rcu lock in blkcg_bio_issue_check()

Browse Source 
I was a little overzealous in removing the rcu_read_lock() call from
blkcg_bio_issue_check() and it broke blk-throttle. Put it back.

Fixes: e35403a034bf ("blkcg: associate blkg when associating a device")
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Dennis Zhou 2018-12-06 12:49:38 -05:00 committed by Jens Axboe
parent d3fcdff190
commit 4705de735b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/blk-cgroup.h
View File

@ -764,6 +764,8 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q,
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
bool throtl = false; bool throtl = false;
rcu_read_lock();
if (!bio->bi_blkg) { if (!bio->bi_blkg) {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
@ -791,6 +793,7 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q,
blkcg_bio_issue_init(bio); blkcg_bio_issue_init(bio);
rcu_read_unlock();
return !throtl; return !throtl;
} }