Commit c69d4854 authored Apr 24, 2009 by Jens Axboe

block: include discard requests in IO accounting



We currently don't do merging on discard requests, but we potentially
could. If we do, then we need to include discard requests in the IO
accounting, or merging would end up decrementing in_flight IO counters
for an IO which never incremented them.

So enable accounting for discard requests.

Problem found by Nikanth Karthikesan <knikanth@suse.de>

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parent c2553b58

block/blk.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,8 @@ static inline int blk_cpu_to_group(int cpu)
		*/
		static inline int blk_do_io_stat(struct request *rq)
		{
		return rq->rq_disk && blk_rq_io_stat(rq) && blk_fs_request(rq);
		return rq->rq_disk && blk_rq_io_stat(rq) && blk_fs_request(rq) &&
		blk_discard_rq(rq);
		}

		#endif