From patchwork Fri Nov 21 13:36:34 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 10004 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.176.167]) by ozlabs.org (Postfix) with ESMTP id B4FDEDDE0A for ; Sat, 22 Nov 2008 00:36:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbYKUNgu (ORCPT ); Fri, 21 Nov 2008 08:36:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753003AbYKUNgu (ORCPT ); Fri, 21 Nov 2008 08:36:50 -0500 Received: from ti-out-0910.google.com ([209.85.142.187]:46785 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752809AbYKUNgt (ORCPT ); Fri, 21 Nov 2008 08:36:49 -0500 Received: by ti-out-0910.google.com with SMTP id b6so635691tic.23 for ; Fri, 21 Nov 2008 05:36:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:x-enigmail-version:content-type; bh=YjSwscmBN1NVHwvZAOl9Jf8Gio5ITrY+6iHVWG6nUlY=; b=G0/7T6FlOTvEdWltpyx23KKZh/c8dsIAcL7mfmgp6nxCcNYFgFQNIyz5jKQXoWJWiK aYuEZCZeyia/yJBuvWVPO4qE1CgODckYgnsvRhXqXKytfKvoVeouglNallknOhBX19ld +taGDzPCbG019V93ldp35TqIpYQEVzbqZzJ8Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type; b=hDFlTbJVGn/uBqYO3sr72ZE/EWC/b35QNfYVN4f+4/W7c74OFHiy3F/odesDK5Nbjg Mb75GdJo4e4iHYp8TZ0YpHwL8/FoExUVigtbWH4uy+5nOldS/pLD9Lx4b/IVywSdoaPU ECzvc86eT9+AGUBztcUpIRv1BPELPFNk6/008= Received: by 10.110.63.6 with SMTP id l6mr739989tia.50.1227274607288; Fri, 21 Nov 2008 05:36:47 -0800 (PST) Received: from ?59.64.157.39? ([59.64.157.39]) by mx.google.com with ESMTPS id y5sm626128tia.13.2008.11.21.05.36.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 Nov 2008 05:36:45 -0800 (PST) Message-ID: <4926B962.8010306@gmail.com> Date: Fri, 21 Nov 2008 21:36:34 +0800 From: Peng Tao User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018) MIME-Version: 1.0 To: ext4 development Subject: [PATCH][e2fsprogs]tune2fs: refuse to unmark flex_bg via clear_ok_features X-Enigmail-Version: 0.95.7 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org IIUC, clear_ok_features is the gateway for all features that can be cleared by tune2fs. So refuse to unmark flex_bg via clear_ok_features instead of dealing with it alone. Having flex_bg in clear_ok_features is quite misleading. Signed-off-by: Peng Tao if ((mount_flags & EXT2_MF_MOUNTED) && diff --git a/misc/tune2fs.c b/misc/tune2fs.c index e72518a..c1876d1 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -136,8 +136,7 @@ static __u32 clear_ok_features[3] = { EXT2_FEATURE_COMPAT_RESIZE_INODE | EXT2_FEATURE_COMPAT_DIR_INDEX, /* Incompat */ - EXT2_FEATURE_INCOMPAT_FILETYPE | - EXT4_FEATURE_INCOMPAT_FLEX_BG, + EXT2_FEATURE_INCOMPAT_FILETYPE, /* R/O compat */ EXT2_FEATURE_RO_COMPAT_LARGE_FILE | EXT4_FEATURE_RO_COMPAT_HUGE_FILE| @@ -407,15 +406,6 @@ static void update_feature_set(ext2_filsys fs, char *features) uuid_generate((unsigned char *) sb->s_hash_seed); } - if (FEATURE_OFF(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_FLEX_BG)) { - if (ext2fs_check_desc(fs)) { - fputs(_("Clearing the flex_bg flag would " - "cause the the filesystem to be\n" - "inconsistent.\n"), stderr); - exit(1); - } - } - if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) {