diff options
| author |   Dennis Zhou <dennis@kernel.org> | 2018-12-05 12:10:31 -0500 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-12-07 22:26:37 -0700 |
| commit | 5cdf2e3fea5ee37b66842d76a9b06e6dac0b933d (patch) | |
| tree | b460ef1ba02562982e2f000e704ce7214be4d5f3 /include/linux/bio.h | |
| parent | dm: set the static flush bio device on demand (diff) | |
| download | wireguard-linux-5cdf2e3fea5ee37b66842d76a9b06e6dac0b933d.tar.xz wireguard-linux-5cdf2e3fea5ee37b66842d76a9b06e6dac0b933d.zip | |
blkcg: associate blkg when associating a device
Previously, blkg association was handled by controller specific code in
blk-throttle and blk-iolatency. However, because a blkg represents a
relationship between a blkcg and a request_queue, it makes sense to keep
the blkg->q and bio->bi_disk->queue consistent.
This patch moves association into the bio_set_dev macro(). This should
cover the majority of cases where the device is set/changed keeping the
two pointers consistent. Fallback code is added to
blkcg_bio_issue_check() to catch any missing paths.
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 62715a5a4f32..6ee2ea8b378a 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -491,12 +491,14 @@ do { \ bio_clear_flag(bio, BIO_THROTTLED);\ (bio)->bi_disk = (bdev)->bd_disk; \ (bio)->bi_partno = (bdev)->bd_partno; \ + bio_associate_blkg(bio); \ } while (0) #define bio_copy_dev(dst, src) \ do { \ (dst)->bi_disk = (src)->bi_disk; \ (dst)->bi_partno = (src)->bi_partno; \ + bio_clone_blkcg_association(dst, src); \ } while (0) #define bio_dev(bio) \ |