From patchwork Mon Jul 18 02:52:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 105155 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 C3F83B6F7C for ; Mon, 18 Jul 2011 12:57:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753303Ab1GRC5N (ORCPT ); Sun, 17 Jul 2011 22:57:13 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:45447 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987Ab1GRC5N (ORCPT ); Sun, 17 Jul 2011 22:57:13 -0400 Received: by mail-iw0-f174.google.com with SMTP id 6so2719031iwn.19 for ; Sun, 17 Jul 2011 19:57:12 -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=TQn3IXPIbQ75rdirHS2qFg9Gcyiyise31BsvARm6t+4=; b=T6Gpurgj0Goy++4dB2NjJQQr6GF4EtLIVTA0GBYVjPymT59TzEcjOvu67Z+Iiob3xT zT3MeCEcWVsxfHm+JAw00PvnWmC+a1Rrr25woNupIAwY/87fHSAQEsb+pZdYVqh+13s3 7WNodLiiNfQGOkn/1ICEfovzociOJinJE4di8= Received: by 10.231.143.129 with SMTP id v1mr5506902ibu.14.1310957832703; Sun, 17 Jul 2011 19:57:12 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id y3sm2592761ibc.37.2011.07.17.19.57.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 17 Jul 2011 19:57:12 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: aedilger@gmail.com, Yongqiang Yang Subject: [PATCH 12/12] ext4: simplify parameters of reserve_backup_gdb() Date: Mon, 18 Jul 2011 10:52:35 +0800 Message-Id: <1310957555-15617-13-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1310957555-15617-1-git-send-email-xiaoqiangnk@gmail.com> References: <1310957555-15617-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 reserve_backup_gdb() only needs the no. of a group, there is no need to pass a pointer to struct ext4_new_group_data to it. Signed-off-by: Yongqiang Yang Acked-by: Amir Goldstein" --- fs/ext4/resize.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 52d0426..3e790ad 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -556,7 +556,7 @@ exit_bh: * backup GDT blocks are stored in their reserved primary GDT block. */ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, - struct ext4_new_group_data *input) + ext4_group_t group) { struct super_block *sb = inode->i_sb; int reserved_gdb =le16_to_cpu(EXT4_SB(sb)->s_es->s_reserved_gdt_blocks); @@ -627,7 +627,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, * Finally we can add each of the reserved backup GDT blocks from * the new group to its reserved primary GDT block. */ - blk = input->group * EXT4_BLOCKS_PER_GROUP(sb); + blk = group * EXT4_BLOCKS_PER_GROUP(sb); for (i = 0; i < reserved_gdb; i++) { int err2; data = (__le32 *)primary[i]->b_data; @@ -841,9 +841,11 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) if ((err = ext4_journal_get_write_access(handle, primary))) goto exit_journal; - if (reserved_gdb && ext4_bg_num_gdb(sb, input->group) && - (err = reserve_backup_gdb(handle, inode, input))) - goto exit_journal; + if (reserved_gdb && ext4_bg_num_gdb(sb, input->group)) { + err = reserve_backup_gdb(handle, inode, input->group); + if (err) + goto exit_journal; + } } else { err = add_new_gdb(handle, inode, input->group); if (err)