From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Ts'o Subject: [PATCH 1/2] libext2fs: fix alloc_allocate_group_table() if the flexbg_offset wraps Date: Mon, 28 Apr 2014 10:09:38 -0400 Message-ID: <1398694179-18027-1-git-send-email-tytso@mit.edu> Cc: Theodore Ts'o To: Ext4 Developers List Return-path: Received: from imap.thunk.org ([74.207.234.97]:37225 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932392AbaD1OJt (ORCPT ); Mon, 28 Apr 2014 10:09:49 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: If the previous block group's inode table ends at the very end of file system, wrap around to the beginning of the flex_bg. This fixes a bug was tickled by: mke2fs.conf: frontload = { features = extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize,^resize_inode,sparse_super2 hash_alg = half_md4 num_backup_sb = 0 packed_meta_blocks = 1 inode_ratio = 4194304 flex_bg_size = 262144 } mke2fs -T frontload /tmp/foo.img 2T resize2fs -M /tmp/foo.img resize2fs -M /tmp/foo.img Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/alloc_tables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c index fec9003..bc99943 100644 --- a/lib/ext2fs/alloc_tables.c +++ b/lib/ext2fs/alloc_tables.c @@ -54,8 +54,8 @@ static blk64_t flexbg_offset(ext2_filsys fs, dgrp_t group, blk64_t start_blk, * Don't do a long search if the previous block * search is still valid. */ - if (start_blk && ext2fs_test_block_bitmap_range2(bmap, start_blk, - elem_size)) + if (start_blk && start_blk < ext2fs_blocks_count(fs->super) && + ext2fs_test_block_bitmap_range2(bmap, start_blk, elem_size)) return start_blk; start_blk = ext2fs_group_first_block2(fs, flexbg_size * flexbg); -- 1.9.0