From e06e013e25a1e8614687dfcc7a2cfcb463c22a45 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 3 Apr 2009 01:34:35 -0400
Subject: [PATCH] --- yaml --- r: 140272 b: refs/heads/master c:
 f7ab34ea723ed304b19698efca85d6f40cecd99b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/ext3/file.c          | 4 ++++
 trunk/fs/ext3/inode.c         | 3 +++
 trunk/include/linux/ext3_fs.h | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39e68464241a..164a2635873b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 512a004382f2c60d5c4f855476ba965adc00250c
+refs/heads/master: f7ab34ea723ed304b19698efca85d6f40cecd99b
diff --git a/trunk/fs/ext3/file.c b/trunk/fs/ext3/file.c
index 3be1e0689c9a..4a04cbb1c231 100644
--- a/trunk/fs/ext3/file.c
+++ b/trunk/fs/ext3/file.c
@@ -33,6 +33,10 @@
  */
 static int ext3_release_file (struct inode * inode, struct file * filp)
 {
+	if (EXT3_I(inode)->i_state & EXT3_STATE_FLUSH_ON_CLOSE) {
+		filemap_flush(inode->i_mapping);
+		EXT3_I(inode)->i_state &= ~EXT3_STATE_FLUSH_ON_CLOSE;
+	}
 	/* if we are the last writer on the inode, drop the block reservation */
 	if ((filp->f_mode & FMODE_WRITE) &&
 			(atomic_read(&inode->i_writecount) == 1))
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index 5fa453b49a64..0f5bca0d82fc 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -2346,6 +2346,9 @@ void ext3_truncate(struct inode *inode)
 	if (!ext3_can_truncate(inode))
 		return;
 
+	if (inode->i_size == 0 && ext3_should_writeback_data(inode))
+		ei->i_state |= EXT3_STATE_FLUSH_ON_CLOSE;
+
 	/*
 	 * We have to lock the EOF page here, because lock_page() nests
 	 * outside journal_start().
diff --git a/trunk/include/linux/ext3_fs.h b/trunk/include/linux/ext3_fs.h
index dd495b8c3091..d2630c56cb34 100644
--- a/trunk/include/linux/ext3_fs.h
+++ b/trunk/include/linux/ext3_fs.h
@@ -208,6 +208,7 @@ static inline __u32 ext3_mask_flags(umode_t mode, __u32 flags)
 #define EXT3_STATE_JDATA		0x00000001 /* journaled data exists */
 #define EXT3_STATE_NEW			0x00000002 /* inode is newly created */
 #define EXT3_STATE_XATTR		0x00000004 /* has in-inode xattrs */
+#define EXT3_STATE_FLUSH_ON_CLOSE	0x00000008
 
 /* Used to pass group descriptor data when online resize is done */
 struct ext3_new_group_input {