1 files changed, 9 insertions, 10 deletions

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index b128bdc0f55c..1d7fde994521 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2880,12 +2880,11 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
         if (size < i_size_read(ac->ac_inode))
                 size = i_size_read(ac->ac_inode);
 
-        /* max available blocks in a free group */
-        max = EXT4_BLOCKS_PER_GROUP(ac->ac_sb) - 1 - 1 -
-                                EXT4_SB(ac->ac_sb)->s_itb_per_group;
+        /* max size of free chunks */
+        max = 2 << bsbits;
 
-#define NRL_CHECK_SIZE(req, size, max,bits)     \
-                (req <= (size) || max <= ((size) >> bits))
+#define NRL_CHECK_SIZE(req, size, max, chunk_size)      \
+                (req <= (size) || max <= (chunk_size))
 
         /* first, try to predict filesize */
         /* XXX: should this table be tunable? */
@@ -2904,16 +2903,16 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
                 size = 512 * 1024;
         } else if (size <= 1024 * 1024) {
                 size = 1024 * 1024;
-        } else if (NRL_CHECK_SIZE(size, 4 * 1024 * 1024, max, bsbits)) {
+        } else if (NRL_CHECK_SIZE(size, 4 * 1024 * 1024, max, 2 * 1024)) {
                 start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
-                                                (20 - bsbits)) << 20;
-                size = 1024 * 1024;
-        } else if (NRL_CHECK_SIZE(size, 8 * 1024 * 1024, max, bsbits)) {
+                                                (21 - bsbits)) << 21;
+                size = 2 * 1024 * 1024;
+        } else if (NRL_CHECK_SIZE(size, 8 * 1024 * 1024, max, 4 * 1024)) {
                 start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
                                                         (22 - bsbits)) << 22;
                 size = 4 * 1024 * 1024;
         } else if (NRL_CHECK_SIZE(ac->ac_o_ex.fe_len,
-                                        (8<<20)>>bsbits, max, bsbits)) {
+                                        (8<<20)>>bsbits, max, 8 * 1024)) {
                 start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
                                                         (23 - bsbits)) << 23;
                 size = 8 * 1024 * 1024;