blkcg: don't use percpu for merged stats
commit5fe224d2d5fbf8f020b30d0ba69fed7856923752
authorTejun Heo <tj@kernel.org>
Thu, 8 Mar 2012 18:53:57 +0000 (8 10:53 -0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 20 Mar 2012 11:45:37 +0000 (20 12:45 +0100)
tree26941c40cd28c4f7070e8edab338d340afd2bc99
parent1cd9e039fc258f91fe38b97b3c622b13a3b8a795
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>
block/blk-cgroup.c
block/blk-cgroup.h