From 753b4e4dc40c906a5f22bb6009b2fa50ec49f19e Mon Sep 17 00:00:00 2001
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
Date: Tue, 13 Dec 2011 21:51:55 -0500
Subject: [PATCH] --- yaml --- r: 276661 b: refs/heads/master c:
 13a79a4741d37fda2fbafb953f0f301dc007928f h: refs/heads/master i:   276659:
 e47204dc076fd4d7daf0c2a66b9ad0fe63564a02 v: v3

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

diff --git a/[refs] b/[refs]
index df017e18e9bc..0819783e18d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea51d132dbf9b00063169c1159bee253d9649224
+refs/heads/master: 13a79a4741d37fda2fbafb953f0f301dc007928f
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index b5edc6e4bab9..cf20e1fe7782 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -1339,8 +1339,11 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
 					clear_buffer_unwritten(bh);
 				}
 
-				/* skip page if block allocation undone */
-				if (buffer_delay(bh) || buffer_unwritten(bh))
+				/*
+				 * skip page if block allocation undone and
+				 * block is dirty
+				 */
+				if (ext4_bh_delay_or_unwritten(NULL, bh))
 					skip_page = 1;
 				bh = bh->b_this_page;
 				block_start += bh->b_size;