From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaegeuk Kim Subject: Re: [PATCH] mkfs.f2fs: introduce zone align for main area Date: Thu, 7 Jan 2016 15:29:57 -0800 Message-ID: <20160107232957.GA8623@jaegeuk.aosp> References: <1452066877-8554-1-git-send-email-heyunlei@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1aHK0O-0004qB-Qx for linux-f2fs-devel@lists.sourceforge.net; Thu, 07 Jan 2016 23:30:08 +0000 Received: from mail.kernel.org ([198.145.29.136]) by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1aHK0N-0008QU-Mn for linux-f2fs-devel@lists.sourceforge.net; Thu, 07 Jan 2016 23:30:08 +0000 Content-Disposition: inline In-Reply-To: <1452066877-8554-1-git-send-email-heyunlei@huawei.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: Yunlei He Cc: linux-f2fs-devel@lists.sourceforge.net Hi Yunlei, Could you rebase the patch based on f2fs-tools.git? I can't merge this. Thanks, On Wed, Jan 06, 2016 at 03:54:37PM +0800, Yunlei He wrote: > This patch calculate main area begin from a new zone, > avoid misalign if segments per zone is not 1. > > Signed-off-by: Yunlei He > Signed-off-by: Shuoran Liu > --- > mkfs/f2fs_format.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c > index 66d7342..fe45322 100644 > --- a/mkfs/f2fs_format.c > +++ b/mkfs/f2fs_format.c > @@ -126,7 +126,8 @@ static int f2fs_prepare_super_block(void) > u_int32_t sit_segments; > u_int32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa; > u_int32_t total_valid_blks_available; > - u_int64_t zone_align_start_offset, diff, total_meta_segments; > + u_int64_t zone_align_start_offset, diff; > + u_int64_t total_meta_zones, total_meta_segments; > u_int32_t sit_bitmap_size, max_sit_bitmap_size; > u_int32_t max_nat_bitmap_size, max_nat_segments; > u_int32_t total_zones; > @@ -259,16 +260,17 @@ static int f2fs_prepare_super_block(void) > set_sb(segment_count_ssa, get_sb(segment_count_ssa) + > (config.segs_per_zone - diff)); > > - set_sb(main_blkaddr, get_sb(ssa_blkaddr) + get_sb(segment_count_ssa) * > - config.blks_per_seg); > + total_meta_zones = ZONE_ALIGN(total_meta_segments * > + config.blks_per_seg); > > - set_sb(segment_count_main, get_sb(segment_count) - > - (get_sb(segment_count_ckpt) + > - get_sb(segment_count_sit) + > - get_sb(segment_count_nat) + > - get_sb(segment_count_ssa))); > + set_sb(main_blkaddr, get_sb(segment0_blkaddr) + total_meta_zones * > + config.segs_per_zone * config.blks_per_seg); > + > + total_zones = get_sb(segment_count) / (config.segs_per_zone) - > + total_meta_zones; > > - set_sb(section_count, get_sb(segment_count_main) / config.segs_per_sec); > + set_sb(section_count, total_zones * config.secs_per_zone); > > set_sb(segment_count_main, get_sb(section_count) * config.segs_per_sec); > > @@ -297,7 +299,6 @@ static int f2fs_prepare_super_block(void) > set_sb(meta_ino, 2); > set_sb(root_ino, 3); > > - total_zones = get_sb(segment_count_main) / (config.segs_per_zone); > if (total_zones <= 6) { > MSG(1, "\tError: %d zones: Need more zones \ > by shrinking zone size\n", total_zones); > -- > 1.9.1 ------------------------------------------------------------------------------