From patchwork Fri Dec 30 11:00:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 133669 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 22BBCB6FAF for ; Sat, 31 Dec 2011 01:41:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751600Ab1L3Olx (ORCPT ); Fri, 30 Dec 2011 09:41:53 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:41000 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751588Ab1L3Olx (ORCPT ); Fri, 30 Dec 2011 09:41:53 -0500 Received: by mail-iy0-f174.google.com with SMTP id h11so25397943iae.19 for ; Fri, 30 Dec 2011 06:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=2yFhEkGWYpqKFMyxe4J6g3ybw67a04GLPaIhGMHr420=; b=ZxDpdV/8Q3Iz47aa6J4oo4KjWc2Ri4ybuKoRFTbFjCo05IwpLEL/TK/W4KrZNQIW2+ 1ols1PMPLo7ZCIdwyf9fQC6GnLCV+edcuw2OGKG6Dns3svi5y3/p+yZQL0841M9a8sM3 8vvQoKk//2R/eCZUcWc1Qomnmqgaz93secoT8= Received: by 10.50.51.199 with SMTP id m7mr46807487igo.23.1325256112966; Fri, 30 Dec 2011 06:41:52 -0800 (PST) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id aq5sm86161462igc.5.2011.12.30.06.41.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Dec 2011 06:41:52 -0800 (PST) From: Yongqiang Yang To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Yongqiang Yang Subject: [PATCH V6 RESEND 09/15] ext4: enable ext4_update_super() to handle a flex groups Date: Fri, 30 Dec 2011 19:00:06 +0800 Message-Id: <1325242812-27005-10-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1325242812-27005-1-git-send-email-xiaoqiangnk@gmail.com> References: <1325242812-27005-1-git-send-email-xiaoqiangnk@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Yongqiang Yang This patch enables ext4_update_super() to handle a flex groups. Signed-off-by: Yongqiang Yang Signed-off-by: "Theodore Ts'o" --- fs/ext4/resize.c | 58 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index f82cbee..bcc236f 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1184,17 +1184,24 @@ static int ext4_setup_new_descs(handle_t *handle, struct super_block *sb, } /* - * ext4_update_super() updates super so that new the added group can be seen - * by the filesystem. + * ext4_update_super() updates super block so that new added groups can be seen + * by the filesystem. * * @sb: super block + * @flex_gd: new added groups */ static void ext4_update_super(struct super_block *sb, - struct ext4_new_group_data *input) + struct ext4_new_flex_group_data *flex_gd) { + ext4_fsblk_t blocks_count = 0; + ext4_fsblk_t free_blocks = 0; + ext4_fsblk_t reserved_blocks = 0; + struct ext4_new_group_data *group_data = flex_gd->groups; struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_super_block *es = sbi->s_es; + int i; + BUG_ON(flex_gd->count == 0 || group_data == NULL); /* * Make the new blocks and inodes valid next. We do this before * increasing the group count so that once the group is enabled, @@ -1205,9 +1212,19 @@ static void ext4_update_super(struct super_block *sb, * blocks/inodes before the group is live won't actually let us * allocate the new space yet. */ - ext4_blocks_count_set(es, ext4_blocks_count(es) + - input->blocks_count); - le32_add_cpu(&es->s_inodes_count, EXT4_INODES_PER_GROUP(sb)); + for (i = 0; i < flex_gd->count; i++) { + blocks_count += group_data[i].blocks_count; + free_blocks += group_data[i].free_blocks_count; + } + + reserved_blocks = ext4_r_blocks_count(es) * 100; + do_div(reserved_blocks, ext4_blocks_count(es)); + reserved_blocks *= blocks_count; + do_div(reserved_blocks, 100); + + ext4_blocks_count_set(es, ext4_blocks_count(es) + blocks_count); + le32_add_cpu(&es->s_inodes_count, EXT4_INODES_PER_GROUP(sb) * + flex_gd->count); /* * We need to protect s_groups_count against other CPUs seeing @@ -1215,11 +1232,11 @@ static void ext4_update_super(struct super_block *sb, * * The precise rules we use are: * - * * Writers must perform a smp_wmb() after updating all dependent - * data and before modifying the groups count + * * Writers must perform a smp_wmb() after updating all + * dependent data and before modifying the groups count * - * * Readers must perform an smp_rmb() after reading the groups count - * and before reading any dependent data. + * * Readers must perform an smp_rmb() after reading the groups + * count and before reading any dependent data. * * NB. These rules can be relaxed when checking the group count * while freeing data, as we can only allocate from a block @@ -1230,29 +1247,34 @@ static void ext4_update_super(struct super_block *sb, smp_wmb(); /* Update the global fs size fields */ - sbi->s_groups_count++; + sbi->s_groups_count += flex_gd->count; /* Update the reserved block counts only once the new group is * active. */ ext4_r_blocks_count_set(es, ext4_r_blocks_count(es) + - input->reserved_blocks); + reserved_blocks); /* Update the free space counts */ percpu_counter_add(&sbi->s_freeclusters_counter, - EXT4_B2C(sbi, input->free_blocks_count)); + EXT4_B2C(sbi, free_blocks)); percpu_counter_add(&sbi->s_freeinodes_counter, - EXT4_INODES_PER_GROUP(sb)); + EXT4_INODES_PER_GROUP(sb) * flex_gd->count); - if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG) && + if (EXT4_HAS_INCOMPAT_FEATURE(sb, + EXT4_FEATURE_INCOMPAT_FLEX_BG) && sbi->s_log_groups_per_flex) { ext4_group_t flex_group; - flex_group = ext4_flex_group(sbi, input->group); - atomic_add(EXT4_B2C(sbi, input->free_blocks_count), + flex_group = ext4_flex_group(sbi, group_data[0].group); + atomic_add(EXT4_B2C(sbi, free_blocks), &sbi->s_flex_groups[flex_group].free_clusters); - atomic_add(EXT4_INODES_PER_GROUP(sb), + atomic_add(EXT4_INODES_PER_GROUP(sb) * flex_gd->count, &sbi->s_flex_groups[flex_group].free_inodes); } + if (test_opt(sb, DEBUG)) + printk(KERN_DEBUG "EXT4-fs: added group %u:" + "%llu blocks(%llu free %llu reserved)\n", flex_gd->count, + blocks_count, free_blocks, reserved_blocks); } /* Add group descriptor data to an existing or new group descriptor block.