On Mar 26, 2008 00:26 +0530, Aneesh Kumar K.V wrote: > If the block allocator gets blocks out of system zone ext2 calls > ext2_error. But if the file system is mounted with errors=continue > retry block allocation. We need to mark the system zone > blocks as in use to make sure retry don't pick them again > > System zone is the block range mapping block bitmap, inode bitmap > and inode table. Nack * 3. It appears that this will spin in a loop, because retry_alloc: will not change the group that is being used, and extN_valid_block_bitmap() does nothing to fix up the bitmap to avoid re-allocating the same blocks. Instead, it seems safest that extN_new_blocks() should skip the group entirely after marking the group as having no free blocks, so the allocator will no longer choose it. This also means that when freeing blocks it needs to watch out for underflow of the ->bg_free_blocks_count value, which is itself a good safety measure. > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > --- > fs/ext2/balloc.c | 16 +++++++++++----- > 1 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c > index e7b2baf..501399e 100644 > --- a/fs/ext2/balloc.c > +++ b/fs/ext2/balloc.c > @@ -149,11 +149,12 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) > block_group, le32_to_cpu(desc->bg_block_bitmap)); > return NULL; > } > - if (!ext2_valid_block_bitmap(sb, desc, block_group, bh)) { > - brelse(bh); > - return NULL; > - } > > + ext2_valid_block_bitmap(sb, desc, block_group, bh); > + /* > + * file system mounted not to panic on error, > + * continue with corrput bitmap > + */ > return bh; > } > > @@ -1381,7 +1382,12 @@ allocated: > "Allocating block in system zone - " > "blocks from "E2FSBLK", length %lu", > ret_block, num); > - goto out; > + /* > + * ext2_try_to_allocate marked the blocks we allocated > + * as in use. So we may want to selectively > + * mark some of the blocks as free > + */ > + goto retry_alloc; > } > > performed_allocation = 1; > -- > 1.5.5.rc0.16.g02b00.dirty Cheers, Andreas -- Andreas Dilger Sr. Staff Engineer, Lustre Group Sun Microsystems of Canada, Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html