From patchwork Sat Dec 29 08:55:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 208633 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 956932C00A7 for ; Sat, 29 Dec 2012 19:57:05 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423Ab2L2I5D (ORCPT ); Sat, 29 Dec 2012 03:57:03 -0500 Received: from li9-11.members.linode.com ([67.18.176.11]:40813 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288Ab2L2I5B (ORCPT ); Sat, 29 Dec 2012 03:57:01 -0500 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.80) (envelope-from ) id 1TosE0-0007ve-G0; Sat, 29 Dec 2012 08:57:00 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 3C3F724F665; Sat, 29 Dec 2012 03:55:29 -0500 (EST) From: Theodore Ts'o To: Ext4 Developers List Cc: George Spelvin , Theodore Ts'o Subject: [PATCH 5/6] resize2fs: allow resizing flex_bg && !resize_inode file systems Date: Sat, 29 Dec 2012 03:55:27 -0500 Message-Id: <1356771328-18196-6-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 1.7.12.rc0.22.gcdd159b In-Reply-To: <1356771328-18196-1-git-send-email-tytso@mit.edu> References: <1356771328-18196-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org With the bug fixes from the last two commits, resize2fs can now fully support off-line resizing of file systems with flex_bg even if the resize_inode feature is not present; so we no longer need to disallow this combination. Signed-off-by: "Theodore Ts'o" --- resize/main.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/resize/main.c b/resize/main.c index 876dbaa..711e375 100644 --- a/resize/main.c +++ b/resize/main.c @@ -438,28 +438,6 @@ int main (int argc, char ** argv) device_name); exit(1); } - /* - * XXXX The combination of flex_bg and !resize_inode - * causes major problems for resize2fs, since when the - * group descriptors grow in size this can potentially - * require multiple inode tables to be moved aside to - * make room, and resize2fs chokes rather badly in - * this scenario. It's a rare combination, except - * when a filesystem is expanded more than a certain - * size, so for now, we'll just prohibit that - * combination. 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)) { - com_err(program_name, 0, _("%s: The combination of " - "flex_bg and\n\t!resize_inode features " - "is not supported by resize2fs.\n"), - device_name); - exit(1); - } printf(_("Resizing the filesystem on " "%s to %llu (%dk) blocks.\n"), device_name, new_size, fs->blocksize / 1024);