diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2011-05-23 10:02:19 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-05-23 10:02:19 +0200 |
| commit | 317389a7739675aa990b7e0d750a7c435f1d25d7 (patch) | |
| tree | c24b7bb45d03233d76405dab4f9406c05c44eafa /block/blk-cgroup.h | |
| parent | cfq-iosched: Fix a memory leak of per cpu stats for root group (diff) | |
| download | linux-317389a7739675aa990b7e0d750a7c435f1d25d7.tar.xz linux-317389a7739675aa990b7e0d750a7c435f1d25d7.zip | |
cfq-iosched: Make IO merge related stats per cpu
Make BLKIO_STAT_MERGED per cpu hence gettring rid of need of taking
blkg->stats_lock.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-cgroup.h')
| -rw-r--r-- | block/blk-cgroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 262226798093..a71d2904ffb9 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -39,8 +39,6 @@ enum stat_type { BLKIO_STAT_SERVICE_TIME = 0, /* Total time spent waiting in scheduler queue in ns */ BLKIO_STAT_WAIT_TIME, - /* Number of IOs merged */ - BLKIO_STAT_MERGED, /* Number of IOs queued up */ BLKIO_STAT_QUEUED, /* All the single valued stats go below this */ @@ -63,6 +61,8 @@ enum stat_type_cpu { BLKIO_STAT_CPU_SERVICE_BYTES, /* Total IOs serviced, post merge */ BLKIO_STAT_CPU_SERVICED, + /* Number of IOs merged */ + BLKIO_STAT_CPU_MERGED, BLKIO_STAT_CPU_NR }; |