---

yaml --- r: 147065 b: refs/heads/master c: 3c4198e h: refs/heads/master i: 147063: f6e65d1 v: v3
git-mirror · May 27, 2009 · ba7645b · ba7645b
1 parent 55f608f
commit ba7645b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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