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

Commit 9a0785b0 authored by Divyesh Shah's avatar Divyesh Shah Committed by Jens Axboe
Browse files

blkio: Remove per-cfqq nr_sectors as we'll be passing 



that info at request dispatch with other stats now. This patch removes the
existing support for accounting sectors for a blkio_group. This will be added
back differently in the next two patches.

Signed-off-by: default avatarDivyesh <Shah&lt;dpshah@google.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent ed6b6dc7

block/blk-cgroup.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -56,10 +56,9 @@ struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) 
EXPORT_SYMBOL_GPL(cgroup_to_blkio_cgroup);

EXPORT_SYMBOL_GPL(cgroup_to_blkio_cgroup);





void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

			unsigned long time, unsigned long sectors)

						unsigned long time)

{

{

	blkg->time += time;

	blkg->time += time;

	blkg->sectors += sectors;

}

}

EXPORT_SYMBOL_GPL(blkiocg_update_blkio_group_stats);

EXPORT_SYMBOL_GPL(blkiocg_update_blkio_group_stats);

block/blk-cgroup.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ extern int blkiocg_del_blkio_group(struct blkio_group *blkg); 
extern struct blkio_group *blkiocg_lookup_group(struct blkio_cgroup *blkcg,

extern struct blkio_group *blkiocg_lookup_group(struct blkio_cgroup *blkcg,

						void *key);

						void *key);

void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

			unsigned long time, unsigned long sectors);

						unsigned long time);

#else

#else

struct cgroup;

struct cgroup;

static inline struct blkio_cgroup *

static inline struct blkio_cgroup *
@@ -123,8 +123,6 @@ blkiocg_del_blkio_group(struct blkio_group *blkg) { return 0; } 
static inline struct blkio_group *

static inline struct blkio_group *

blkiocg_lookup_group(struct blkio_cgroup *blkcg, void *key) { return NULL; }

blkiocg_lookup_group(struct blkio_cgroup *blkcg, void *key) { return NULL; }

static inline void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

static inline void blkiocg_update_blkio_group_stats(struct blkio_group *blkg,

			unsigned long time, unsigned long sectors)

						unsigned long time) {}

{

}

#endif

#endif

#endif /* _BLK_CGROUP_H */
 
#endif /* _BLK_CGROUP_H */

block/cfq-iosched.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -142,8 +142,6 @@ struct cfq_queue { 
	struct cfq_queue *new_cfqq;

	struct cfq_queue *new_cfqq;

	struct cfq_group *cfqg;

	struct cfq_group *cfqg;

	struct cfq_group *orig_cfqg;

	struct cfq_group *orig_cfqg;

	/* Sectors dispatched in current dispatch round */

	unsigned long nr_sectors;

};

};





/*

/*
@@ -883,8 +881,7 @@ static inline unsigned int cfq_cfqq_slice_usage(struct cfq_queue *cfqq) 
			slice_used = cfqq->allocated_slice;

			slice_used = cfqq->allocated_slice;

	}

	}





	cfq_log_cfqq(cfqq->cfqd, cfqq, "sl_used=%u sect=%lu", slice_used,

	cfq_log_cfqq(cfqq->cfqd, cfqq, "sl_used=%u", slice_used);

				cfqq->nr_sectors);

	return slice_used;

	return slice_used;

}

}
@@ -918,8 +915,7 @@ static void cfq_group_served(struct cfq_data *cfqd, struct cfq_group *cfqg, 




	cfq_log_cfqg(cfqd, cfqg, "served: vt=%llu min_vt=%llu", cfqg->vdisktime,

	cfq_log_cfqg(cfqd, cfqg, "served: vt=%llu min_vt=%llu", cfqg->vdisktime,

					st->min_vdisktime);

					st->min_vdisktime);

	blkiocg_update_blkio_group_stats(&cfqg->blkg, used_sl,

	blkiocg_update_blkio_group_stats(&cfqg->blkg, used_sl);

						cfqq->nr_sectors);

}

}





#ifdef CONFIG_CFQ_GROUP_IOSCHED

#ifdef CONFIG_CFQ_GROUP_IOSCHED
@@ -1525,7 +1521,6 @@ static void __cfq_set_active_queue(struct cfq_data *cfqd, 
		cfqq->allocated_slice = 0;

		cfqq->allocated_slice = 0;

		cfqq->slice_end = 0;

		cfqq->slice_end = 0;

		cfqq->slice_dispatch = 0;

		cfqq->slice_dispatch = 0;

		cfqq->nr_sectors = 0;





		cfq_clear_cfqq_wait_request(cfqq);

		cfq_clear_cfqq_wait_request(cfqq);

		cfq_clear_cfqq_must_dispatch(cfqq);

		cfq_clear_cfqq_must_dispatch(cfqq);
@@ -1870,7 +1865,6 @@ static void cfq_dispatch_insert(struct request_queue *q, struct request *rq) 
	elv_dispatch_sort(q, rq);

	elv_dispatch_sort(q, rq);





	cfqd->rq_in_flight[cfq_cfqq_sync(cfqq)]++;

	cfqd->rq_in_flight[cfq_cfqq_sync(cfqq)]++;

	cfqq->nr_sectors += blk_rq_sectors(rq);

}

}





/*

/*