From 3f6547bfacf9def82aa3bec6fbd75aafdad18897 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 24 Apr 2009 08:12:19 +0200
Subject: [PATCH] --- yaml --- r: 146985 b: refs/heads/master c:
 c69d48540c201394d08cb4d48b905e001313d9b8 h: refs/heads/master i:   146983:
 7c0a71575af3108a1a2ff95f366a976ab986eeb3 v: v3

---
 [refs]            | 2 +-
 trunk/block/blk.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e33175a01a7..9a7ff74263c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2553b5844b06910435e40cfab9e6f384840cb97
+refs/heads/master: c69d48540c201394d08cb4d48b905e001313d9b8
diff --git a/trunk/block/blk.h b/trunk/block/blk.h
index 404c10b25ca1..51115599df9b 100644
--- a/trunk/block/blk.h
+++ b/trunk/block/blk.h
@@ -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