From 43c9ce4f2a44aef5a60cbfa793c304ad40abeb30 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 10 Dec 2006 02:19:47 -0800
Subject: [PATCH] --- yaml --- r: 43969 b: refs/heads/master c:
 98c4d57decf97bf8ddfe948a3266aa56b38b1a51 h: refs/heads/master i:   43967:
 a14fa94641db001a6544f99a68293dc373a4cc9f v: v3

---
 [refs]               | 2 +-
 trunk/fs/direct-io.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1aa63f30b1d5..4afb58563477 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f88cc2e9c29c181557b477ee396375906acbc90
+refs/heads/master: 98c4d57decf97bf8ddfe948a3266aa56b38b1a51
diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c
index 5981e17f46f0..45d34d807391 100644
--- a/trunk/fs/direct-io.c
+++ b/trunk/fs/direct-io.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/task_io_accounting_ops.h>
 #include <linux/bio.h>
 #include <linux/wait.h>
 #include <linux/err.h>
@@ -675,6 +676,13 @@ submit_page_section(struct dio *dio, struct page *page,
 {
 	int ret = 0;
 
+	if (dio->rw & WRITE) {
+		/*
+		 * Read accounting is performed in submit_bio()
+		 */
+		task_io_account_write(len);
+	}
+
 	/*
 	 * Can we just grow the current page's presence in the dio?
 	 */