1 files changed, 8 insertions, 6 deletions

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index f9d948f0eb86..3fed79da0d2c 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1582,7 +1582,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
         ext4_fsblk_t o_blocks_count;
         ext4_group_t o_group;
         ext4_group_t n_group;
-        ext4_grpblk_t offset;
+        ext4_grpblk_t offset, add;
         unsigned long n_desc_blocks;
         unsigned long o_desc_blocks;
         unsigned long desc_blocks;
@@ -1605,7 +1605,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
                 return 0;
 
         ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset);
-        ext4_get_group_no_and_offset(sb, o_blocks_count, &o_group, &offset);
+        ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset);
 
         n_desc_blocks = (n_group + EXT4_DESC_PER_BLOCK(sb)) /
                         EXT4_DESC_PER_BLOCK(sb);
@@ -1634,10 +1634,12 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
         }
         brelse(bh);
 
-        if (offset != 0) {
-                /* extend the last group */
-                ext4_grpblk_t add;
-                add = EXT4_BLOCKS_PER_GROUP(sb) - offset;
+        /* extend the last group */
+        if (n_group == o_group)
+                add = n_blocks_count - o_blocks_count;
+        else
+                add = EXT4_BLOCKS_PER_GROUP(sb) - (offset + 1);
+        if (add > 0) {
                 err = ext4_group_extend_no_check(sb, o_blocks_count, add);
                 if (err)
                         goto out;