---

yaml --- r: 200632 b: refs/heads/master c: 1b99973 h: refs/heads/master v: v3
git-mirror · Jun 24, 2010 · f9ba526 · f9ba526
1 parent 38f407e
commit f9ba526
Show file tree

Hide file tree

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