Commit 9a0785b0da561e1e9c6617df85e93ae107a42f18
Committed by
Jens Axboe
Jens Axboe
1 parent
ed6b6dc7c1
Exists in
master
and in
7 other branches
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: Divyesh Shah<dpshah@google.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Showing 3 changed files with 5 additions and 14 deletions Side-by-side Diff
block/blk-cgroup.c
| ... | ... | @@ -56,10 +56,9 @@ |
| 56 | 56 | EXPORT_SYMBOL_GPL(cgroup_to_blkio_cgroup); |
| 57 | 57 | |
| 58 | 58 | void blkiocg_update_blkio_group_stats(struct blkio_group *blkg, |
| 59 | - unsigned long time, unsigned long sectors) | |
| 59 | + unsigned long time) | |
| 60 | 60 | { |
| 61 | 61 | blkg->time += time; |
| 62 | - blkg->sectors += sectors; | |
| 63 | 62 | } |
| 64 | 63 | EXPORT_SYMBOL_GPL(blkiocg_update_blkio_group_stats); |
| 65 | 64 |
block/blk-cgroup.h
| ... | ... | @@ -106,7 +106,7 @@ |
| 106 | 106 | extern struct blkio_group *blkiocg_lookup_group(struct blkio_cgroup *blkcg, |
| 107 | 107 | void *key); |
| 108 | 108 | void blkiocg_update_blkio_group_stats(struct blkio_group *blkg, |
| 109 | - unsigned long time, unsigned long sectors); | |
| 109 | + unsigned long time); | |
| 110 | 110 | #else |
| 111 | 111 | struct cgroup; |
| 112 | 112 | static inline struct blkio_cgroup * |
| ... | ... | @@ -123,9 +123,7 @@ |
| 123 | 123 | static inline struct blkio_group * |
| 124 | 124 | blkiocg_lookup_group(struct blkio_cgroup *blkcg, void *key) { return NULL; } |
| 125 | 125 | static inline void blkiocg_update_blkio_group_stats(struct blkio_group *blkg, |
| 126 | - unsigned long time, unsigned long sectors) | |
| 127 | -{ | |
| 128 | -} | |
| 126 | + unsigned long time) {} | |
| 129 | 127 | #endif |
| 130 | 128 | #endif /* _BLK_CGROUP_H */ |
block/cfq-iosched.c
| ... | ... | @@ -142,8 +142,6 @@ |
| 142 | 142 | struct cfq_queue *new_cfqq; |
| 143 | 143 | struct cfq_group *cfqg; |
| 144 | 144 | struct cfq_group *orig_cfqg; |
| 145 | - /* Sectors dispatched in current dispatch round */ | |
| 146 | - unsigned long nr_sectors; | |
| 147 | 145 | }; |
| 148 | 146 | |
| 149 | 147 | /* |
| ... | ... | @@ -883,8 +881,7 @@ |
| 883 | 881 | slice_used = cfqq->allocated_slice; |
| 884 | 882 | } |
| 885 | 883 | |
| 886 | - cfq_log_cfqq(cfqq->cfqd, cfqq, "sl_used=%u sect=%lu", slice_used, | |
| 887 | - cfqq->nr_sectors); | |
| 884 | + cfq_log_cfqq(cfqq->cfqd, cfqq, "sl_used=%u", slice_used); | |
| 888 | 885 | return slice_used; |
| 889 | 886 | } |
| 890 | 887 | |
| ... | ... | @@ -918,8 +915,7 @@ |
| 918 | 915 | |
| 919 | 916 | cfq_log_cfqg(cfqd, cfqg, "served: vt=%llu min_vt=%llu", cfqg->vdisktime, |
| 920 | 917 | st->min_vdisktime); |
| 921 | - blkiocg_update_blkio_group_stats(&cfqg->blkg, used_sl, | |
| 922 | - cfqq->nr_sectors); | |
| 918 | + blkiocg_update_blkio_group_stats(&cfqg->blkg, used_sl); | |
| 923 | 919 | } |
| 924 | 920 | |
| 925 | 921 | #ifdef CONFIG_CFQ_GROUP_IOSCHED |
| ... | ... | @@ -1525,7 +1521,6 @@ |
| 1525 | 1521 | cfqq->allocated_slice = 0; |
| 1526 | 1522 | cfqq->slice_end = 0; |
| 1527 | 1523 | cfqq->slice_dispatch = 0; |
| 1528 | - cfqq->nr_sectors = 0; | |
| 1529 | 1524 | |
| 1530 | 1525 | cfq_clear_cfqq_wait_request(cfqq); |
| 1531 | 1526 | cfq_clear_cfqq_must_dispatch(cfqq); |
| ... | ... | @@ -1870,7 +1865,6 @@ |
| 1870 | 1865 | elv_dispatch_sort(q, rq); |
| 1871 | 1866 | |
| 1872 | 1867 | cfqd->rq_in_flight[cfq_cfqq_sync(cfqq)]++; |
| 1873 | - cfqq->nr_sectors += blk_rq_sectors(rq); | |
| 1874 | 1868 | } |
| 1875 | 1869 | |
| 1876 | 1870 | /* |