diff options
| author | Tejun Heo <tj@kernel.org> | 2012-03-08 10:53:57 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-03-20 12:45:37 +0100 |
| commit | 5fe224d2d5fbf8f020b30d0ba69fed7856923752 (patch) | |
| tree | 26941c40cd28c4f7070e8edab338d340afd2bc99 /block/blk-cgroup.h | |
| parent | 1cd9e039fc258f91fe38b97b3c622b13a3b8a795 (diff) | |
| download | linux-stable-5fe224d2d5fbf8f020b30d0ba69fed7856923752.tar.gz linux-stable-5fe224d2d5fbf8f020b30d0ba69fed7856923752.tar.bz2 linux-stable-5fe224d2d5fbf8f020b30d0ba69fed7856923752.zip | |
blkcg: don't use percpu for merged stats
With recent plug merge updates, merged stats are no longer called for
plug merges and now only updated while holding queue_lock. As
stats_lock is scheduled to be removed, there's no reason to use percpu
for merged stats. Don't use percpu for merged stats.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-cgroup.h')
| -rw-r--r-- | block/blk-cgroup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 1de32fe0e2af..6c8e3e345426 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -29,10 +29,12 @@ enum blkio_policy_id { #ifdef CONFIG_BLK_CGROUP enum stat_type { + /* Number of IOs merged */ + BLKIO_STAT_MERGED, /* Total time spent (in ns) between request dispatch to the driver and * request completion for IOs doen by this cgroup. This may not be * accurate when NCQ is turned on. */ - BLKIO_STAT_SERVICE_TIME = 0, + BLKIO_STAT_SERVICE_TIME, /* Total time spent waiting in scheduler queue in ns */ BLKIO_STAT_WAIT_TIME, /* Number of IOs queued up */ @@ -57,8 +59,6 @@ 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 }; |