Commit af551fb3 authored by Shaohua Li's avatar Shaohua Li Committed by Jens Axboe
Browse files

blkcg: delete unused APIs 



Nobody uses the APIs right now.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 05e3db95

block/bio.c

+0 −31
Original line number Diff line number Diff line
@@ -2032,37 +2032,6 @@ int bio_associate_blkcg(struct bio *bio, struct cgroup_subsys_state *blkcg_css) 
}

EXPORT_SYMBOL_GPL(bio_associate_blkcg);



/**

 * bio_associate_current - associate a bio with %current

 * @bio: target bio

 *

 * Associate @bio with %current if it hasn't been associated yet.  Block

 * layer will treat @bio as if it were issued by %current no matter which

 * task actually issues it.

 *

 * This function takes an extra reference of @task's io_context and blkcg

 * which will be put when @bio is released.  The caller must own @bio,

 * ensure %current->io_context exists, and is responsible for synchronizing

 * calls to this function.

 */

int bio_associate_current(struct bio *bio)

{

	struct io_context *ioc;



	if (bio->bi_css)

		return -EBUSY;



	ioc = current->io_context;

	if (!ioc)

		return -ENOENT;



	get_io_context_active(ioc);

	bio->bi_ioc = ioc;

	bio->bi_css = task_get_css(current, io_cgrp_id);

	return 0;

}

EXPORT_SYMBOL_GPL(bio_associate_current);



/**

 * bio_disassociate_task - undo bio_associate_current()

 * @bio: target bio

include/linux/bio.h

+0 −2
Original line number Diff line number Diff line
@@ -522,13 +522,11 @@ do { \ 


#ifdef CONFIG_BLK_CGROUP

int bio_associate_blkcg(struct bio *bio, struct cgroup_subsys_state *blkcg_css);

int bio_associate_current(struct bio *bio);

void bio_disassociate_task(struct bio *bio);

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

#else	/* CONFIG_BLK_CGROUP */

static inline int bio_associate_blkcg(struct bio *bio,

			struct cgroup_subsys_state *blkcg_css) { return 0; }

static inline int bio_associate_current(struct bio *bio) { return -ENOENT; }

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

static inline void bio_clone_blkcg_association(struct bio *dst,

			struct bio *src) { }

include/linux/blk-cgroup.h

+0 −12
Original line number Diff line number Diff line
@@ -235,12 +235,6 @@ static inline struct blkcg *bio_blkcg(struct bio *bio) 
	return task_blkcg(current);

}



static inline struct cgroup_subsys_state *

task_get_blkcg_css(struct task_struct *task)

{

	return task_get_css(task, io_cgrp_id);

}



/**

 * blkcg_parent - get the parent of a blkcg

 * @blkcg: blkcg of interest
@@ -735,12 +729,6 @@ struct blkcg_policy { 


#define blkcg_root_css	((struct cgroup_subsys_state *)ERR_PTR(-EINVAL))



static inline struct cgroup_subsys_state *

task_get_blkcg_css(struct task_struct *task)

{

	return NULL;

}



#ifdef CONFIG_BLOCK



static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { return NULL; }