---

yaml --- r: 273158 b: refs/heads/master c: ebbe027 h: refs/heads/master v: v3
git-mirror · Oct 26, 2011 · 24eef40 · 24eef40
1 parent 44f4cc9
commit 24eef40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcbb5515825f1bb20b7a6f75ec48bee61416f879
+refs/heads/master: ebbe027797f67d34708ccfabdb129886d549f9ce
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
@@ -4006,6 +4006,11 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
 		return;
 	}
 
+	if (sbi->s_mb_group_prealloc <= 0) {
+		ac->ac_flags |= EXT4_MB_STREAM_ALLOC;
+		return;
+	}
+
 	/* don't use group allocation for large files */
 	size = max(size, isize);
 	if (size > sbi->s_mb_stream_request) {