From patchwork Tue Aug 30 08:10:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 112193 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 7E346B6F9B for ; Tue, 30 Aug 2011 18:53:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751100Ab1H3Ixp (ORCPT ); Tue, 30 Aug 2011 04:53:45 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:33594 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949Ab1H3Ixp (ORCPT ); Tue, 30 Aug 2011 04:53:45 -0400 Received: by gya6 with SMTP id 6so5445483gya.19 for ; Tue, 30 Aug 2011 01:53:44 -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=bN+gFNnIIE6qGAixoXv9shEKyfB8yzbiHFjLvACJvOc=; b=GG5Y9jz5fIlhNnpdJovOCz1JKwzvTA6ZP0e2TzxD7c75psNXSNsLD1MkjF4/kOh0Ez LftHxyxn079/WBSTB/D/fqjDlejI/AneLjnrO5yT2G0x+X/h6BYwDEiERVCWrjXO0JLV VLKvBiDe/eD7ykcAi7qCaBDpT8GcClN9hFwOc= Received: by 10.142.237.18 with SMTP id k18mr3085522wfh.20.1314694424300; Tue, 30 Aug 2011 01:53:44 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id t6sm8483074pbg.4.2011.08.30.01.53.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Aug 2011 01:53:43 -0700 (PDT) From: Yongqiang Yang To: tytso@mit.edu Cc: adilger@dilger.ca, linux-ext4@vger.kernel.org, Yongqiang Yang Subject: [PATCH v2 01/15] ext4: add a function which extends a group without checking parameters Date: Tue, 30 Aug 2011 16:10:11 +0800 Message-Id: <1314691825-12295-2-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1314691825-12295-1-git-send-email-xiaoqiangnk@gmail.com> References: <1314691825-12295-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 added a function named __ext4_group_extend() whose code is copied from ext4_group_extend(). __ext4_group_extend() assumes the parameter is valid and has been checked by caller. __ext4_group_extend() will be used by new resize implementation. It can also be used by ext4_group_extend(), but this patch series does not do this. Signed-off-by: Yongqiang Yang --- fs/ext4/resize.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 707d3f1..5126aac 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -969,6 +969,59 @@ exit_put: } /* ext4_group_add */ /* + * extend a group without checking assuming that checking has been done. + */ +static int __ext4_group_extend(struct super_block *sb, + ext4_fsblk_t o_blocks_count, ext4_grpblk_t add) +{ + struct ext4_super_block *es = EXT4_SB(sb)->s_es; + handle_t *handle; + int err = 0, err2; + + /* We will update the superblock, one block bitmap, and + * one group descriptor via ext4_group_add_blocks(). + */ + handle = ext4_journal_start_sb(sb, 3); + if (IS_ERR(handle)) { + err = PTR_ERR(handle); + ext4_warning(sb, "error %d on journal start", err); + goto out; + } + + err = ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh); + if (err) { + ext4_warning(sb, "error %d on journal write access", err); + ext4_journal_stop(handle); + goto out; + } + + ext4_blocks_count_set(es, o_blocks_count + add); + ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count, + o_blocks_count + add); + /* We add the blocks to the bitmap and set the group need init bit */ + err = ext4_group_add_blocks(handle, sb, o_blocks_count, add); + if (err) + goto exit_journal; + ext4_handle_dirty_super(handle, sb); + ext4_debug("freed blocks %llu through %llu\n", o_blocks_count, + o_blocks_count + add); +exit_journal: + err2 = ext4_journal_stop(handle); + if (err2 && !err) + err = err2; + + if (!err) { + if (test_opt(sb, DEBUG)) + printk(KERN_DEBUG "EXT4-fs: extended group to %llu " + "blocks\n", ext4_blocks_count(es)); + update_backups(sb, EXT4_SB(sb)->s_sbh->b_blocknr, (char *)es, + sizeof(struct ext4_super_block)); + } +out: + return err; +} + +/* * Extend the filesystem to the new number of blocks specified. This entry * point is only used to extend the current filesystem to the end of the last * existing group. It can be accessed via ioctl, or by "remount,resize="