block: fix inconsistency in I/O stat accounting code
authorJerome Marchand <jmarchan@redhat.com>
Fri, 27 Mar 2009 09:31:51 +0000 (10:31 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 7 Apr 2009 06:12:38 +0000 (08:12 +0200)
commit26308eab69aa193f7b3fb50764a64ae14544a39b
tree758f6100395a23228d042c3a9d6f7dc1922d7530
parent6c7e8cee6a9128eeb7f83c3ad1cb243f77f5cb16
block: fix inconsistency in I/O stat accounting code

This forces in_flight to be zero when turning off or on the I/O stat
accounting and stops updating I/O stats in attempt_merge() when
accounting is turned off.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-core.c
block/blk-merge.c
block/blk-sysfs.c
block/blk.h
block/elevator.c
include/linux/elevator.h