From patchwork Thu Aug 11 03:28:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 109504 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 387B8B6F67 for ; Thu, 11 Aug 2011 13:35:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754554Ab1HKDfd (ORCPT ); Wed, 10 Aug 2011 23:35:33 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:48649 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753987Ab1HKDfd (ORCPT ); Wed, 10 Aug 2011 23:35:33 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so2947235pzk.1 for ; Wed, 10 Aug 2011 20:35:33 -0700 (PDT) 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=tXF/jQP3BBus0ma/dY/ksWPrkCRgJQYdTP7l/p4DIdo=; b=ccHNZWJuGcW4vvTWzP9h1hrjLpE4xIkCLyVWik+sEdveKCjeFOWau55X51jA6S9Wv/ RnCGRbafnNJi7/eA0/BbjM9a8o+l6ZakUWyaHG37lM7soUpm9oW5SyAAOJdBSgBYsJtk MrHY1EMLhnkkFTJzLJRm05Du3+fIYRRDSqeIU= Received: by 10.142.166.15 with SMTP id o15mr7488895wfe.196.1313033732523; Wed, 10 Aug 2011 20:35:32 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id g4sm1390823pbj.25.2011.08.10.20.35.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 20:35:32 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: aedilger@gmail.com, tytso@mit.edu, Yongqiang Yang Subject: [PATCH 03/13] ext4: add a function which sets up a new group desc Date: Thu, 11 Aug 2011 11:28:18 +0800 Message-Id: <1313033308-882-4-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1313033308-882-1-git-send-email-xiaoqiangnk@gmail.com> References: <1313033308-882-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 This patch adds a function named ext4_setup_new_desc() which sets up a new group descriptor and whose code is sopied from ext4_group_add(). The function will be used by new resize implementation. Signed-off-by: Yongqiang Yang --- fs/ext4/resize.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 4fcd515..6320baa 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -777,6 +777,60 @@ out: return err; } +/* + * ext4_setup_new_desc() sets up group descriptors specified by @input. + * + * @handle: journal handle + * @sb: super block + */ +static int ext4_setup_new_desc(handle_t *handle, struct super_block *sb, + struct ext4_new_group_data *input) +{ + struct ext4_sb_info *sbi = EXT4_SB(sb); + ext4_group_t group; + struct ext4_group_desc *gdp; + struct buffer_head *gdb_bh; + int gdb_off, gdb_num, err = 0; + + group = input->group; + + gdb_off = group % EXT4_DESC_PER_BLOCK(sb); + gdb_num = group / EXT4_DESC_PER_BLOCK(sb); + + /* + * get_write_access() has been called on gdb_bh by ext4_add_new_desc(). + */ + gdb_bh = sbi->s_group_desc[gdb_num]; + /* Update group descriptor block for new group */ + gdp = (struct ext4_group_desc *)((char *)gdb_bh->b_data + + gdb_off * EXT4_DESC_SIZE(sb)); + + memset(gdp, 0, EXT4_DESC_SIZE(sb)); + /* LV FIXME */ + memset(gdp, 0, EXT4_DESC_SIZE(sb)); + ext4_block_bitmap_set(sb, gdp, input->block_bitmap); /* LV FIXME */ + ext4_inode_bitmap_set(sb, gdp, input->inode_bitmap); /* LV FIXME */ + ext4_inode_table_set(sb, gdp, input->inode_table); /* LV FIXME */ + ext4_free_blks_set(sb, gdp, input->free_blocks_count); + ext4_free_inodes_set(sb, gdp, EXT4_INODES_PER_GROUP(sb)); + gdp->bg_flags = cpu_to_le16(EXT4_BG_INODE_ZEROED); + gdp->bg_checksum = ext4_group_desc_csum(sbi, input->group, gdp); + + err = ext4_handle_dirty_metadata(handle, NULL, gdb_bh); + if (unlikely(err)) { + ext4_std_error(sb, err); + return err; + } + + /* + * We can allocate memory for mb_alloc based on the new group + * descriptor + */ + err = ext4_mb_add_groupinfo(sb, group, gdp); + + return err; +} + /* Add group descriptor data to an existing or new group descriptor block. * Ensure we handle all possible error conditions _before_ we start modifying * the filesystem, because we cannot abort the transaction and not have it