From patchwork Fri Dec 30 10:59:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 133662 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 79FCBB6FAF for ; Sat, 31 Dec 2011 01:41:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324Ab1L3Olj (ORCPT ); Fri, 30 Dec 2011 09:41:39 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:41000 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877Ab1L3Oli (ORCPT ); Fri, 30 Dec 2011 09:41:38 -0500 Received: by mail-iy0-f174.google.com with SMTP id h11so25397943iae.19 for ; Fri, 30 Dec 2011 06:41:38 -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=/Kjna2eCV0FSNKDbcm30RUkvkW71G8joXKmVlDG4Y+U=; b=dIZtFMn88SrklzSMxHo1oUcNS/t/5iPcTppS++g04biHhahAYvZfjwziDgPHiAfxUT DF3dNuUkrLme/+Aw9HdaMDvIcO053zLw0iIMx+UL0gF4pv2x5ox4/HUF52Q7c1tKTlWO bCczhcyC+cd1iG7BB6HaM/EjzsZcYNk8N2Ghc= Received: by 10.50.88.129 with SMTP id bg1mr46721816igb.10.1325256098308; Fri, 30 Dec 2011 06:41:38 -0800 (PST) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id aq5sm86161462igc.5.2011.12.30.06.41.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Dec 2011 06:41:37 -0800 (PST) From: Yongqiang Yang To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Yongqiang Yang Subject: [PATCH V6 RESEND 02/15] ext4: add a function which adds a new desc to a fs Date: Fri, 30 Dec 2011 18:59:59 +0800 Message-Id: <1325242812-27005-3-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1325242812-27005-1-git-send-email-xiaoqiangnk@gmail.com> References: <1325242812-27005-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 This patch adds a function named ext4_add_new_desc() which adds a new desc to a fs and whose code is copied from ext4_group_add(). The function will be used by new resize implementation. Signed-off-by: Yongqiang Yang Signed-off-by: "Theodore Ts'o" --- fs/ext4/resize.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index ac5565c..9a5486e 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -735,6 +735,48 @@ exit_err: } } +/* + * ext4_add_new_desc() adds group descriptor of group @group + * + * @handle: journal handle + * @sb; super block + * @group: the group no. of the first group desc to be added + * @resize_inode: the resize inode + */ +static int ext4_add_new_desc(handle_t *handle, struct super_block *sb, + ext4_group_t group, struct inode *resize_inode) +{ + struct ext4_sb_info *sbi = EXT4_SB(sb); + struct ext4_super_block *es = sbi->s_es; + struct buffer_head *gdb_bh; + int gdb_off, gdb_num, err = 0; + int reserved_gdb = ext4_bg_has_super(sb, group) ? + le16_to_cpu(es->s_reserved_gdt_blocks) : 0; + + gdb_off = group % EXT4_DESC_PER_BLOCK(sb); + gdb_num = group / EXT4_DESC_PER_BLOCK(sb); + + /* + * We will only either add reserved group blocks to a backup group + * or remove reserved blocks for the first group in a new group block. + * Doing both would be mean more complex code, and sane people don't + * use non-sparse filesystems anymore. This is already checked above. + */ + if (gdb_off) { + gdb_bh = sbi->s_group_desc[gdb_num]; + err = ext4_journal_get_write_access(handle, gdb_bh); + if (err) + goto out; + + if (reserved_gdb && ext4_bg_num_gdb(sb, group)) + err = reserve_backup_gdb(handle, resize_inode, group); + } else + err = add_new_gdb(handle, resize_inode, group); + +out: + 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