Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f70fb66 authored by Dennis Zhou's avatar Dennis Zhou Committed by Jens Axboe
Browse files

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: default avatarDennis Zhou <dennis@kernel.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent fc5a828b

block/bio.c

+1 −10
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx, 


void bio_uninit(struct bio *bio)

{

	bio_disassociate_task(bio);

	bio_disassociate_blkg(bio);

}

EXPORT_SYMBOL(bio_uninit);
@@ -2073,15 +2073,6 @@ void bio_associate_blkg(struct bio *bio) 
}

EXPORT_SYMBOL_GPL(bio_associate_blkg);



/**

 * bio_disassociate_task - undo bio_associate_current()

 * @bio: target bio

 */

void bio_disassociate_task(struct bio *bio)

{

	bio_disassociate_blkg(bio);

}



/**

 * bio_clone_blkg_association - clone blkg association from src to dst bio

 * @dst: destination bio

include/linux/bio.h

+0 −2
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ void bio_disassociate_blkg(struct bio *bio); 
void bio_associate_blkg(struct bio *bio);

void bio_associate_blkg_from_css(struct bio *bio,

				 struct cgroup_subsys_state *css);

void bio_disassociate_task(struct bio *bio);

void bio_clone_blkg_association(struct bio *dst, struct bio *src);

#else	/* CONFIG_BLK_CGROUP */

static inline void bio_disassociate_blkg(struct bio *bio) { }
@@ -524,7 +523,6 @@ static inline void bio_associate_blkg(struct bio *bio) { } 
static inline void bio_associate_blkg_from_css(struct bio *bio,

					       struct cgroup_subsys_state *css)

{ }

static inline void bio_disassociate_task(struct bio *bio) { }

static inline void bio_clone_blkg_association(struct bio *dst,

					      struct bio *src) { }

#endif	/* CONFIG_BLK_CGROUP */