Auto merge with /home/aegl/GIT/linus

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 5ad8cf0292df..98e78345ead9 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -36,7 +36,11 @@ static int ext3_release_file (struct inode * inode, struct file * filp)
         /* 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))
+        {
+                down(&EXT3_I(inode)->truncate_sem);
                 ext3_discard_reservation(inode);
+                up(&EXT3_I(inode)->truncate_sem);
+        }
         if (is_dx(inode) && filp->private_data)
                 ext3_htree_free_dir_info(filp->private_data);