From 24eef40eb17f2f7219e1411db7b888d3593be8d9 Mon Sep 17 00:00:00 2001
From: Robin Dong <sanbai@taobao.com>
Date: Wed, 26 Oct 2011 05:14:27 -0400
Subject: [PATCH] --- yaml --- r: 273158 b: refs/heads/master c:
 ebbe027797f67d34708ccfabdb129886d549f9ce h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bcddbe2a82a0..640c36d375e6 100644
--- 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
index cd70b3041185..89762652aae2 100644
--- 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) {