From df45d42a8c7771debf6eefdbfe5a8e21b1554691 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Thu, 20 Sep 2012 09:52:58 -0500
Subject: [PATCH] --- yaml --- r: 323288 b: refs/heads/master c:
 2216db70c95a9610f5279b8da53bec614d98270f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7e676cc71975..3ea19c5bc6dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0b4df294387c777c3091a43e9970572e10261b1
+refs/heads/master: 2216db70c95a9610f5279b8da53bec614d98270f
diff --git a/trunk/fs/gfs2/super.c b/trunk/fs/gfs2/super.c
index 79cac7057691..a8d90f2f576c 100644
--- a/trunk/fs/gfs2/super.c
+++ b/trunk/fs/gfs2/super.c
@@ -1545,6 +1545,11 @@ static void gfs2_evict_inode(struct inode *inode)
 
 out_truncate:
 	gfs2_log_flush(sdp, ip->i_gl);
+	if (test_bit(GLF_DIRTY, &ip->i_gl->gl_flags)) {
+		struct address_space *metamapping = gfs2_glock2aspace(ip->i_gl);
+		filemap_fdatawrite(metamapping);
+		filemap_fdatawait(metamapping);
+	}
 	write_inode_now(inode, 1);
 	gfs2_ail_flush(ip->i_gl, 0);