diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-06-27 09:31:58 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-06-29 09:09:08 -0600 |
| commit | db18a53e5ba840993a3fc908dec648402ed740bd (patch) | |
| tree | ac817b02802ddc83d978605d1b6a4cf687dc59a1 /block/blk-core.c | |
| parent | blk-cgroup: move rcu locking from blkcg_bio_issue_check to blk_throtl_bio (diff) | |
| download | linux-dev-db18a53e5ba840993a3fc908dec648402ed740bd.tar.xz linux-dev-db18a53e5ba840993a3fc908dec648402ed740bd.zip | |
blk-cgroup: remove blkcg_bio_issue_check
blkcg_bio_issue_check is a giant inline function that does three entirely
different things. Factor out the blk-cgroup related bio initalization
into a new helper, and the open code the sequence in the only caller,
relying on the fact that all the actual functionality is stubbed out for
non-cgroup builds.
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index a9769c1a2875..76cfd5709f66 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1073,8 +1073,13 @@ generic_make_request_checks(struct bio *bio) if (unlikely(!current->io_context)) create_task_io_context(current, GFP_ATOMIC, q->node); - if (!blkcg_bio_issue_check(q, bio)) + if (blk_throtl_bio(bio)) { + blkcg_bio_issue_init(bio); return false; + } + + blk_cgroup_bio_start(bio); + blkcg_bio_issue_init(bio); if (!bio_flagged(bio, BIO_TRACE_COMPLETION)) { trace_block_bio_queue(q, bio); |