From e538340b7c9b2befacee2e04d76b415e7ba0d76d Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <djwong@us.ibm.com>
Date: Fri, 27 May 2011 12:23:41 -0700
Subject: [PATCH] --- yaml --- r: 252732 b: refs/heads/master c:
 d76ee18a8551e33ad7dbd55cac38bc7b094f3abb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6c2c48930f26..1476e30319fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d08bcc887a1c8d12be8d81f747ffa2e8a44b67b
+refs/heads/master: d76ee18a8551e33ad7dbd55cac38bc7b094f3abb
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 698c6b2cc462..49c9aada0374 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2382,6 +2382,7 @@ int __block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
 		ret = -EAGAIN;
 		goto out_unlock;
 	}
+	wait_on_page_writeback(page);
 	return 0;
 out_unlock:
 	unlock_page(page);