block: make blk_do_io_stat() do the full "is this rq accountable" checks

We currently check for file system requests outside of blk_do_io_stat(rq),
but we may as well just include it.

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2009-04-24 08:10:11 +02:00
commit c2553b5844
2 changed files with 11 additions and 10 deletions

View file

@ -149,9 +149,16 @@ static inline int blk_cpu_to_group(int cpu)
#endif
}
/*
* Contribute to IO statistics IFF:
*
* a) it's attached to a gendisk, and
* b) the queue had IO stats enabled when this request was started, and
* c) it's a file system request
*/
static inline int blk_do_io_stat(struct request *rq)
{
return rq->rq_disk && blk_rq_io_stat(rq);
return rq->rq_disk && blk_rq_io_stat(rq) && blk_fs_request(rq);
}
#endif