summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDennis Zhou <dennis@kernel.org>2018-12-05 12:10:37 -0500
committerJens Axboe <axboe@kernel.dk>2018-12-08 00:26:38 -0500
commit6f70fb66182b02e50deea65e9a3a86b7bf659a39 (patch)
tree79c0e29795545ef9a737d26e82f5a8bfea3b1444 /block
parentfc5a828bfad628c1092194f2814604943561c52d (diff)
blkcg: remove bio_disassociate_task()
Now that a bio only holds a blkg reference, so clean up is simply putting back that reference. Remove bio_disassociate_task() as it just calls bio_disassociate_blkg() and call the latter directly. Signed-off-by: Dennis Zhou <dennis@kernel.org> Acked-by: Tejun Heo <tj@kernel.org> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bio.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/block/bio.c b/block/bio.c
index ce1e512dca5a..7ec5316e6ecc 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -244,7 +244,7 @@ fallback:
244 244
245void bio_uninit(struct bio *bio) 245void bio_uninit(struct bio *bio)
246{ 246{
247 bio_disassociate_task(bio); 247 bio_disassociate_blkg(bio);
248} 248}
249EXPORT_SYMBOL(bio_uninit); 249EXPORT_SYMBOL(bio_uninit);
250 250
@@ -2074,15 +2074,6 @@ void bio_associate_blkg(struct bio *bio)
2074EXPORT_SYMBOL_GPL(bio_associate_blkg); 2074EXPORT_SYMBOL_GPL(bio_associate_blkg);
2075 2075
2076/** 2076/**
2077 * bio_disassociate_task - undo bio_associate_current()
2078 * @bio: target bio
2079 */
2080void bio_disassociate_task(struct bio *bio)
2081{
2082 bio_disassociate_blkg(bio);
2083}
2084
2085/**
2086 * bio_clone_blkg_association - clone blkg association from src to dst bio 2077 * bio_clone_blkg_association - clone blkg association from src to dst bio
2087 * @dst: destination bio 2078 * @dst: destination bio
2088 * @src: source bio 2079 * @src: source bio