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

Commit aaec55a0 authored by Tejun Heo's avatar Tejun Heo
Browse files

blkcg: remove unused @pol and @plid parameters 



@pol to blkg_to_pdata() and @plid to blkg_lookup_create() are no
longer necessary.  Drop them.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 959d851c

block/blk-cgroup.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -568,7 +568,6 @@ static struct blkio_group *blkg_alloc(struct blkio_cgroup *blkcg, 




struct blkio_group *blkg_lookup_create(struct blkio_cgroup *blkcg,

struct blkio_group *blkg_lookup_create(struct blkio_cgroup *blkcg,

				       struct request_queue *q,

				       struct request_queue *q,

				       enum blkio_policy_id plid,

				       bool for_root)

				       bool for_root)

	__releases(q->queue_lock) __acquires(q->queue_lock)

	__releases(q->queue_lock) __acquires(q->queue_lock)

{

{
@@ -1027,7 +1026,7 @@ static int blkio_policy_parse_and_set(char *buf, enum blkio_policy_id plid, 
	rcu_read_lock();

	rcu_read_lock();





	spin_lock_irq(disk->queue->queue_lock);

	spin_lock_irq(disk->queue->queue_lock);

	blkg = blkg_lookup_create(blkcg, disk->queue, plid, false);

	blkg = blkg_lookup_create(blkcg, disk->queue, false);

	spin_unlock_irq(disk->queue->queue_lock);

	spin_unlock_irq(disk->queue->queue_lock);





	if (IS_ERR(blkg)) {

	if (IS_ERR(blkg)) {

block/blk-cgroup.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -266,13 +266,10 @@ static inline void *blkg_to_pdata(struct blkio_group *blkg, 
/**

/**

 * pdata_to_blkg - get blkg associated with policy private data

 * pdata_to_blkg - get blkg associated with policy private data

 * @pdata: policy private data of interest

 * @pdata: policy private data of interest

 * @pol: policy @pdata is for

 *

 *

 * @pdata is policy private data for @pol.  Determine the blkg it's

 * @pdata is policy private data.  Determine the blkg it's associated with.

 * associated with.

 */

 */

static inline struct blkio_group *pdata_to_blkg(void *pdata,

static inline struct blkio_group *pdata_to_blkg(void *pdata)

						struct blkio_policy_type *pol)

{

{

	if (pdata) {

	if (pdata) {

		struct blkg_policy_data *pd =

		struct blkg_policy_data *pd =
@@ -402,7 +399,6 @@ extern struct blkio_group *blkg_lookup(struct blkio_cgroup *blkcg, 
				       struct request_queue *q);

				       struct request_queue *q);

struct blkio_group *blkg_lookup_create(struct blkio_cgroup *blkcg,

struct blkio_group *blkg_lookup_create(struct blkio_cgroup *blkcg,

				       struct request_queue *q,

				       struct request_queue *q,

				       enum blkio_policy_id plid,

				       bool for_root);

				       bool for_root);

void blkiocg_update_timeslice_used(struct blkio_group *blkg,

void blkiocg_update_timeslice_used(struct blkio_group *blkg,

				   struct blkio_policy_type *pol,

				   struct blkio_policy_type *pol,

block/blk-throttle.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ static inline struct throtl_grp *blkg_to_tg(struct blkio_group *blkg) 




static inline struct blkio_group *tg_to_blkg(struct throtl_grp *tg)

static inline struct blkio_group *tg_to_blkg(struct throtl_grp *tg)

{

{

	return pdata_to_blkg(tg, &blkio_policy_throtl);

	return pdata_to_blkg(tg);

}

}





enum tg_state_flags {

enum tg_state_flags {
@@ -185,7 +185,7 @@ static struct throtl_grp *throtl_lookup_create_tg(struct throtl_data *td, 
	} else {

	} else {

		struct blkio_group *blkg;

		struct blkio_group *blkg;





		blkg = blkg_lookup_create(blkcg, q, BLKIO_POLICY_THROTL, false);

		blkg = blkg_lookup_create(blkcg, q, false);





		/* if %NULL and @q is alive, fall back to root_tg */

		/* if %NULL and @q is alive, fall back to root_tg */

		if (!IS_ERR(blkg))

		if (!IS_ERR(blkg))
@@ -1033,8 +1033,7 @@ int blk_throtl_init(struct request_queue *q) 
	rcu_read_lock();

	rcu_read_lock();

	spin_lock_irq(q->queue_lock);

	spin_lock_irq(q->queue_lock);





	blkg = blkg_lookup_create(&blkio_root_cgroup, q, BLKIO_POLICY_THROTL,

	blkg = blkg_lookup_create(&blkio_root_cgroup, q, true);

				  true);

	if (!IS_ERR(blkg))

	if (!IS_ERR(blkg))

		td->root_tg = blkg_to_tg(blkg);

		td->root_tg = blkg_to_tg(blkg);

block/cfq-iosched.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ static inline struct cfq_group *blkg_to_cfqg(struct blkio_group *blkg) 




static inline struct blkio_group *cfqg_to_blkg(struct cfq_group *cfqg)

static inline struct blkio_group *cfqg_to_blkg(struct cfq_group *cfqg)

{

{

	return pdata_to_blkg(cfqg, &blkio_policy_cfq);

	return pdata_to_blkg(cfqg);

}

}





static inline void cfqg_get(struct cfq_group *cfqg)

static inline void cfqg_get(struct cfq_group *cfqg)
@@ -1092,7 +1092,7 @@ static struct cfq_group *cfq_lookup_create_cfqg(struct cfq_data *cfqd, 
	} else {

	} else {

		struct blkio_group *blkg;

		struct blkio_group *blkg;





		blkg = blkg_lookup_create(blkcg, q, BLKIO_POLICY_PROP, false);

		blkg = blkg_lookup_create(blkcg, q, false);

		if (!IS_ERR(blkg))

		if (!IS_ERR(blkg))

			cfqg = blkg_to_cfqg(blkg);

			cfqg = blkg_to_cfqg(blkg);

	}

	}
@@ -3523,8 +3523,7 @@ static int cfq_init_queue(struct request_queue *q) 
	rcu_read_lock();

	rcu_read_lock();

	spin_lock_irq(q->queue_lock);

	spin_lock_irq(q->queue_lock);





	blkg = blkg_lookup_create(&blkio_root_cgroup, q, BLKIO_POLICY_PROP,

	blkg = blkg_lookup_create(&blkio_root_cgroup, q, true);

				  true);

	if (!IS_ERR(blkg))

	if (!IS_ERR(blkg))

		cfqd->root_group = blkg_to_cfqg(blkg);

		cfqd->root_group = blkg_to_cfqg(blkg);