---

yaml --- r: 166587 b: refs/heads/master c: 7178057 h: refs/heads/master i: 166585: f8b8773 166583: e5653ce v: v3
git-mirror · Sep 28, 2009 · 3efe971 · 3efe971
1 parent fa00c48
commit 3efe971
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;