From 3dc0f7c734520ed8e40aef3a2c3b311409d81db7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 10 Dec 2006 02:19:35 -0800
Subject: [PATCH] --- yaml --- r: 43966 b: refs/heads/master c:
 faccbd4b26df7bd977cee33d4145155d0ef95c87 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/block/ll_rw_blk.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c3e48cfdffb3..42834f2e4566 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08748ce01e02f0ec154b141f392ccb9555333f4
+refs/heads/master: faccbd4b26df7bd977cee33d4145155d0ef95c87
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 4f83fd922377..785e61c9a810 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/swap.h>
 #include <linux/writeback.h>
+#include <linux/task_io_accounting_ops.h>
 #include <linux/interrupt.h>
 #include <linux/cpu.h>
 #include <linux/blktrace_api.h>
@@ -3235,10 +3236,12 @@ void submit_bio(int rw, struct bio *bio)
 	BIO_BUG_ON(!bio->bi_size);
 	BIO_BUG_ON(!bio->bi_io_vec);
 	bio->bi_rw |= rw;
-	if (rw & WRITE)
+	if (rw & WRITE) {
 		count_vm_events(PGPGOUT, count);
-	else
+	} else {
+		task_io_account_read(bio->bi_size);
 		count_vm_events(PGPGIN, count);
+	}
 
 	if (unlikely(block_dump)) {
 		char b[BDEVNAME_SIZE];