From patchwork Sun Sep 2 09:52:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 181175 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 23C892C0079 for ; Sun, 2 Sep 2012 20:27:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755956Ab2IBK1v (ORCPT ); Sun, 2 Sep 2012 06:27:51 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:41850 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755938Ab2IBK1u (ORCPT ); Sun, 2 Sep 2012 06:27:50 -0400 Received: by dady13 with SMTP id y13so3015660dad.19 for ; Sun, 02 Sep 2012 03:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=YXDjb0hiAGyaQP9kXFPTl1ZKioxpD8jkMcscM4XhxPc=; b=0/weom+2gIOCamzevkTdUeb2ythEWP8MWCN33jN06PYifJCveKE/vp7gt3NjB3pQn/ WPljvrnzC3ee3+l2J8IfaWBbBhFyTFyY/vxKOPuHh480OSB7zUN76/wTRnFjvPGxsrvI GVEea/st4fn7u0kq1GXck9re3+lduPVA9xeRnR5vnte3cTA3rDrjmVOKzPkTOYe0GSuZ CcUZQMdrdku9jiezVaocMf9Y0YjQDOh/wkXONMnSYnfC/rB3xzdvSETCeNX+LhrzY+Tr Fsc/ReX500wxmoUChhGWlBS6N3dY2NDhW/NbV/81/PvTUl3tQfg6RFKSH4nGWzvOmdB8 usnQ== Received: by 10.68.116.17 with SMTP id js17mr30093252pbb.109.1346581670147; Sun, 02 Sep 2012 03:27:50 -0700 (PDT) Received: from localhost.localdomain ([106.3.102.60]) by mx.google.com with ESMTPS id hc10sm7495193pbc.21.2012.09.02.03.27.47 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 02 Sep 2012 03:27:49 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, Yongqiang Yang Subject: [PATCH] resize2fs: support online-resizing for meta_bg and 64bits features Date: Sun, 2 Sep 2012 17:52:29 +0800 Message-Id: <1346579549-25122-1-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch supports online-resizing for meata_bg and 64bits features. Signed-off-by: Yongqiang Yang --- resize/main.c | 5 +++-- resize/online.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resize/main.c b/resize/main.c index ffefe01..b3a7840 100644 --- a/resize/main.c +++ b/resize/main.c @@ -324,9 +324,10 @@ int main (int argc, char ** argv) * This is something we should fix eventually, though. */ if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) && - !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)) { + !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) && + !(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)) { com_err(program_name, 0, _("%s: The combination of flex_bg " - "and\n\t!resize_inode features " + "and\n\t!resize_inode and !meta_bg features " "is not supported by resize2fs.\n"), device_name); exit(1); diff --git a/resize/online.c b/resize/online.c index 966ea1e..e7891bd 100644 --- a/resize/online.c +++ b/resize/online.c @@ -56,9 +56,9 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt, EXT2_DESC_PER_BLOCK(fs->super)); printf("old_desc_blocks = %lu, new_desc_blocks = %lu\n", fs->desc_blocks, new_desc_blocks); - if (!(fs->super->s_feature_compat & - EXT2_FEATURE_COMPAT_RESIZE_INODE) && - new_desc_blocks != fs->desc_blocks) { + if (!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) && + new_desc_blocks != fs->desc_blocks && + !(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)) { com_err(program_name, 0, _("Filesystem does not support online resizing")); exit(1);