From ba7645bf5d82d0acc2764bd40646eb2a7200f77e Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Wed, 27 May 2009 14:50:02 +0200 Subject: [PATCH] --- yaml --- r: 147065 b: refs/heads/master c: 3c4198e874cde694f5ea1463706873e7907bdb18 h: refs/heads/master i: 147063: f6e65d184be7c6e9b62347d340da893600b9b70c v: v3 --- [refs] | 2 +- trunk/block/blk.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2719bf775574..634f059b0c80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba396a6c104682dfe5c8b4fbbf5974d5ac9f3687 +refs/heads/master: 3c4198e874cde694f5ea1463706873e7907bdb18 diff --git a/trunk/block/blk.h b/trunk/block/blk.h index c863ec2281e0..3fae6add5430 100644 --- a/trunk/block/blk.h +++ b/trunk/block/blk.h @@ -156,12 +156,12 @@ static inline int blk_cpu_to_group(int cpu) * * 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 + * c) it's a file system request or a discard request */ static inline int blk_do_io_stat(struct request *rq) { - return rq->rq_disk && blk_rq_io_stat(rq) && blk_fs_request(rq) && - blk_discard_rq(rq); + return rq->rq_disk && blk_rq_io_stat(rq) && + (blk_fs_request(rq) || blk_discard_rq(rq)); } #endif