From 4d5fca28a2f6efb248a145ab26afafe14bfd5424 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Sat, 29 Sep 2012 00:58:26 -0400
Subject: [PATCH] --- yaml --- r: 331620 b: refs/heads/master c:
 1f555cfa29e8f787d675e8390f88ce517a37271a h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3316da3aa704..51d7a66883c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b65007e9870e0021397b548e8cd6bbc584f9152
+refs/heads/master: 1f555cfa29e8f787d675e8390f88ce517a37271a
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 05ab70dd5c64..09308ad0f314 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3010,6 +3010,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
 		overwrite = *((int *)iocb->private);
 
 		if (overwrite) {
+			atomic_inc(&inode->i_dio_count);
 			down_read(&EXT4_I(inode)->i_data_sem);
 			mutex_unlock(&inode->i_mutex);
 		}
@@ -3107,6 +3108,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
 	retake_lock:
 		/* take i_mutex locking again if we do a ovewrite dio */
 		if (overwrite) {
+			inode_dio_done(inode);
 			up_read(&EXT4_I(inode)->i_data_sem);
 			mutex_lock(&inode->i_mutex);
 		}