From patchwork Tue Jul 19 04:02:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 105388 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 8CE8DB6F69 for ; Tue, 19 Jul 2011 14:06:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751230Ab1GSEGw (ORCPT ); Tue, 19 Jul 2011 00:06:52 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:49578 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032Ab1GSEGw (ORCPT ); Tue, 19 Jul 2011 00:06:52 -0400 Received: by mail-iw0-f174.google.com with SMTP id 6so3703318iwn.19 for ; Mon, 18 Jul 2011 21:06:52 -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=YkiD/2xWQNbkjhkhzZ4k2Btr1zF/oTqOqu87QsEaZpw=; b=XX0I4Uyf6GZL9m12LQzgjLHudnpIVdZsSh5qAkysky73yvfmVT/dPw2iwcR2W9kZID QNF/1vYVhjBPFNpvvi9lIDeZhXTdzhe4MczRa9abwTzLpthlW7k7KyeyGIGMFfGpsumN qAJ59Dr259+QGlhjwHwe4IPm8QYl4hyHU4+MA= Received: by 10.42.131.71 with SMTP id y7mr7555298ics.315.1311048412021; Mon, 18 Jul 2011 21:06:52 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id vj5sm5701144icb.11.2011.07.18.21.06.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jul 2011 21:06:51 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: adilger@dilger.ca, amir73il@gmail.com, tm@tao.ma, Yongqiang Yang Subject: [PATCH v2 11/11] ext4: simplify parameters of reserve_backup_gdb() Date: Tue, 19 Jul 2011 12:02:17 +0800 Message-Id: <1311048137-16400-12-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1311048137-16400-1-git-send-email-xiaoqiangnk@gmail.com> References: <1311048137-16400-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 --- fs/ext4/resize.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) v1->v2: nothing changed. diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 7964ed9..19c217e 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -546,7 +546,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); @@ -617,7 +617,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; @@ -831,9 +831,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 { /* * Note that we can access new group descriptor block safely