diff --git a/[refs] b/[refs]
index 3a2ebbeef649..55f595e82ff5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 525f4ed8dcb72c71b306a78ecbf06f41d08fe441
+refs/heads/master: 16eb72956496594d023a7d7cd14a86404ad195ad
diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c
index 1ae5004e93fc..e9fa960ba6da 100644
--- a/trunk/fs/ext4/balloc.c
+++ b/trunk/fs/ext4/balloc.c
@@ -1626,6 +1626,9 @@ ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,
 		free_blocks =
 			percpu_counter_sum_and_set(&sbi->s_freeblocks_counter);
 #endif
+	if (free_blocks <= root_blocks)
+		/* we don't have free space */
+		return 0;
 	if (free_blocks - root_blocks < nblocks)
 		return free_blocks - root_blocks;
 	return nblocks;