From patchwork Fri Dec 30 10:53:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 133659 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 61058B6FBE for ; Sat, 31 Dec 2011 01:37:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751475Ab1L3Ohf (ORCPT ); Fri, 30 Dec 2011 09:37:35 -0500 Received: from mail-tul01m020-f174.google.com ([209.85.214.174]:36790 "EHLO mail-tul01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751391Ab1L3Ohd (ORCPT ); Fri, 30 Dec 2011 09:37:33 -0500 Received: by mail-tul01m020-f174.google.com with SMTP id wo16so10192121obc.19 for ; Fri, 30 Dec 2011 06:37:33 -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=cG65wHGNx9WKMpRsxYBwambzyyF6BeeSuCHqajITS4Q=; b=SFhCBqODRVnygM8+xAHvLU5Lyr/EvpXLkRAuqLb0o0jt9k78ITyIrJM+B62OFqqr7N ogfXaqn8r7TpSU2Z6f4c32gQ49o1qfc0+MnNhncBei+UPJrefMTqI9B79T8fi3xiCdsk k6S2TZUXgXpfOGyG1sP76BKHTEIZ7RTbi8Xsg= Received: by 10.50.41.131 with SMTP id f3mr45759712igl.28.1325255853224; Fri, 30 Dec 2011 06:37:33 -0800 (PST) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id pb6sm55150642igc.5.2011.12.30.06.37.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Dec 2011 06:37:32 -0800 (PST) From: Yongqiang Yang To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Yongqiang Yang Subject: [PATCH V6 14/15] ext4: let ext4_group_extend() use common code Date: Fri, 30 Dec 2011 18:53:56 +0800 Message-Id: <1325242437-26934-15-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1325242437-26934-1-git-send-email-xiaoqiangnk@gmail.com> References: <1325242437-26934-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 ext4_group_extend_no_check() is moved out from ext4_group_extend(), this patch lets ext4_group_extend() call ext4_group_extentd_no_check() instead. Signed-off-by: Yongqiang Yang --- fs/ext4/resize.c | 41 ++--------------------------------------- 1 files changed, 2 insertions(+), 39 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 29abd66..c862c6b 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1838,8 +1838,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, ext4_grpblk_t last; ext4_grpblk_t add; struct buffer_head *bh; - handle_t *handle; - int err, err2; + int err; ext4_group_t group; o_blocks_count = ext4_blocks_count(es); @@ -1895,43 +1894,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, } brelse(bh); - /* We will update the superblock, one block bitmap, and - * one group descriptor via ext4_free_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 exit_put; - } - - if ((err = ext4_journal_get_write_access(handle, - EXT4_SB(sb)->s_sbh))) { - ext4_warning(sb, "error %d on journal write access", err); - ext4_journal_stop(handle); - goto exit_put; - } - 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); - ext4_handle_dirty_super(handle, sb); - ext4_debug("freed blocks %llu through %llu\n", o_blocks_count, - o_blocks_count + add); - err2 = ext4_journal_stop(handle); - if (!err && err2) - err = err2; - - if (err) - goto exit_put; - - 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)); -exit_put: + err = ext4_group_extend_no_check(sb, o_blocks_count, add); return err; } /* ext4_group_extend */