From 3efe97110019898c6c0f89aa39763c769fc93f5f Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 28 Sep 2009 00:06:20 -0400
Subject: [PATCH] --- yaml --- r: 166587 b: refs/heads/master c:
 71780577306fd1e76c7a92e3b308db624d03adb9 h: refs/heads/master i:   166585:
 f8b8773000480580b952ea8a6e8f5d5bb3c95857   166583:
 e5653ce47f164b06f56180013c4fe1299abf1da6 v: v3

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

diff --git a/[refs] b/[refs]
index 51e076ea547b..2a0302497d05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1693918e0b6988cf5eb93b7da34f30e94360a379
+refs/heads/master: 71780577306fd1e76c7a92e3b308db624d03adb9
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index e9c61896d605..c73d43995b13 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -4189,7 +4189,6 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
 	size = ac->ac_o_ex.fe_logical + ac->ac_o_ex.fe_len;
 	isize = (i_size_read(ac->ac_inode) + ac->ac_sb->s_blocksize - 1)
 		>> bsbits;
-	size = max(size, isize);
 
 	if ((size == isize) &&
 	    !ext4_fs_is_busy(sbi) &&
@@ -4199,6 +4198,7 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
 	}
 
 	/* don't use group allocation for large files */
+	size = max(size, isize);
 	if (size >= sbi->s_mb_stream_request) {
 		ac->ac_flags |= EXT4_MB_STREAM_ALLOC;
 		return;