From 3c45923cf2096799923193e5768e0d53f538bdd6 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Thu, 23 Jun 2011 01:35:00 +0000
Subject: [PATCH] --- yaml --- r: 254071 b: refs/heads/master c:
 df4368a146d2b350b8398babfe11e2088f741d67 h: refs/heads/master i:   254069:
 fb0ebb0c52f9fc47740c4fd2afdb9fc93aef4cf1   254067:
 7eb6dd1c82df0fb0ca4973dcdb0c5087df8cfe04   254063:
 9ad045cd2fed94c16f9c55fea15fd33173554cf8 v: v3

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

diff --git a/[refs] b/[refs]
index 9b3d6d63cce4..98f8d27deb73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778e24bb6dd8682318bb496d4bfdc32b501a6420
+refs/heads/master: df4368a146d2b350b8398babfe11e2088f741d67
diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
index b7a5fe7c52c8..619720705bc6 100644
--- a/trunk/fs/xfs/xfs_vnodeops.c
+++ b/trunk/fs/xfs/xfs_vnodeops.c
@@ -960,8 +960,11 @@ xfs_release(
 		 * be exposed to that problem.
 		 */
 		truncated = xfs_iflags_test_and_clear(ip, XFS_ITRUNCATED);
-		if (truncated && VN_DIRTY(VFS_I(ip)) && ip->i_delayed_blks > 0)
-			xfs_flush_pages(ip, 0, -1, XBF_ASYNC, FI_NONE);
+		if (truncated) {
+			xfs_iflags_clear(ip, XFS_IDIRTY_RELEASE);
+			if (VN_DIRTY(VFS_I(ip)) && ip->i_delayed_blks > 0)
+				xfs_flush_pages(ip, 0, -1, XBF_ASYNC, FI_NONE);
+		}
 	}
 
 	if (ip->i_d.di_nlink == 0)