diff --git a/[refs] b/[refs]
index 60671c1dcf49..cb411b33e1e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aee2286071c23c535fe9928eec1a26e0bcf256d
+refs/heads/master: 0eab928221bac8895a0b494a16a8810002bd8645
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 2c10d346f7a3..875db944b22f 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4127,7 +4127,8 @@ void ext4_truncate(struct inode *inode)
 	if (!ext4_can_truncate(inode))
 		return;
 
-	if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
+	if (ei->i_disksize && inode->i_size == 0 &&
+	    !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
 		ei->i_state |= EXT4_STATE_DA_ALLOC_CLOSE;
 
 	if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) {