GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 17:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: remove bio_disassociate_blkg

Browse source 
bio_disassociate_blkg has two callers, of which one immediately assigns
a new value to >bi_blkg.  Just open code the function in the two callers.

Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-06-27 09:31:47 +02:00 • committed by Jens Axboe
parent 4ef2c5c246
commit db9819c76c
2 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
block/bio.c
View file

@ -234,8 +234,12 @@ fallback:
void bio_uninit(struct bio *bio) void bio_uninit(struct bio *bio)
{ {
bio_disassociate_blkg(bio); #ifdef CONFIG_BLK_CGROUP
if (bio->bi_blkg) {
blkg_put(bio->bi_blkg);
bio->bi_blkg = NULL;
}
#endif
if (bio_integrity(bio)) if (bio_integrity(bio))
bio_integrity_free(bio); bio_integrity_free(bio);
@ -1625,21 +1629,6 @@ EXPORT_SYMBOL(bioset_init_from_src);
#ifdef CONFIG_BLK_CGROUP #ifdef CONFIG_BLK_CGROUP
/**
* bio_disassociate_blkg - puts back the blkg reference if associated
* @bio: target bio
*
* Helper to disassociate the blkg from @bio if a blkg is associated.
*/
void bio_disassociate_blkg(struct bio *bio)
{
if (bio->bi_blkg) {
blkg_put(bio->bi_blkg);
bio->bi_blkg = NULL;
}
}
EXPORT_SYMBOL_GPL(bio_disassociate_blkg);
/** /**
* __bio_associate_blkg - associate a bio with the a blkg * __bio_associate_blkg - associate a bio with the a blkg
* @bio: target bio * @bio: target bio
@ -1656,8 +1645,8 @@ EXPORT_SYMBOL_GPL(bio_disassociate_blkg);
*/ */
static void __bio_associate_blkg(struct bio *bio, struct blkcg_gq *blkg) static void __bio_associate_blkg(struct bio *bio, struct blkcg_gq *blkg)
{ {
bio_disassociate_blkg(bio); if (bio->bi_blkg)
blkg_put(bio->bi_blkg);
bio->bi_blkg = blkg_tryget_closest(blkg); bio->bi_blkg = blkg_tryget_closest(blkg);
} }

2
include/linux/bio.h
View file

@ -497,13 +497,11 @@ static inline void bio_associate_blkg_from_page(struct bio *bio,
#endif #endif
#ifdef CONFIG_BLK_CGROUP #ifdef CONFIG_BLK_CGROUP
void bio_disassociate_blkg(struct bio *bio);
void bio_associate_blkg(struct bio *bio); void bio_associate_blkg(struct bio *bio);
void bio_associate_blkg_from_css(struct bio *bio, void bio_associate_blkg_from_css(struct bio *bio,
struct cgroup_subsys_state *css); struct cgroup_subsys_state *css);
void bio_clone_blkg_association(struct bio *dst, struct bio *src); void bio_clone_blkg_association(struct bio *dst, struct bio *src);
#else /* CONFIG_BLK_CGROUP */ #else /* CONFIG_BLK_CGROUP */
static inline void bio_disassociate_blkg(struct bio *bio) { }
static inline void bio_associate_blkg(struct bio *bio) { } static inline void bio_associate_blkg(struct bio *bio) { }
static inline void bio_associate_blkg_from_css(struct bio *bio, static inline void bio_associate_blkg_from_css(struct bio *bio,
struct cgroup_subsys_state *css) struct cgroup_subsys_state *css)