From afacd22299ad19be919446d28ec0a57d1d0dddfc Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 13 Aug 2008 21:44:34 -0400
Subject: [PATCH] --- yaml --- r: 109057 b: refs/heads/master c:
 b4df2030858bde986cb6ff2e4b45945f84649e32 h: refs/heads/master i:   109055:
 d9ee509183f6070b7f9d39b764c18684a3c160fb v: v3

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

diff --git a/[refs] b/[refs]
index 71e9742bf4ab..18ffe3338aaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf068ee266f9dbaa6dacb8433a366bb399e7ae5b
+refs/heads/master: b4df2030858bde986cb6ff2e4b45945f84649e32
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index a1c7d7623213..2d54c822c4c3 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3494,6 +3494,9 @@ void ext4_truncate(struct inode *inode)
 	 * modify the block allocation tree.
 	 */
 	down_write(&ei->i_data_sem);
+
+	ext4_discard_reservation(inode);
+
 	/*
 	 * The orphan list entry will now protect us from any crash which
 	 * occurs before the truncate completes, so it is now safe to propagate
@@ -3563,8 +3566,6 @@ void ext4_truncate(struct inode *inode)
 		;
 	}
 
-	ext4_discard_reservation(inode);
-
 	up_write(&ei->i_data_sem);
 	inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
 	ext4_mark_inode_dirty(handle, inode);