From f9ba52616b463bf98d416da4a2a842d75e947341 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Thu, 24 Jun 2010 07:43:57 +0800
Subject: [PATCH] --- yaml --- r: 200632 b: refs/heads/master c:
 1b99973f1c82707e46e8cb9416865a1e955e8f8c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 56621d89ff27..a6e6ac99680e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e495db1a1f931e82c9edccd677dd171be5b85d2
+refs/heads/master: 1b99973f1c82707e46e8cb9416865a1e955e8f8c
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 3deca77e0254..f0640d7f800f 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -1583,7 +1583,7 @@ void submit_bio(int rw, struct bio *bio)
 	 * If it's a regular read/write or a barrier with data attached,
 	 * go through the normal accounting stuff before submission.
 	 */
-	if (bio_has_data(bio)) {
+	if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) {
 		if (rw & WRITE) {
 			count_vm_events(PGPGOUT, count);
 		} else {