diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-08-10 13:28:07 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-11 15:41:25 -0600 |
| commit | b86d865cb1cae1e61527ea0b8977078bbf694328 (patch) | |
| tree | e78dcb385ae1f412bea1930a77171a5a39ab1f50 /block | |
| parent | 46451874c7c9afaa4e014aea0f0970f886444e0d (diff) | |
| download | linux-b86d865cb1cae1e61527ea0b8977078bbf694328.tar.gz linux-b86d865cb1cae1e61527ea0b8977078bbf694328.tar.bz2 linux-b86d865cb1cae1e61527ea0b8977078bbf694328.zip | |
blkcg: Make blkg_root_lookup() work for queues in bypass mode
For legacy queues the only call of blkg_root_lookup() happens after
bypass mode has been enabled. Since blkg_lookup() returns NULL for
queues in bypass mode, modify the blkg_root_lookup() such that it
no longer depends on bypass mode. Rename the function into
blk_queue_root_blkg() as suggested by Tejun.
Suggested-by: Tejun Heo <tj@kernel.org>
Fixes: 6bad9b210a22 ("blkcg: Introduce blkg_root_lookup()")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 380bc284ced1..bb109bb0a055 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -813,7 +813,7 @@ static void __blk_release_queue(struct work_struct *work) blk_exit_queue(q); } - WARN(blkg_root_lookup(q), + WARN(blk_queue_root_blkg(q), "request queue %p is being released but it has not yet been removed from the blkcg controller\n", q); |