Merge "ext4_utils: Fix FS creation for filesystems with exactly 32768 blocks."
diff --git a/ext4_utils/ext4_utils.c b/ext4_utils/ext4_utils.c
index 8609851..36830ba 100644
--- a/ext4_utils/ext4_utils.c
+++ b/ext4_utils/ext4_utils.c
@@ -217,7 +217,8 @@
 
 	aux_info.default_i_flags = EXT4_NOATIME_FL;
 
-	u32 last_group_size = aux_info.len_blocks % info.blocks_per_group;
+	u32 last_group_size = aux_info.len_blocks == info.blocks_per_group
+		? aux_info.len_blocks : aux_info.len_blocks % info.blocks_per_group;
 	u32 last_header_size = 2 + aux_info.inode_table_blocks;
 	if (ext4_bg_has_super_block(aux_info.groups - 1))
 		last_header_size += 1 + aux_info.bg_desc_blocks +