Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / jfs / inode.c

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 37da3e33e7506a0b4be77135b35105b988b9f227..0ec62d5310db6a78128a948fd1370159caea0b09 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -131,6 +131,8 @@ void jfs_delete_inode(struct inode *inode)
        if (!is_bad_inode(inode) &&
            (JFS_IP(inode)->fileset == cpu_to_le32(FILESYSTEM_I))) {
 
+               truncate_inode_pages(&inode->i_data, 0);
+
                if (test_cflag(COMMIT_Freewmap, inode))
                        jfs_free_zero_link(inode);