From: "Aneesh Kumar K.V" Subject: Re: [PATCH] ext4: Fix FLEX_BG and uninit group usage. Date: Thu, 15 May 2008 09:36:58 +0530 Message-ID: <20080515040658.GA15128@skywalker> References: <1210790832-20680-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1210790832-20680-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1210790832-20680-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <20080514140802.5621167d@gara> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: cmm@us.ibm.com, tytso@mit.edu, sandeen@redhat.com, linux-ext4@vger.kernel.org To: "Jose R. Santos" Return-path: Received: from e28smtp07.in.ibm.com ([59.145.155.7]:58148 "EHLO e28esmtp07.in.ibm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750812AbYEOEHD (ORCPT ); Thu, 15 May 2008 00:07:03 -0400 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by e28esmtp07.in.ibm.com (8.13.1/8.13.1) with ESMTP id m4F471pw023147 for ; Thu, 15 May 2008 09:37:01 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m4F46ox51368132 for ; Thu, 15 May 2008 09:36:50 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.13.1/8.13.3) with ESMTP id m4F46jGV011786 for ; Thu, 15 May 2008 09:36:46 +0530 Content-Disposition: inline In-Reply-To: <20080514140802.5621167d@gara> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Wed, May 14, 2008 at 02:08:02PM -0500, Jose R. Santos wrote: > On Thu, 15 May 2008 00:17:12 +0530 > "Aneesh Kumar K.V" wrote: > > > With FLEX_BG we allocate block bitmap, inode bitmap, and > > inode table outside the group. So when initialzing the > > uninit block group we don't need to set bits corresponding > > to these meta-data in the bitmaps. Also return the right > > number of free blocks when counting the available free > > blocks in uninit group. > > > > Signed-off-by: Aneesh Kumar K.V > > --- > > fs/ext4/balloc.c | 15 ++++++++++++++- > > 1 files changed, 14 insertions(+), 1 deletions(-) > > > > diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c > > index 5c80eb5..fb63f01 100644 > > --- a/fs/ext4/balloc.c > > +++ b/fs/ext4/balloc.c > > @@ -109,7 +109,14 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, > > > > for (bit = 0; bit < bit_max; bit++) > > ext4_set_bit(bit, bh->b_data); > > - > > + /* > > + * With FLEX_BG uninit group we have all the > > + * blocks available for use. So no need > > + * to set any bits in bitmap > > + */ > > + if (EXT4_HAS_INCOMPAT_FEATURE(sb, > > + EXT4_FEATURE_INCOMPAT_FLEX_BG)) > > + return free_blocks; > > start = ext4_group_first_block_no(sb, block_group); > > > > /* Set bits for block and inode bitmaps, and inode table */ > > @@ -126,6 +133,12 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, > > */ > > mark_bitmap_end(group_blocks, sb->s_blocksize * 8, bh->b_data); > > } > > + /* > > + * With FLEX_BG uninit group we have all the > > + * blocks available for use. > > + */ > > + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) > > + return free_blocks; > > > > return free_blocks - sbi->s_itb_per_group - 2; > > } > > This assumes that if the FLEX_BG feature is enable that all block > groups have no bitmaps or inode tables (which is wrong). > > Something like this (ignore the fact that doesnt handle hi bits) should be better. > > used_blocks = sbi->s_itb_per_group + 2; > if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) { > ext4_get_group_no_and_offset(sbi, bgd->bg_block_bitmap_lo, tmp, 0); > if (tmp != block_group) > used_blocks--; > ext4_get_group_no_and_offset(sbi, bgd->bg_inode_bitmap_lo, tmp, 0); > if (tmp != block_group) > used_blocks--; > ext4_get_group_no_and_offset(sbi, bgd->bg_inode_table_lo, tmp, 0); > if (tmp != block_group) > used_blocks -= sbi->s_itb_per_group; > } > > return free_blocks - used_blocks; > } But with FLEX_BG won't we mark the group as initialized if we are placing the bitmap or inode table in the group ? -aneesh